diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2000-08-31 16:12:35 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2000-08-31 16:12:35 +0000 |
| commit | 424f0edcb8d73446223f1812d3ca88150e1cc953 (patch) | |
| tree | 6b0f0a9d1d9aed67873e9ff8acd2b5a6da77ac58 /src/backend | |
| parent | d4266620e1c92d0b5d76d8c583f2fbfcf5bcd7fe (diff) | |
| download | postgresql-424f0edcb8d73446223f1812d3ca88150e1cc953.tar.gz postgresql-424f0edcb8d73446223f1812d3ca88150e1cc953.zip | |
Fix relative path references so that make knowns which dependencies refer
to one another. Sort out builddir vs srcdir variable namings. Remove some
now obsoleted make variables.
Diffstat (limited to 'src/backend')
50 files changed, 190 insertions, 205 deletions
diff --git a/src/backend/Makefile b/src/backend/Makefile index f2848c4a7ac..c584d9ba299 100644 --- a/src/backend/Makefile +++ b/src/backend/Makefile @@ -4,13 +4,13 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.63 2000/07/19 16:29:44 petere Exp $ +# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.64 2000/08/31 16:09:23 petere Exp $ # #------------------------------------------------------------------------- subdir = src/backend top_builddir = ../.. -include ../Makefile.global +include $(top_builddir)/src/Makefile.global DIRS := access bootstrap catalog parser commands executor lib libpq \ main nodes optimizer port postmaster regex rewrite \ diff --git a/src/backend/access/Makefile b/src/backend/access/Makefile index fb1a19f0008..7f8524aa9e1 100644 --- a/src/backend/access/Makefile +++ b/src/backend/access/Makefile @@ -1,12 +1,12 @@ # # Makefile for the access methods module # -# $Header: /cvsroot/pgsql/src/backend/access/Makefile,v 1.6 2000/07/13 16:06:42 petere Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/Makefile,v 1.7 2000/08/31 16:09:26 petere Exp $ # subdir = src/backend/access top_builddir = ../../.. -include ../../Makefile.global +include $(top_builddir)/src/Makefile.global SUBDIRS := common gist hash heap index nbtree rtree transam SUBDIROBJS := $(SUBDIRS:%=%/SUBSYS.o) diff --git a/src/backend/access/common/Makefile b/src/backend/access/common/Makefile index a721414c547..8f9a7a07200 100644 --- a/src/backend/access/common/Makefile +++ b/src/backend/access/common/Makefile @@ -4,12 +4,13 @@ # Makefile for access/common # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.18 2000/05/29 05:44:33 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.19 2000/08/31 16:09:30 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../../.. -include ../../../Makefile.global +subdir = src/backend/access/common +top_builddir = ../../../.. +include $(top_builddir)/src/Makefile.global OBJS = heaptuple.o indextuple.o indexvalid.o printtup.o \ scankey.o tupdesc.o diff --git a/src/backend/access/gist/Makefile b/src/backend/access/gist/Makefile index 795603473e1..7f982d0dfd8 100644 --- a/src/backend/access/gist/Makefile +++ b/src/backend/access/gist/Makefile @@ -4,12 +4,13 @@ # Makefile for access/gist # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/gist/Makefile,v 1.9 2000/05/29 05:44:34 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/gist/Makefile,v 1.10 2000/08/31 16:09:31 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../../.. -include ../../../Makefile.global +subdir = src/backend/access/gist +top_builddir = ../../../.. +include $(top_builddir)/src/Makefile.global OBJS = gist.o gistget.o gistscan.o giststrat.o @@ -27,4 +28,3 @@ clean: ifeq (depend,$(wildcard depend)) include depend endif - diff --git a/src/backend/access/hash/Makefile b/src/backend/access/hash/Makefile index b1736261658..5e4f56a80cc 100644 --- a/src/backend/access/hash/Makefile +++ b/src/backend/access/hash/Makefile @@ -4,12 +4,13 @@ # Makefile for access/hash # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/hash/Makefile,v 1.9 2000/05/29 05:44:35 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/hash/Makefile,v 1.10 2000/08/31 16:09:33 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../../.. -include ../../../Makefile.global +subdir = src/backend/access/hash +top_builddir = ../../../.. +include $(top_builddir)/src/Makefile.global OBJS = hash.o hashfunc.o hashinsert.o hashovfl.o hashpage.o hashscan.o \ hashsearch.o hashstrat.o hashutil.o diff --git a/src/backend/access/heap/Makefile b/src/backend/access/heap/Makefile index 50f891a7522..95575f8e325 100644 --- a/src/backend/access/heap/Makefile +++ b/src/backend/access/heap/Makefile @@ -4,12 +4,13 @@ # Makefile for access/heap # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/heap/Makefile,v 1.10 2000/05/29 05:44:35 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/heap/Makefile,v 1.11 2000/08/31 16:09:33 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../../.. -include ../../../Makefile.global +subdir = src/backend/access/heap +top_builddir = ../../../.. +include $(top_builddir)/src/Makefile.global OBJS = heapam.o hio.o stats.o tuptoaster.o diff --git a/src/backend/access/index/Makefile b/src/backend/access/index/Makefile index 153ec74b0c0..dcae193bffe 100644 --- a/src/backend/access/index/Makefile +++ b/src/backend/access/index/Makefile @@ -4,12 +4,13 @@ # Makefile for access/index # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/index/Makefile,v 1.9 2000/05/29 05:44:38 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/index/Makefile,v 1.10 2000/08/31 16:09:36 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../../.. -include ../../../Makefile.global +subdir = src/backend/access/index +top_builddir = ../../../.. +include $(top_builddir)/src/Makefile.global OBJS = genam.o indexam.o istrat.o @@ -27,4 +28,3 @@ clean: ifeq (depend,$(wildcard depend)) include depend endif - diff --git a/src/backend/access/nbtree/Makefile b/src/backend/access/nbtree/Makefile index 3f0c678ac4f..eba9bd4eefe 100644 --- a/src/backend/access/nbtree/Makefile +++ b/src/backend/access/nbtree/Makefile @@ -4,12 +4,13 @@ # Makefile for access/nbtree # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/nbtree/Makefile,v 1.9 2000/05/29 05:44:39 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/nbtree/Makefile,v 1.10 2000/08/31 16:09:41 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../../.. -include ../../../Makefile.global +subdir = src/backend/access/nbtree +top_builddir = ../../../.. +include $(top_builddir)/src/Makefile.global OBJS = nbtcompare.o nbtinsert.o nbtpage.o nbtree.o nbtscan.o nbtsearch.o \ nbtstrat.o nbtutils.o nbtsort.o diff --git a/src/backend/access/rtree/Makefile b/src/backend/access/rtree/Makefile index ad664c9b6ae..956e1fe78e9 100644 --- a/src/backend/access/rtree/Makefile +++ b/src/backend/access/rtree/Makefile @@ -4,12 +4,13 @@ # Makefile for access/rtree # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/Makefile,v 1.9 2000/05/29 05:44:39 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/Makefile,v 1.10 2000/08/31 16:09:43 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../../.. -include ../../../Makefile.global +subdir = src/backend/access/rtree +top_builddir = ../../../.. +include $(top_builddir)/src/Makefile.global OBJS = rtget.o rtproc.o rtree.o rtscan.o rtstrat.o diff --git a/src/backend/access/transam/Makefile b/src/backend/access/transam/Makefile index fee5f491451..303936f4553 100644 --- a/src/backend/access/transam/Makefile +++ b/src/backend/access/transam/Makefile @@ -4,12 +4,13 @@ # Makefile for access/transam # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/transam/Makefile,v 1.11 2000/05/29 05:44:41 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/transam/Makefile,v 1.12 2000/08/31 16:09:46 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../../.. -include ../../../Makefile.global +subdir = src/backend/access/transam +top_builddir = ../../../.. +include $(top_builddir)/src/Makefile.global OBJS = transam.o transsup.o varsup.o xact.o xid.o xlog.o rmgr.o @@ -26,7 +27,7 @@ clean: # ensure that version checks in xlog.c get recompiled when config.h or # catversion.h changes, even if "make depend" hasn't been done. -xlog.o: xlog.c $(SRCDIR)/include/config.h $(SRCDIR)/include/catalog/catversion.h +xlog.o: xlog.c $(top_builddir)/src/include/config.h $(top_srcdir)/src/include/catalog/catversion.h ifeq (depend,$(wildcard depend)) include depend diff --git a/src/backend/catalog/Makefile b/src/backend/catalog/Makefile index 2368851c974..696853f06c4 100644 --- a/src/backend/catalog/Makefile +++ b/src/backend/catalog/Makefile @@ -2,13 +2,13 @@ # # Makefile for catalog # -# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.23 2000/07/06 21:33:22 petere Exp $ +# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.24 2000/08/31 16:09:49 petere Exp $ # #------------------------------------------------------------------------- subdir = src/backend/catalog top_builddir = ../../.. -include ../../Makefile.global +include $(top_builddir)/src/Makefile.global OBJS = catalog.o heap.o index.o indexing.o aclchk.o \ pg_aggregate.o pg_operator.o pg_proc.o pg_type.o diff --git a/src/backend/commands/Makefile b/src/backend/commands/Makefile index fdc9dd425f4..6ae11f14979 100644 --- a/src/backend/commands/Makefile +++ b/src/backend/commands/Makefile @@ -4,12 +4,13 @@ # Makefile for commands # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.25 2000/05/29 17:40:43 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.26 2000/08/31 16:09:53 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../.. -include $(SRCDIR)/Makefile.global +subdir = src/backend/commands +top_builddir = ../../.. +include $(top_builddir)/src/Makefile.global OBJS = async.o creatinh.o command.o comment.o copy.o indexcmds.o define.o \ remove.o rename.o vacuum.o analyze.o view.o cluster.o \ @@ -30,4 +31,3 @@ clean: ifeq (depend,$(wildcard depend)) include depend endif - diff --git a/src/backend/executor/Makefile b/src/backend/executor/Makefile index e0477405d56..bf329b9306b 100644 --- a/src/backend/executor/Makefile +++ b/src/backend/executor/Makefile @@ -4,12 +4,13 @@ # Makefile for executor # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/executor/Makefile,v 1.12 2000/05/29 05:44:45 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/executor/Makefile,v 1.13 2000/08/31 16:09:56 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../.. -include ../../Makefile.global +subdir = src/backend/executor +top_builddir = ../../.. +include $(top_builddir)/src/Makefile.global OBJS = execAmi.o execFlatten.o execJunk.o execMain.o \ execProcnode.o execQual.o execScan.o execTuples.o \ @@ -33,4 +34,3 @@ clean: ifeq (depend,$(wildcard depend)) include depend endif - diff --git a/src/backend/lib/Makefile b/src/backend/lib/Makefile index 428935f255a..ed190d6d2b4 100644 --- a/src/backend/lib/Makefile +++ b/src/backend/lib/Makefile @@ -4,12 +4,13 @@ # Makefile for lib (miscellaneous stuff) # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/lib/Makefile,v 1.14 2000/06/28 03:31:34 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/lib/Makefile,v 1.15 2000/08/31 16:09:59 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../.. -include ../../Makefile.global +subdir = src/backend/lib +top_builddir = ../../.. +include $(top_builddir)/src/Makefile.global OBJS = bit.o hasht.o lispsort.o stringinfo.o dllist.o @@ -27,4 +28,3 @@ clean: ifeq (depend,$(wildcard depend)) include depend endif - diff --git a/src/backend/main/Makefile b/src/backend/main/Makefile index 77a69599f6e..7ff840a7b32 100644 --- a/src/backend/main/Makefile +++ b/src/backend/main/Makefile @@ -4,12 +4,13 @@ # Makefile for main # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/main/Makefile,v 1.8 2000/05/29 05:44:47 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/main/Makefile,v 1.9 2000/08/31 16:10:03 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../.. -include ../../Makefile.global +subdir = src/backend/main +top_builddir = ../../.. +include $(top_builddir)/src/Makefile.global OBJS = main.o @@ -27,4 +28,3 @@ clean: ifeq (depend,$(wildcard depend)) include depend endif - diff --git a/src/backend/nodes/Makefile b/src/backend/nodes/Makefile index 264ec069b2b..0c5bab190dc 100644 --- a/src/backend/nodes/Makefile +++ b/src/backend/nodes/Makefile @@ -4,12 +4,13 @@ # Makefile for backend/nodes # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/nodes/Makefile,v 1.12 2000/06/29 02:26:23 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/nodes/Makefile,v 1.13 2000/08/31 16:10:06 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../.. -include $(SRCDIR)/Makefile.global +subdir = src/backend/nodes +top_builddir = ../../.. +include $(top_builddir)/src/Makefile.global OBJS = nodeFuncs.o nodes.o list.o \ copyfuncs.o equalfuncs.o makefuncs.o \ diff --git a/src/backend/optimizer/Makefile b/src/backend/optimizer/Makefile index accb3c033d5..39d9dcb0ad8 100644 --- a/src/backend/optimizer/Makefile +++ b/src/backend/optimizer/Makefile @@ -1,12 +1,12 @@ # # Makefile for optimizer # -# $Header: /cvsroot/pgsql/src/backend/optimizer/Makefile,v 1.8 2000/07/13 16:06:44 petere Exp $ +# $Header: /cvsroot/pgsql/src/backend/optimizer/Makefile,v 1.9 2000/08/31 16:10:07 petere Exp $ # subdir = src/backend/optimizer top_builddir = ../../.. -include ../../Makefile.global +include $(top_builddir)/src/Makefile.global SUBDIRS := geqo path plan prep util SUBDIROBJS := $(SUBDIRS:%=%/SUBSYS.o) diff --git a/src/backend/optimizer/geqo/Makefile b/src/backend/optimizer/geqo/Makefile index 83e48161fc3..cc2c4bd667d 100644 --- a/src/backend/optimizer/geqo/Makefile +++ b/src/backend/optimizer/geqo/Makefile @@ -5,24 +5,19 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Id: Makefile,v 1.15 2000/05/31 00:28:19 petere Exp $ +# $Header: /cvsroot/pgsql/src/backend/optimizer/geqo/Makefile,v 1.16 2000/08/31 16:10:08 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../../.. -include ../../../Makefile.global - -ifeq ($(CC), gcc) -CFLAGS+= -Wno-error -endif +subdir = src/backend/optimizer/geqo +top_builddir = ../../../.. +include $(top_builddir)/src/Makefile.global OBJS = geqo_copy.o geqo_eval.o geqo_main.o geqo_misc.o \ geqo_pool.o geqo_recombination.o \ geqo_selection.o \ geqo_erx.o geqo_pmx.o geqo_cx.o geqo_px.o geqo_ox1.o geqo_ox2.o -# deprecated: minspantree.o - all: SUBSYS.o SUBSYS.o: $(OBJS) @@ -37,4 +32,3 @@ clean: ifeq (depend,$(wildcard depend)) include depend endif - diff --git a/src/backend/optimizer/path/Makefile b/src/backend/optimizer/path/Makefile index 2c4c906b8cc..50428922ea3 100644 --- a/src/backend/optimizer/path/Makefile +++ b/src/backend/optimizer/path/Makefile @@ -4,12 +4,13 @@ # Makefile for optimizer/path # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/optimizer/path/Makefile,v 1.14 2000/05/29 05:44:50 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/optimizer/path/Makefile,v 1.15 2000/08/31 16:10:09 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../../.. -include ../../../Makefile.global +subdir = src/backend/optimizer/path +top_builddir = ../../../.. +include $(top_builddir)/src/Makefile.global OBJS = allpaths.o clausesel.o costsize.o indxpath.o \ joinpath.o joinrels.o orindxpath.o pathkeys.o tidpath.o @@ -28,4 +29,3 @@ clean: ifeq (depend,$(wildcard depend)) include depend endif - diff --git a/src/backend/optimizer/plan/Makefile b/src/backend/optimizer/plan/Makefile index 5d0ef0fbfaf..a5e7b17007c 100644 --- a/src/backend/optimizer/plan/Makefile +++ b/src/backend/optimizer/plan/Makefile @@ -4,17 +4,16 @@ # Makefile for optimizer/plan # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/optimizer/plan/Makefile,v 1.10 2000/05/29 05:44:51 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/optimizer/plan/Makefile,v 1.11 2000/08/31 16:10:11 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../../.. -include ../../../Makefile.global +subdir = src/backend/optimizer/plan +top_builddir = ../../../.. +include $(top_builddir)/src/Makefile.global OBJS = createplan.o initsplan.o planmain.o planner.o setrefs.o subselect.o -# not ready yet: predmig.o xfunc.o - all: SUBSYS.o SUBSYS.o: $(OBJS) @@ -29,4 +28,3 @@ clean: ifeq (depend,$(wildcard depend)) include depend endif - diff --git a/src/backend/optimizer/prep/Makefile b/src/backend/optimizer/prep/Makefile index 313b3fa7ac3..d78240666c6 100644 --- a/src/backend/optimizer/prep/Makefile +++ b/src/backend/optimizer/prep/Makefile @@ -4,17 +4,16 @@ # Makefile for optimizer/prep # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/optimizer/prep/Makefile,v 1.11 2000/05/29 05:44:52 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/optimizer/prep/Makefile,v 1.12 2000/08/31 16:10:13 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../../.. -include ../../../Makefile.global +subdir = src/backend/optimizer/prep +top_builddir = ../../../.. +include $(top_builddir)/src/Makefile.global OBJS = prepqual.o preptlist.o prepunion.o prepkeyset.o -# not ready yet: predmig.o xfunc.o - all: SUBSYS.o SUBSYS.o: $(OBJS) diff --git a/src/backend/optimizer/util/Makefile b/src/backend/optimizer/util/Makefile index dbed9f11acf..c6160103370 100644 --- a/src/backend/optimizer/util/Makefile +++ b/src/backend/optimizer/util/Makefile @@ -4,18 +4,17 @@ # Makefile for optimizer/util # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/optimizer/util/Makefile,v 1.12 2000/05/29 05:44:53 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/optimizer/util/Makefile,v 1.13 2000/08/31 16:10:14 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../../.. -include ../../../Makefile.global +subdir = src/backend/optimizer/util +top_builddir = ../../../.. +include $(top_builddir)/src/Makefile.global OBJS = restrictinfo.o clauses.o indexnode.o plancat.o \ joininfo.o pathnode.o relnode.o tlist.o var.o -# not ready yet: predmig.o xfunc.o - all: SUBSYS.o SUBSYS.o: $(OBJS) @@ -30,4 +29,3 @@ clean: ifeq (depend,$(wildcard depend)) include depend endif - diff --git a/src/backend/port/Makefile.in b/src/backend/port/Makefile.in index 17605c41dac..eb7214cb36e 100644 --- a/src/backend/port/Makefile.in +++ b/src/backend/port/Makefile.in @@ -13,12 +13,13 @@ # be converted to Method 2. # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/port/Attic/Makefile.in,v 1.23 2000/05/29 05:44:54 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/port/Attic/Makefile.in,v 1.24 2000/08/31 16:10:16 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR=../.. -include ../../Makefile.global +subdir = src/backend/port +top_builddir = ../../.. +include $(top_builddir)/src/Makefile.global OBJS = dynloader.o @INET_ATON@ @STRERROR@ @MISSING_RANDOM@ @SRANDOM@ OBJS+= @GETHOSTNAME@ @GETRUSAGE@ @STRCASECMP@ @STRDUP@ @TAS@ @ISINF@ @@ -39,8 +40,6 @@ qnx4.dir: tas.o: tas.s $(CC) $(CFLAGS) -c tas.s -.PHONY: clean dep - distclean clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/port/nextstep/Makefile b/src/backend/port/nextstep/Makefile index 1399014dde8..76da14e0b13 100644 --- a/src/backend/port/nextstep/Makefile +++ b/src/backend/port/nextstep/Makefile @@ -1,12 +1,14 @@ #------------------------------------------------------------------------- # -# Makefile-- -# Makefile for port/next (NeXTStep 3.3 specific stuff) +# Makefile for NeXTStep 3.3 specific stuff +# +# $Header: /cvsroot/pgsql/src/backend/port/nextstep/Makefile,v 1.6 2000/08/31 16:10:16 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../../.. -include ../../../Makefile.global +subdir = src/backend/port/nextstep +top_builddir = ../../../.. +include $(top_builddir)/src/Makefile.global OBJS = dynloader.o port.o diff --git a/src/backend/port/qnx4/Makefile b/src/backend/port/qnx4/Makefile index b367d9bbfbd..ed51c51ddc1 100644 --- a/src/backend/port/qnx4/Makefile +++ b/src/backend/port/qnx4/Makefile @@ -4,12 +4,13 @@ # Makefile for port/sparc # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/Makefile,v 1.2 2000/05/29 05:44:56 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/Makefile,v 1.3 2000/08/31 16:10:19 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../../.. -include ../../../Makefile.global +subdir = src/backend/port/qnx4 +top_builddir = ../../../.. +include $(top_builddir)/src/Makefile.global OBJS = isnan.o rint.o sem.o shm.o @@ -36,4 +37,3 @@ clean: ifeq (depend,$(wildcard depend)) include depend endif - diff --git a/src/backend/port/sunos4/Makefile b/src/backend/port/sunos4/Makefile index c9583340228..9f54dce0e0b 100644 --- a/src/backend/port/sunos4/Makefile +++ b/src/backend/port/sunos4/Makefile @@ -1,15 +1,8 @@ -#------------------------------------------------------------------------- -# -# Makefile-- -# Makefile for port/sparc -# -# IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/port/sunos4/Attic/Makefile,v 1.5 2000/05/29 05:44:57 tgl Exp $ -# -#------------------------------------------------------------------------- +# $Header: /cvsroot/pgsql/src/backend/port/sunos4/Attic/Makefile,v 1.6 2000/08/31 16:10:20 petere Exp $ -SRCDIR = ../../.. -include ../../../Makefile.global +subdir = src/backend/port/sunos4 +top_builddir = ../../../.. +include $(top_builddir)/src/Makefile.global OBJS = strtol.o @@ -27,4 +20,3 @@ clean: ifeq (depend,$(wildcard depend)) include depend endif - diff --git a/src/backend/postmaster/Makefile b/src/backend/postmaster/Makefile index ce8124e96a1..da9f0d9be3a 100644 --- a/src/backend/postmaster/Makefile +++ b/src/backend/postmaster/Makefile @@ -4,12 +4,13 @@ # Makefile for postmaster # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/postmaster/Makefile,v 1.11 2000/05/29 05:44:58 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/postmaster/Makefile,v 1.12 2000/08/31 16:10:23 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../.. -include ../../Makefile.global +subdir = src/backend/postmaster +top_builddir = ../../.. +include $(top_builddir)/src/Makefile.global OBJS = postmaster.o @@ -27,4 +28,3 @@ clean: ifeq (depend,$(wildcard depend)) include depend endif - diff --git a/src/backend/regex/Makefile b/src/backend/regex/Makefile index 4d6935b7f1f..6b7ba34a15a 100644 --- a/src/backend/regex/Makefile +++ b/src/backend/regex/Makefile @@ -4,14 +4,15 @@ # Makefile for regex # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/regex/Makefile,v 1.13 2000/05/29 05:44:58 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/regex/Makefile,v 1.14 2000/08/31 16:10:25 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../.. -include ../../Makefile.global +subdir = src/backend/regex +top_builddir = ../../.. +include $(top_builddir)/src/Makefile.global -CFLAGS += -DPOSIX_MISTAKE +CPPFLAGS += -DPOSIX_MISTAKE DEBUGOBJ = @@ -27,7 +28,7 @@ SUBSYS.o: $(OBJS) $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS) retest: retest.o SUBSYS.o $(DEBUGOBJ) - $(CC) -o retest retest.o SUBSYS.o $(DEBUGOBJ) + $(CC) $(CFLAGS) -o retest retest.o SUBSYS.o $(DEBUGOBJ) depend dep: $(CC) -MM $(CFLAGS) *.c >depend @@ -38,4 +39,3 @@ clean: ifeq (depend,$(wildcard depend)) include depend endif - diff --git a/src/backend/rewrite/Makefile b/src/backend/rewrite/Makefile index d47c7051017..aca50c54e2e 100644 --- a/src/backend/rewrite/Makefile +++ b/src/backend/rewrite/Makefile @@ -4,12 +4,13 @@ # Makefile for rewrite # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/rewrite/Makefile,v 1.12 2000/05/29 05:44:59 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/rewrite/Makefile,v 1.13 2000/08/31 16:10:27 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../.. -include ../../Makefile.global +subdir = src/backend/rewrite +top_builddir = ../../.. +include $(top_builddir)/src/Makefile.global OBJS = rewriteRemove.o rewriteDefine.o \ rewriteHandler.o rewriteManip.o rewriteSupport.o locks.o @@ -28,4 +29,3 @@ clean: ifeq (depend,$(wildcard depend)) include depend endif - diff --git a/src/backend/storage/Makefile b/src/backend/storage/Makefile index 812fd53e801..d9f65449110 100644 --- a/src/backend/storage/Makefile +++ b/src/backend/storage/Makefile @@ -1,12 +1,12 @@ # # Makefile for the storage manager subsystem # -# $Header: /cvsroot/pgsql/src/backend/storage/Makefile,v 1.7 2000/07/13 16:06:48 petere Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/Makefile,v 1.8 2000/08/31 16:10:30 petere Exp $ # subdir = src/backend/storage top_builddir = ../../.. -include ../../Makefile.global +include $(top_builddir)/src/Makefile.global SUBDIRS := buffer file ipc large_object lmgr page smgr SUBDIROBJS := $(SUBDIRS:%=%/SUBSYS.o) diff --git a/src/backend/storage/buffer/Makefile b/src/backend/storage/buffer/Makefile index 5968a46bba2..54bf25e1377 100644 --- a/src/backend/storage/buffer/Makefile +++ b/src/backend/storage/buffer/Makefile @@ -4,12 +4,13 @@ # Makefile for storage/buffer # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/buffer/Makefile,v 1.14 2000/05/29 05:45:00 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/buffer/Makefile,v 1.15 2000/08/31 16:10:30 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../../.. -include ../../../Makefile.global +subdir = src/backend/storage/buffer +top_builddir = ../../../.. +include $(top_builddir)/src/Makefile.global OBJS = buf_table.o buf_init.o bufmgr.o freelist.o localbuf.o s_lock.o diff --git a/src/backend/storage/file/Makefile b/src/backend/storage/file/Makefile index d011d4a7a0c..1e5e42b1d57 100644 --- a/src/backend/storage/file/Makefile +++ b/src/backend/storage/file/Makefile @@ -4,12 +4,13 @@ # Makefile for storage/file # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/file/Makefile,v 1.9 2000/05/29 05:45:03 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/file/Makefile,v 1.10 2000/08/31 16:10:31 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../../.. -include ../../../Makefile.global +subdir = src/backend/storage/file +top_builddir = ../../../.. +include $(top_builddir)/src/Makefile.global OBJS = fd.o buffile.o @@ -27,4 +28,3 @@ clean: ifeq (depend,$(wildcard depend)) include depend endif - diff --git a/src/backend/storage/ipc/Makefile b/src/backend/storage/ipc/Makefile index dc6989bbcd8..22ee0feaad5 100644 --- a/src/backend/storage/ipc/Makefile +++ b/src/backend/storage/ipc/Makefile @@ -1,12 +1,12 @@ # # Makefile for storage/ipc # -# $Header: /cvsroot/pgsql/src/backend/storage/ipc/Makefile,v 1.12 2000/07/13 16:06:54 petere Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/ipc/Makefile,v 1.13 2000/08/31 16:10:33 petere Exp $ # subdir = src/backend/storage/ipc top_builddir = ../../../.. -include ../../../Makefile.global +include $(top_builddir)/src/Makefile.global # seems to be required 1999/07/22 bjm ifeq ($(CPU), alpha) diff --git a/src/backend/storage/large_object/Makefile b/src/backend/storage/large_object/Makefile index fbf66847c2a..63f2d6d40f0 100644 --- a/src/backend/storage/large_object/Makefile +++ b/src/backend/storage/large_object/Makefile @@ -4,12 +4,13 @@ # Makefile for storage/large_object # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/large_object/Makefile,v 1.9 2000/05/29 05:45:07 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/large_object/Makefile,v 1.10 2000/08/31 16:10:34 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../../.. -include ../../../Makefile.global +subdir = src/backend/storage/large_object +top_builddir = ../../../.. +include $(top_builddir)/src/Makefile.global OBJS = inv_api.o @@ -27,4 +28,3 @@ clean: ifeq (depend,$(wildcard depend)) include depend endif - diff --git a/src/backend/storage/lmgr/Makefile b/src/backend/storage/lmgr/Makefile index f284d39318a..fca9a24a573 100644 --- a/src/backend/storage/lmgr/Makefile +++ b/src/backend/storage/lmgr/Makefile @@ -4,12 +4,13 @@ # Makefile for storage/lmgr # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Makefile,v 1.13 2000/05/29 05:45:08 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Makefile,v 1.14 2000/08/31 16:10:36 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../../.. -include ../../../Makefile.global +subdir = src/backend/storage/lmgr +top_builddir = ../../../.. +include $(top_builddir)/src/Makefile.global OBJS = lmgr.o lock.o proc.o @@ -27,4 +28,3 @@ clean: ifeq (depend,$(wildcard depend)) include depend endif - diff --git a/src/backend/storage/page/Makefile b/src/backend/storage/page/Makefile index 14d1780c993..eef5b314033 100644 --- a/src/backend/storage/page/Makefile +++ b/src/backend/storage/page/Makefile @@ -4,12 +4,13 @@ # Makefile for storage/page # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/page/Makefile,v 1.9 2000/05/29 05:45:12 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/page/Makefile,v 1.10 2000/08/31 16:10:37 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../../.. -include ../../../Makefile.global +subdir = src/backend/storage/page +top_builddir = ../../../.. +include $(top_builddir)/src/Makefile.global OBJS = bufpage.o itemptr.o @@ -27,4 +28,3 @@ clean: ifeq (depend,$(wildcard depend)) include depend endif - diff --git a/src/backend/storage/smgr/Makefile b/src/backend/storage/smgr/Makefile index f68443cd5df..ea225ecc5ab 100644 --- a/src/backend/storage/smgr/Makefile +++ b/src/backend/storage/smgr/Makefile @@ -4,12 +4,13 @@ # Makefile for storage/smgr # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/smgr/Makefile,v 1.12 2000/05/29 05:45:14 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/smgr/Makefile,v 1.13 2000/08/31 16:10:38 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../../.. -include ../../../Makefile.global +subdir = src/backend/storage/smgr +top_builddir = ../../../.. +include $(top_builddir)/src/Makefile.global OBJS = md.o mm.o smgr.o smgrtype.o @@ -27,4 +28,3 @@ clean: ifeq (depend,$(wildcard depend)) include depend endif - diff --git a/src/backend/tcop/Makefile b/src/backend/tcop/Makefile index 5fafc75f691..094b52c5e9a 100644 --- a/src/backend/tcop/Makefile +++ b/src/backend/tcop/Makefile @@ -4,16 +4,13 @@ # Makefile for tcop # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.23 2000/05/29 05:45:16 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.24 2000/08/31 16:10:40 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR= ../.. -include $(SRCDIR)/Makefile.global - -ifeq ($(CC), gcc) -CFLAGS+= -Wno-error -endif +subdir = src/backend/tcop +top_builddir = ../../.. +include $(top_builddir)/src/Makefile.global OBJS= dest.o fastpath.o postgres.o pquery.o utility.o @@ -31,4 +28,3 @@ clean: ifeq (depend,$(wildcard depend)) include depend endif - diff --git a/src/backend/tioga/Makefile b/src/backend/tioga/Makefile index 041593f79ac..e8a3d8b4600 100644 --- a/src/backend/tioga/Makefile +++ b/src/backend/tioga/Makefile @@ -4,14 +4,16 @@ # Makefile for tioga # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/tioga/Attic/Makefile,v 1.7 2000/05/29 05:45:18 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/tioga/Attic/Makefile,v 1.8 2000/08/31 16:10:41 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../.. -include ../../Makefile.global +subdir = src/backend/tioga +top_builddir = ../../.. +include $(top_builddir)/src/Makefile.global OBJS = tgRecipe.o Varray.o +CPPFLAGS += -I$(srcdir) all: SUBSYS.o @@ -27,4 +29,3 @@ clean: ifeq (depend,$(wildcard depend)) include depend endif - diff --git a/src/backend/utils/Makefile b/src/backend/utils/Makefile index b57232209f9..8658e0d4f8d 100644 --- a/src/backend/utils/Makefile +++ b/src/backend/utils/Makefile @@ -1,12 +1,12 @@ # # Makefile for utils # -# $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.17 2000/07/13 16:07:06 petere Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.18 2000/08/31 16:10:42 petere Exp $ # subdir = src/backend/utils/ top_builddir = ../../.. -include ../../Makefile.global +include $(top_builddir)/src/Makefile.global SUBDIRS := adt cache error fmgr hash init misc mmgr sort time ifdef MULTIBYTE diff --git a/src/backend/utils/adt/Makefile b/src/backend/utils/adt/Makefile index 702326f7371..62ec9bcb87f 100644 --- a/src/backend/utils/adt/Makefile +++ b/src/backend/utils/adt/Makefile @@ -1,12 +1,12 @@ # # Makefile for utils/adt # -# $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.44 2000/08/05 14:59:17 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.45 2000/08/31 16:10:45 petere Exp $ # subdir = src/backend/utils/adt top_builddir = ../../../.. -include ../../../Makefile.global +include $(top_builddir)/src/Makefile.global # seems to be required for some date/time stuff 1999/07/22 bjm ifeq ($(CPU),alpha) @@ -40,6 +40,3 @@ clean: ifeq (depend,$(wildcard depend)) include depend endif - - - diff --git a/src/backend/utils/cache/Makefile b/src/backend/utils/cache/Makefile index eaa4e764d5d..01896efdd33 100644 --- a/src/backend/utils/cache/Makefile +++ b/src/backend/utils/cache/Makefile @@ -4,12 +4,13 @@ # Makefile for utils/cache # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/cache/Makefile,v 1.13 2000/05/29 05:45:24 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/cache/Makefile,v 1.14 2000/08/31 16:10:46 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../../.. -include ../../../Makefile.global +subdir = src/backend/utils/cache +top_builddir = ../../../.. +include $(top_builddir)/src/Makefile.global OBJS = catcache.o inval.o rel.o relcache.o syscache.o lsyscache.o \ fcache.o temprel.o @@ -28,4 +29,3 @@ clean: ifeq (depend,$(wildcard depend)) include depend endif - diff --git a/src/backend/utils/error/Makefile b/src/backend/utils/error/Makefile index 2313f52aee2..147f03c0770 100644 --- a/src/backend/utils/error/Makefile +++ b/src/backend/utils/error/Makefile @@ -4,12 +4,13 @@ # Makefile for utils/error # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/error/Makefile,v 1.8 2000/05/29 05:45:27 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/error/Makefile,v 1.9 2000/08/31 16:10:48 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../../.. -include ../../../Makefile.global +subdir = src/backend/utils/error +top_builddir = ../../../.. +include $(top_builddir)/src/Makefile.global OBJS = assert.o elog.o exc.o excabort.o excid.o format.o @@ -27,4 +28,3 @@ clean: ifeq (depend,$(wildcard depend)) include depend endif - diff --git a/src/backend/utils/fmgr/Makefile b/src/backend/utils/fmgr/Makefile index f08c3fafdd7..1e7c19db331 100644 --- a/src/backend/utils/fmgr/Makefile +++ b/src/backend/utils/fmgr/Makefile @@ -4,12 +4,13 @@ # Makefile for utils/fmgr # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/fmgr/Makefile,v 1.9 2000/05/29 05:45:30 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/fmgr/Makefile,v 1.10 2000/08/31 16:10:50 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../../.. -include ../../../Makefile.global +subdir = src/backend/utils/fmgr +top_builddir = ../../../.. +include $(top_builddir)/src/Makefile.global OBJS = dfmgr.o fmgr.o @@ -27,4 +28,3 @@ clean: ifeq (depend,$(wildcard depend)) include depend endif - diff --git a/src/backend/utils/hash/Makefile b/src/backend/utils/hash/Makefile index 282cd2527a5..38db1cda30c 100644 --- a/src/backend/utils/hash/Makefile +++ b/src/backend/utils/hash/Makefile @@ -4,12 +4,13 @@ # Makefile for utils/hash # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/hash/Makefile,v 1.8 2000/05/29 05:45:30 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/hash/Makefile,v 1.9 2000/08/31 16:10:51 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../../.. -include ../../../Makefile.global +subdir = src/backend/utils/hash +top_builddir = ../../../.. +include $(top_builddir)/src/Makefile.global OBJS = dynahash.o hashfn.o @@ -27,4 +28,3 @@ clean: ifeq (depend,$(wildcard depend)) include depend endif - diff --git a/src/backend/utils/init/Makefile b/src/backend/utils/init/Makefile index 9e3e3e9d42b..d30914ad2ae 100644 --- a/src/backend/utils/init/Makefile +++ b/src/backend/utils/init/Makefile @@ -4,12 +4,13 @@ # Makefile for utils/init # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/init/Makefile,v 1.14 2000/06/28 03:32:43 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/init/Makefile,v 1.15 2000/08/31 16:10:52 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../../.. -include ../../../Makefile.global +subdir = src/backend/utils/init +top_builddir = ../../../.. +include $(top_builddir)/src/Makefile.global OBJS = findbe.o globals.o miscinit.o postinit.o diff --git a/src/backend/utils/mb/Makefile b/src/backend/utils/mb/Makefile index 3f38eb41a97..0e40824f1a4 100644 --- a/src/backend/utils/mb/Makefile +++ b/src/backend/utils/mb/Makefile @@ -4,12 +4,13 @@ # Makefile for utils/mb # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/mb/Makefile,v 1.9 2000/08/27 10:40:48 ishii Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/mb/Makefile,v 1.10 2000/08/31 16:10:56 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../../.. -include ../../../Makefile.global +subdir = src/backend/utils/mb +top_builddir = ../../../.. +include $(top_builddir)/src/Makefile.global OBJS = common.o conv.o mbutils.o wchar.o wstrcmp.o wstrncmp.o variable.o \ big5.o @@ -47,4 +48,3 @@ clean: ifeq (depend,$(wildcard depend)) include depend endif - diff --git a/src/backend/utils/mmgr/Makefile b/src/backend/utils/mmgr/Makefile index 371f9767814..234045c9aab 100644 --- a/src/backend/utils/mmgr/Makefile +++ b/src/backend/utils/mmgr/Makefile @@ -4,12 +4,13 @@ # Makefile for utils/mmgr # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Makefile,v 1.9 2000/06/28 03:32:50 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Makefile,v 1.10 2000/08/31 16:10:58 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../../.. -include ../../../Makefile.global +subdir = src/backend/utils/mmgr +top_builddir = ../../../.. +include $(top_builddir)/src/Makefile.global OBJS = aset.o mcxt.o portalmem.o @@ -27,4 +28,3 @@ clean: ifeq (depend,$(wildcard depend)) include depend endif - diff --git a/src/backend/utils/sort/Makefile b/src/backend/utils/sort/Makefile index 2ae96894b92..3491d742080 100644 --- a/src/backend/utils/sort/Makefile +++ b/src/backend/utils/sort/Makefile @@ -4,12 +4,13 @@ # Makefile for utils/sort # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/sort/Makefile,v 1.11 2000/06/18 22:44:20 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/sort/Makefile,v 1.12 2000/08/31 16:10:59 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../../.. -include ../../../Makefile.global +subdir = src/backend/utils/sort +top_builddir = ../../../.. +include $(top_builddir)/src/Makefile.global OBJS = logtape.o tuplesort.o tuplestore.o @@ -27,4 +28,3 @@ clean: ifeq (depend,$(wildcard depend)) include depend endif - diff --git a/src/backend/utils/time/Makefile b/src/backend/utils/time/Makefile index d4ee33d5563..625f1869308 100644 --- a/src/backend/utils/time/Makefile +++ b/src/backend/utils/time/Makefile @@ -4,12 +4,13 @@ # Makefile for utils/time # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/time/Makefile,v 1.8 2000/05/29 05:45:42 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/time/Makefile,v 1.9 2000/08/31 16:11:01 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../../.. -include ../../../Makefile.global +subdir = src/backend/utils/time +top_builddir = ../../../.. +include $(top_builddir)/src/Makefile.global OBJS = tqual.o @@ -27,4 +28,3 @@ clean: ifeq (depend,$(wildcard depend)) include depend endif - |