diff options
| author | Bruce Momjian | 1998-04-06 00:32:26 +0000 |
|---|---|---|
| committer | Bruce Momjian | 1998-04-06 00:32:26 +0000 |
| commit | 1e801a8f16ae0b308ac3aea88dddcb676f412580 (patch) | |
| tree | 8550c33916f565375f815c7e6c1826f620778374 /src/backend | |
| parent | 2dfee9345773e6ac8809396bf99db538e134fea8 (diff) | |
Hi,
Attached you'll find a (big) patch that fixes make dep and make
depend in all Makefiles where I found it to be appropriate.
It also removes the dependency in Makefile.global for NAMEDATALEN
and OIDNAMELEN by making backend/catalog/genbki.sh and bin/initdb/initdb.sh
a little smarter.
This no longer requires initdb.sh that is turned into initdb with
a sed script when installing Postgres, hence initdb.sh should be
renamed to initdb (after the patch has been applied :-) )
This patch is against the 6.3 sources, as it took a while to
complete.
Please review and apply,
Cheers,
Jeroen van Vianen
Diffstat (limited to 'src/backend')
47 files changed, 169 insertions, 311 deletions
diff --git a/src/backend/access/common/Makefile b/src/backend/access/common/Makefile index 594ec514db..73b1b3ea82 100644 --- a/src/backend/access/common/Makefile +++ b/src/backend/access/common/Makefile @@ -4,16 +4,14 @@ # Makefile for access/common # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.9 1998/01/15 19:41:42 pgsql Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.10 1998/04/06 00:20:44 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. - -CFLAGS+=$(INCLUDE_OPT) +CFLAGS+=-I../.. OBJS = heaptuple.o heapvalid.o indextuple.o indexvalid.o printtup.o \ scankey.o tupdesc.o @@ -28,8 +26,8 @@ heaptuple.o heapvalid.o tupdesc.o: ../../fmgr.h ../../fmgr.h: $(MAKE) -C ../.. fmgr.h -dep: ../../fmgr.h - $(CC) -MM $(INCLUDE_OPT) *.c >depend +dep depend: ../../fmgr.h + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) @@ -37,4 +35,3 @@ clean: ifeq (depend,$(wildcard depend)) include depend endif - diff --git a/src/backend/access/gist/Makefile b/src/backend/access/gist/Makefile index 62be5d4d1c..bb93730d47 100644 --- a/src/backend/access/gist/Makefile +++ b/src/backend/access/gist/Makefile @@ -4,16 +4,14 @@ # Makefile for access/gist # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/gist/Makefile,v 1.5 1997/12/20 00:22:16 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/gist/Makefile,v 1.6 1998/04/06 00:20:49 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. - -CFLAGS += $(INCLUDE_OPT) +CFLAGS += -I../.. OBJS = gist.o gistget.o gistscan.o giststrat.o @@ -23,7 +21,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/access/hash/Makefile b/src/backend/access/hash/Makefile index 798cf54ab4..9f65126dcc 100644 --- a/src/backend/access/hash/Makefile +++ b/src/backend/access/hash/Makefile @@ -4,16 +4,14 @@ # Makefile for access/hash # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/hash/Makefile,v 1.5 1997/12/20 00:22:31 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/hash/Makefile,v 1.6 1998/04/06 00:20:58 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. - -CFLAGS += $(INCLUDE_OPT) +CFLAGS += -I../.. OBJS = hash.o hashfunc.o hashinsert.o hashovfl.o hashpage.o hashscan.o \ hashsearch.o hashstrat.o hashutil.o @@ -24,7 +22,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/access/heap/Makefile b/src/backend/access/heap/Makefile index eaa818fbef..b876c6099e 100644 --- a/src/backend/access/heap/Makefile +++ b/src/backend/access/heap/Makefile @@ -4,16 +4,14 @@ # Makefile for access/heap # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/heap/Makefile,v 1.5 1997/12/20 00:22:39 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/heap/Makefile,v 1.6 1998/04/06 00:21:09 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. - -CFLAGS += $(INCLUDE_OPT) +CFLAGS += -I../.. OBJS = heapam.o hio.o stats.o @@ -23,7 +21,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/access/index/Makefile b/src/backend/access/index/Makefile index a1978a660a..c57c4d5237 100644 --- a/src/backend/access/index/Makefile +++ b/src/backend/access/index/Makefile @@ -4,16 +4,14 @@ # Makefile for access/index # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/index/Makefile,v 1.5 1997/12/20 00:22:47 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/index/Makefile,v 1.6 1998/04/06 00:21:24 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. - -CFLAGS += $(INCLUDE_OPT) +CFLAGS += -I../.. OBJS = genam.o indexam.o istrat.o @@ -23,7 +21,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/access/nbtree/Makefile b/src/backend/access/nbtree/Makefile index b6a1804ba2..b0ad3f3670 100644 --- a/src/backend/access/nbtree/Makefile +++ b/src/backend/access/nbtree/Makefile @@ -4,16 +4,14 @@ # Makefile for access/nbtree # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/nbtree/Makefile,v 1.5 1997/12/20 00:22:54 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/nbtree/Makefile,v 1.6 1998/04/06 00:21:34 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. - -CFLAGS += $(INCLUDE_OPT) +CFLAGS += -I../.. OBJS = nbtcompare.o nbtinsert.o nbtpage.o nbtree.o nbtscan.o nbtsearch.o \ nbtstrat.o nbtutils.o nbtsort.o @@ -24,7 +22,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/access/rtree/Makefile b/src/backend/access/rtree/Makefile index 146ca76f15..9bb5fdfa0f 100644 --- a/src/backend/access/rtree/Makefile +++ b/src/backend/access/rtree/Makefile @@ -4,16 +4,14 @@ # Makefile for access/rtree # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/Makefile,v 1.5 1997/12/20 00:23:00 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/Makefile,v 1.6 1998/04/06 00:21:41 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. - -CFLAGS += $(INCLUDE_OPT) +CFLAGS += -I../.. OBJS = rtget.o rtproc.o rtree.o rtscan.o rtstrat.o @@ -23,7 +21,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/access/transam/Makefile b/src/backend/access/transam/Makefile index 4fb565e999..69d507b3d9 100644 --- a/src/backend/access/transam/Makefile +++ b/src/backend/access/transam/Makefile @@ -4,16 +4,14 @@ # Makefile for access/transam # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/transam/Makefile,v 1.5 1997/12/20 00:23:09 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/transam/Makefile,v 1.6 1998/04/06 00:21:52 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. - -CFLAGS += $(INCLUDE_OPT) +CFLAGS += -I../.. OBJS = transam.o transsup.o varsup.o xact.o xid.o @@ -23,7 +21,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/bootstrap/Makefile b/src/backend/bootstrap/Makefile index 8835803b73..b172c4d267 100644 --- a/src/backend/bootstrap/Makefile +++ b/src/backend/bootstrap/Makefile @@ -4,7 +4,7 @@ # Makefile for the bootstrap module # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.12 1997/12/20 00:23:19 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.13 1998/04/06 00:22:02 momjian Exp $ # # # We must build bootparse.c and bootscanner.c with yacc and lex and sed, @@ -21,9 +21,7 @@ SRCDIR= ../.. include ../../Makefile.global -INCLUDE_OPT= -I.. - -CFLAGS+= $(INCLUDE_OPT) +CFLAGS += -I.. ifeq ($(CC), gcc) CFLAGS+= -Wno-error @@ -65,8 +63,8 @@ clean: # This is unusual: We actually have to build some of the parts before # we know what the header file dependencies are. -dep: bootparse.c bootscanner.c bootstrap_tokens.h - $(CC) -MM $(INCLUDE_OPT) *.c >depend +dep depend: bootparse.c bootscanner.c bootstrap_tokens.h + $(CC) -MM $(CFLAGS) *.c >depend ifeq (depend,$(wildcard depend)) include depend diff --git a/src/backend/catalog/Makefile b/src/backend/catalog/Makefile index 51fd03d74c..f13fa5f92a 100644 --- a/src/backend/catalog/Makefile +++ b/src/backend/catalog/Makefile @@ -4,16 +4,14 @@ # Makefile for catalog # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.9 1998/02/25 13:05:55 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.10 1998/04/06 00:22:13 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../.. include ../../Makefile.global -INCLUDE_OPT = -I.. - -CFLAGS+=$(INCLUDE_OPT) +CFLAGS += -I.. OBJS = catalog.o heap.o index.o indexing.o aclchk.o \ pg_aggregate.o pg_operator.o pg_proc.o pg_type.o @@ -47,7 +45,7 @@ local1_template1.bki.source: $(GENBKI) $(LOCALBKI_SRCS) sh $(SHOPTS) $(GENBKI) $(BKIOPTS) $(LOCALBKI_SRCS) > $@ 2>local1_template1.description depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) global1.bki.source local1_template1.bki.source \ diff --git a/src/backend/catalog/genbki.sh b/src/backend/catalog/genbki.sh index ef43d5d242..c6b0cf0a28 100644 --- a/src/backend/catalog/genbki.sh +++ b/src/backend/catalog/genbki.sh @@ -10,7 +10,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/catalog/Attic/genbki.sh,v 1.9 1997/11/13 03:22:20 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/catalog/Attic/genbki.sh,v 1.10 1998/04/06 00:22:16 momjian Exp $ # # NOTES # non-essential whitespace is removed from the generated file. @@ -52,6 +52,10 @@ while test $x -le $numargs ; do shift done +# Get NAMEDATALEN and OIDNAMELEN from postgres_ext.h +NAMEDATALEN=`grep '#define.*NAMEDATALEN' ../../include/postgres_ext.h | awk '{ print $3 }'` +OIDNAMELEN=`grep '#define.*OIDNAMELEN' ../../include/postgres_ext.h | awk '{ print $3 }'` + # ---------------- # strip comments and trash from .h before we generate # the .bki file... @@ -68,14 +72,16 @@ sed -e 's;/\*.*\*/;;g' \ -e 's;\*/;\ */\ ;g' | # we must run a new sed here to see the newlines we added -sed -e 's/;[ ]*$//g' \ - -e 's/^[ ]*//' \ - -e 's/[ ]Oid/\ oid/g' \ - -e 's/[ ]NameData/\ name/g' \ - -e 's/^Oid/oid/g' \ - -e 's/^NameData/\name/g' \ - -e 's/(NameData/(name/g' \ - -e 's/(Oid/(oid/g' | \ +sed -e "s/;[ ]*$//g" \ + -e "s/^[ ]*//" \ + -e "s/[ ]Oid/\ oid/g" \ + -e "s/[ ]NameData/\ name/g" \ + -e "s/^Oid/oid/g" \ + -e "s/^NameData/\name/g" \ + -e "s/(NameData/(name/g" \ + -e "s/(Oid/(oid/g" \ + -e "s/NAMEDATALEN/$NAMEDATALEN/g" \ + -e "s/OIDNAMELEN/$OIDNAMELEN/g" | \ awk ' # ---------------- # now use awk to process remaining .h file.. diff --git a/src/backend/commands/Makefile b/src/backend/commands/Makefile index a0ed959437..7e4fe415c3 100644 --- a/src/backend/commands/Makefile +++ b/src/backend/commands/Makefile @@ -4,16 +4,14 @@ # Makefile for commands # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.11 1998/01/05 18:42:45 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.12 1998/04/06 00:22:19 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../.. include ../../Makefile.global -INCLUDE_OPT = -I.. - -CFLAGS+=$(INCLUDE_OPT) +CFLAGS += -I.. OBJS = async.o creatinh.o command.o copy.o defind.o define.o \ remove.o rename.o vacuum.o version.o view.o cluster.o \ @@ -26,7 +24,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/executor/Makefile b/src/backend/executor/Makefile index 9ae3cfc351..59339d1473 100644 --- a/src/backend/executor/Makefile +++ b/src/backend/executor/Makefile @@ -4,16 +4,14 @@ # Makefile for executor # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/executor/Makefile,v 1.6 1998/02/13 03:26:35 vadim Exp $ +# $Header: /cvsroot/pgsql/src/backend/executor/Makefile,v 1.7 1998/04/06 00:22:26 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../.. include ../../Makefile.global -INCLUDE_OPT = -I.. - -CFLAGS+=$(INCLUDE_OPT) +CFLAGS += -I.. OBJS = execAmi.o execFlatten.o execJunk.o execMain.o \ execProcnode.o execQual.o execScan.o execTuples.o \ @@ -28,7 +26,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/libpq/Makefile b/src/backend/libpq/Makefile index 1659ad7ea1..a608044fac 100644 --- a/src/backend/libpq/Makefile +++ b/src/backend/libpq/Makefile @@ -4,16 +4,14 @@ # Makefile for libpq subsystem (backend half of libpq interface) # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.10 1997/12/20 00:23:57 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.11 1998/04/06 00:22:39 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../.. include ../../Makefile.global -INCLUDE_OPT = -I.. - -CFLAGS+=$(INCLUDE_OPT) +CFLAGS += -I.. # kerberos flags ifdef KRBVERS @@ -36,7 +34,7 @@ be-dumpdata.o be-pqexec.o: ../fmgr.h $(MAKE) -C .. fmgr.h depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/main/Makefile b/src/backend/main/Makefile index 2254c9b44a..a01b1092ac 100644 --- a/src/backend/main/Makefile +++ b/src/backend/main/Makefile @@ -4,16 +4,14 @@ # Makefile for main # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/main/Makefile,v 1.4 1997/12/20 00:24:03 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/main/Makefile,v 1.5 1998/04/06 00:22:51 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../.. include ../../Makefile.global -INCLUDE_OPT = -I.. - -CFLAGS+=$(INCLUDE_OPT) +CFLAGS += -I.. OBJS = main.o @@ -23,7 +21,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/nodes/Makefile b/src/backend/nodes/Makefile index 70a298ced2..7e34521f6b 100644 --- a/src/backend/nodes/Makefile +++ b/src/backend/nodes/Makefile @@ -4,16 +4,14 @@ # Makefile for nodes # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/nodes/Makefile,v 1.5 1997/12/20 00:24:08 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/nodes/Makefile,v 1.6 1998/04/06 00:23:00 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../.. include ../../Makefile.global -INCLUDE_OPT = -I.. - -CFLAGS+=$(INCLUDE_OPT) +CFLAGS += -I.. OBJS = nodeFuncs.o nodes.o list.o \ copyfuncs.o equalfuncs.o makefuncs.o outfuncs.o readfuncs.o \ @@ -25,7 +23,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/optimizer/Makefile b/src/backend/optimizer/Makefile index 40c92028d9..ce5b8ac8a1 100644 --- a/src/backend/optimizer/Makefile +++ b/src/backend/optimizer/Makefile @@ -4,7 +4,7 @@ # Makefile for optimizer # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/optimizer/Makefile,v 1.4 1997/06/11 01:12:55 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/optimizer/Makefile,v 1.5 1998/04/06 00:23:04 momjian Exp $ # #------------------------------------------------------------------------- @@ -15,28 +15,18 @@ all: submake SUBSYS.o OBJS = path/SUBSYS.o plan/SUBSYS.o prep/SUBSYS.o util/SUBSYS.o geqo/SUBSYS.o +DIRS = path plan prep util geqo + SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) -.PHONY: submake clean +.PHONY: submake clean dep depend submake: - $(MAKE) -C path SUBSYS.o - $(MAKE) -C plan SUBSYS.o - $(MAKE) -C prep SUBSYS.o - $(MAKE) -C util SUBSYS.o - $(MAKE) -C geqo SUBSYS.o + for i in $(DIRS); do $(MAKE) -C $$i SUBSYS.o; done clean: rm -f SUBSYS.o - $(MAKE) -C path clean - $(MAKE) -C plan clean - $(MAKE) -C prep clean - $(MAKE) -C util clean - $(MAKE) -C geqo clean + for i in $(DIRS); do $(MAKE) -C $$i clean; done .DEFAULT: - $(MAKE) -C path $@ - $(MAKE) -C plan $@ - $(MAKE) -C prep $@ - $(MAKE) -C util $@ - $(MAKE) -C geqo $@ + for i in $(DIRS); do $(MAKE) -C $$i $@; done diff --git a/src/backend/optimizer/geqo/Makefile b/src/backend/optimizer/geqo/Makefile index 35e76fb4d5..9a2cef6602 100644 --- a/src/backend/optimizer/geqo/Makefile +++ b/src/backend/optimizer/geqo/Makefile @@ -5,22 +5,19 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Id: Makefile,v 1.9 1997/12/20 00:24:17 scrappy Exp $ +# $Id: Makefile,v 1.10 1998/04/06 00:23:07 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. - -CFLAGS+=$(INCLUDE_OPT) +CFLAGS += -I../.. ifeq ($(CC), gcc) CFLAGS+= -Wno-error endif - OBJS = geqo_copy.o geqo_eval.o geqo_main.o geqo_misc.o \ geqo_params.o geqo_paths.o geqo_pool.o geqo_recombination.o \ geqo_selection.o \ @@ -34,7 +31,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/optimizer/path/Makefile b/src/backend/optimizer/path/Makefile index 030de18ac8..88525cdfea 100644 --- a/src/backend/optimizer/path/Makefile +++ b/src/backend/optimizer/path/Makefile @@ -4,16 +4,14 @@ # Makefile for optimizer/path # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/optimizer/path/Makefile,v 1.5 1997/12/20 00:24:23 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/optimizer/path/Makefile,v 1.6 1998/04/06 00:23:17 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. - -CFLAGS+=$(INCLUDE_OPT) +CFLAGS += -I../.. OBJS = allpaths.o clausesel.o costsize.o hashutils.o indxpath.o \ joinpath.o joinrels.o joinutils.o mergeutils.o orindxpath.o \ @@ -27,7 +25,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/optimizer/plan/Makefile b/src/backend/optimizer/plan/Makefile index 19690ae208..5164f1c2a9 100644 --- a/src/backend/optimizer/plan/Makefile +++ b/src/backend/optimizer/plan/Makefile @@ -4,16 +4,14 @@ # Makefile for optimizer/plan # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/optimizer/plan/Makefile,v 1.6 1998/02/13 03:36:51 vadim Exp $ +# $Header: /cvsroot/pgsql/src/backend/optimizer/plan/Makefile,v 1.7 1998/04/06 00:23:31 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. - -CFLAGS+=$(INCLUDE_OPT) +CFLAGS += -I../.. OBJS = createplan.o initsplan.o planmain.o planner.o setrefs.o subselect.o @@ -25,7 +23,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/optimizer/prep/Makefile b/src/backend/optimizer/prep/Makefile index 284a1e1798..6255a853d4 100644 --- a/src/backend/optimizer/prep/Makefile +++ b/src/backend/optimizer/prep/Makefile @@ -4,16 +4,14 @@ # Makefile for optimizer/prep # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/optimizer/prep/Makefile,v 1.6 1997/12/20 00:24:38 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/optimizer/prep/Makefile,v 1.7 1998/04/06 00:23:48 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. - -CFLAGS+=$(INCLUDE_OPT) +CFLAGS += -I../.. OBJS = prepqual.o preptlist.o prepunion.o @@ -25,7 +23,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/optimizer/util/Makefile b/src/backend/optimizer/util/Makefile index dd8511c715..fcd2e6444a 100644 --- a/src/backend/optimizer/util/Makefile +++ b/src/backend/optimizer/util/Makefile @@ -4,16 +4,14 @@ # Makefile for optimizer/util # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/optimizer/util/Makefile,v 1.5 1997/12/20 00:24:45 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/optimizer/util/Makefile,v 1.6 1998/04/06 00:23:55 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. - -CFLAGS+=$(INCLUDE_OPT) +CFLAGS += -I../.. OBJS = clauseinfo.o clauses.o indexnode.o internal.o plancat.o \ joininfo.o keys.o ordering.o pathnode.o relnode.o tlist.o var.o @@ -26,7 +24,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/parser/Makefile b/src/backend/parser/Makefile index 6f4fbe16a1..d1d5885a5b 100644 --- a/src/backend/parser/Makefile +++ b/src/backend/parser/Makefile @@ -4,16 +4,14 @@ # Makefile for parser # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.14 1998/02/18 07:37:05 thomas Exp $ +# $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.15 1998/04/06 00:24:02 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR= ../.. include ../../Makefile.global -INCLUDE_OPT= -I.. - -CFLAGS+= $(INCLUDE_OPT) +CFLAGS += -I.. ifeq ($(CC), gcc) CFLAGS+= -Wno-error @@ -47,8 +45,8 @@ analyze.o keywords.o scan.o: parse.h # This is unusual: We actually have to build some of the parts before # we know what the header file dependencies are. -dep: gram.c scan.c - $(CC) -MM $(INCLUDE_OPT) *.c >depend +dep depend: gram.c scan.c + $(CC) -MM $(CFLAGS) *.c >depend # Remove scan.c from the clean since we want to avoid rebuilding when using # the original source distribution. This should help Solaris machines whose diff --git a/src/backend/port/Makefile.in b/src/backend/port/Makefile.in index 9a442dba38..b3f7f5b7b4 100644 --- a/src/backend/port/Makefile.in +++ b/src/backend/port/Makefile.in @@ -13,16 +13,14 @@ # be converted to Method 2. # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/port/Attic/Makefile.in,v 1.15 1998/02/24 06:04:30 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/port/Attic/Makefile.in,v 1.16 1998/04/06 00:24:10 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR=../.. include ../../Makefile.global -INCLUDE_OPT = -I.. - -CFLAGS+= ${INCLUDE_OPT} +CFLAGS+= -I.. OBJS = dynloader.o @INET_ATON@ @STRERROR@ @MISSING_RANDOM@ @SRANDOM@ OBJS+= @GETHOSTNAME@ @GETRUSAGE@ @STRCASECMP@ @STRDUP@ @TAS@ @ISINF@ @@ -38,7 +36,7 @@ distclean clean: rm -f SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend ifeq (depend,$(wildcard depend)) include depend diff --git a/src/backend/postmaster/Makefile b/src/backend/postmaster/Makefile index 8269ad5603..3cb191b9a0 100644 --- a/src/backend/postmaster/Makefile +++ b/src/backend/postmaster/Makefile @@ -4,16 +4,14 @@ # Makefile for postmaster # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/postmaster/Makefile,v 1.7 1997/12/20 00:26:52 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/postmaster/Makefile,v 1.8 1998/04/06 00:24:26 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../.. include ../../Makefile.global -INCLUDE_OPT = -I.. - -CFLAGS+=$(INCLUDE_OPT) +CFLAGS += -I.. OBJS = postmaster.o @@ -23,7 +21,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/regex/Makefile b/src/backend/regex/Makefile index 6f080cfcb5..42f635aaeb 100644 --- a/src/backend/regex/Makefile +++ b/src/backend/regex/Makefile @@ -4,17 +4,15 @@ # Makefile for regex # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/regex/Makefile,v 1.5 1998/03/15 07:38:14 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/regex/Makefile,v 1.6 1998/04/06 00:24:39 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../.. include ../../Makefile.global -INCLUDE_OPT = -I.. - -CFLAGS+=$(INCLUDE_OPT) -CFLAGS+=-DPOSIX_MISTAKE +CFLAGS += -I.. +CFLAGS += -DPOSIX_MISTAKE OBJS = regcomp.o regerror.o regexec.o regfree.o ifdef MB @@ -28,7 +26,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/rewrite/Makefile b/src/backend/rewrite/Makefile index 3fc4652322..cba2474b8b 100644 --- a/src/backend/rewrite/Makefile +++ b/src/backend/rewrite/Makefile @@ -4,16 +4,14 @@ # Makefile for rewrite # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/rewrite/Makefile,v 1.5 1997/12/20 00:27:05 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/rewrite/Makefile,v 1.6 1998/04/06 00:24:49 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../.. include ../../Makefile.global -INCLUDE_OPT = -I.. - -CFLAGS+=$(INCLUDE_OPT) +CFLAGS += -I.. OBJS = rewriteRemove.o rewriteDefine.o \ rewriteHandler.o rewriteManip.o rewriteSupport.o locks.o @@ -24,7 +22,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/storage/Makefile b/src/backend/storage/Makefile index 1fb7883251..4ea56a9769 100644 --- a/src/backend/storage/Makefile +++ b/src/backend/storage/Makefile @@ -4,7 +4,7 @@ # Makefile for the storage manager subsystem # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/Makefile,v 1.3 1997/06/11 01:13:10 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/Makefile,v 1.4 1998/04/06 00:24:53 momjian Exp $ # #------------------------------------------------------------------------- @@ -16,36 +16,19 @@ all: submake SUBSYS.o OBJS = buffer/SUBSYS.o file/SUBSYS.o ipc/SUBSYS.o large_object/SUBSYS.o \ lmgr/SUBSYS.o page/SUBSYS.o smgr/SUBSYS.o +DIRS = buffer file ipc large_object lmgr page smgr + SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) .PHONY: submake clean dep submake: - $(MAKE) -C buffer SUBSYS.o - $(MAKE) -C file SUBSYS.o - $(MAKE) -C ipc SUBSYS.o - $(MAKE) -C large_object SUBSYS.o - $(MAKE) -C lmgr SUBSYS.o - $(MAKE) -C page SUBSYS.o - $(MAKE) -C smgr SUBSYS.o + for i in $(DIRS); do $(MAKE) -C $$i SUBSYS.o; done clean: rm -f SUBSYS.o - $(MAKE) -C buffer clean - $(MAKE) -C file clean - $(MAKE) -C ipc clean - $(MAKE) -C large_object clean - $(MAKE) -C lmgr clean - $(MAKE) -C page clean - $(MAKE) -C smgr clean + for i in $(DIRS); do $(MAKE) -C $$i clean; done .DEFAULT: - $(MAKE) -C buffer $@ - $(MAKE) -C file $@ - $(MAKE) -C ipc $@ - $(MAKE) -C large_object $@ - $(MAKE) -C lmgr $@ - $(MAKE) -C page $@ - $(MAKE) -C smgr $@ - + for i in $(DIRS); do $(MAKE) -C $$i $@; done diff --git a/src/backend/storage/buffer/Makefile b/src/backend/storage/buffer/Makefile index 177621a925..1a926a19ac 100644 --- a/src/backend/storage/buffer/Makefile +++ b/src/backend/storage/buffer/Makefile @@ -4,16 +4,14 @@ # Makefile for storage/buffer # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/buffer/Makefile,v 1.6 1997/12/30 04:01:25 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/buffer/Makefile,v 1.7 1998/04/06 00:24:58 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. - -CFLAGS+=$(INCLUDE_OPT) +CFLAGS += -I../.. OBJS = buf_table.o buf_init.o bufmgr.o freelist.o localbuf.o s_lock.o @@ -23,7 +21,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/storage/file/Makefile b/src/backend/storage/file/Makefile index 6d9afc0e1d..9f321ff57f 100644 --- a/src/backend/storage/file/Makefile +++ b/src/backend/storage/file/Makefile @@ -4,16 +4,14 @@ # Makefile for storage/file # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/file/Makefile,v 1.4 1997/12/20 00:27:17 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/file/Makefile,v 1.5 1998/04/06 00:25:05 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. - -CFLAGS+=$(INCLUDE_OPT) +CFLAGS += -I../.. OBJS = fd.o @@ -23,7 +21,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/storage/ipc/Makefile b/src/backend/storage/ipc/Makefile index 473306790e..8bd303c0a6 100644 --- a/src/backend/storage/ipc/Makefile +++ b/src/backend/storage/ipc/Makefile @@ -4,16 +4,14 @@ # Makefile for storage/ipc # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/ipc/Makefile,v 1.6 1997/12/20 00:27:25 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/ipc/Makefile,v 1.7 1998/04/06 00:25:14 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. - -CFLAGS+=$(INCLUDE_OPT) +CFLAGS += -I../.. OBJS = ipc.o ipci.o shmem.o shmqueue.o sinval.o \ sinvaladt.o spin.o @@ -24,7 +22,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/storage/large_object/Makefile b/src/backend/storage/large_object/Makefile index c3e569a3b5..ae6bb06b6a 100644 --- a/src/backend/storage/large_object/Makefile +++ b/src/backend/storage/large_object/Makefile @@ -4,16 +4,14 @@ # Makefile for storage/large_object # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/large_object/Makefile,v 1.5 1997/12/20 00:27:35 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/large_object/Makefile,v 1.6 1998/04/06 00:25:30 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. - -CFLAGS+=$(INCLUDE_OPT) +CFLAGS += -I../.. OBJS = inv_api.o @@ -23,7 +21,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/storage/lmgr/Makefile b/src/backend/storage/lmgr/Makefile index d99c60c79e..be70c7234a 100644 --- a/src/backend/storage/lmgr/Makefile +++ b/src/backend/storage/lmgr/Makefile @@ -4,16 +4,14 @@ # Makefile for storage/lmgr # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Makefile,v 1.5 1997/12/20 00:27:44 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Makefile,v 1.6 1998/04/06 00:25:43 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. - -CFLAGS+=$(INCLUDE_OPT) +CFLAGS += -I../.. OBJS = lmgr.o lock.o multi.o proc.o single.o @@ -23,7 +21,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/storage/page/Makefile b/src/backend/storage/page/Makefile index 9abb56083f..7d2eeada60 100644 --- a/src/backend/storage/page/Makefile +++ b/src/backend/storage/page/Makefile @@ -4,16 +4,14 @@ # Makefile for storage/page # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/page/Makefile,v 1.5 1997/12/20 00:27:50 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/page/Makefile,v 1.6 1998/04/06 00:25:50 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. - -CFLAGS+=$(INCLUDE_OPT) +CFLAGS += -I../.. OBJS = bufpage.o itemptr.o @@ -23,7 +21,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/storage/smgr/Makefile b/src/backend/storage/smgr/Makefile index 3e44322668..ba3278d62d 100644 --- a/src/backend/storage/smgr/Makefile +++ b/src/backend/storage/smgr/Makefile @@ -4,16 +4,14 @@ # Makefile for storage/smgr # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/smgr/Makefile,v 1.5 1997/12/20 00:27:56 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/smgr/Makefile,v 1.6 1998/04/06 00:25:58 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. - -CFLAGS+=$(INCLUDE_OPT) +CFLAGS += -I../.. OBJS = md.o mm.o smgr.o smgrtype.o @@ -23,7 +21,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/tcop/Makefile b/src/backend/tcop/Makefile index 908160fae1..45cddf43aa 100644 --- a/src/backend/tcop/Makefile +++ b/src/backend/tcop/Makefile @@ -4,16 +4,14 @@ # Makefile for tcop # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.15 1998/01/05 18:42:59 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.16 1998/04/06 00:26:05 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR= ../.. include ../../Makefile.global -INCLUDE_OPT= -I.. - -CFLAGS+= $(INCLUDE_OPT) +CFLAGS+= -I.. ifeq ($(CC), gcc) CFLAGS+= -Wno-error @@ -42,8 +40,8 @@ postgres.o: ../fmgr.h ../fmgr.h: $(MAKE) -C .. fmgr.h -dep: ../parse.h ../fmgr.h - $(CC) -MM $(INCLUDE_OPT) *.c >depend +dep depend: ../parse.h ../fmgr.h + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/utils/Makefile b/src/backend/utils/Makefile index 3f2efbaa9b..887c7f0324 100644 --- a/src/backend/utils/Makefile +++ b/src/backend/utils/Makefile @@ -4,7 +4,7 @@ # Makefile for utils # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.5 1997/12/20 00:28:17 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.6 1998/04/06 00:26:13 momjian Exp $ # #------------------------------------------------------------------------- @@ -21,21 +21,14 @@ OBJS = fmgrtab.o adt/SUBSYS.o cache/SUBSYS.o error/SUBSYS.o \ fmgr/SUBSYS.o hash/SUBSYS.o init/SUBSYS.o misc/SUBSYS.o mmgr/SUBSYS.o \ sort/SUBSYS.o time/SUBSYS.o +DIRS = adt cache error fmgr hash init misc mmgr sort time + SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) .PHONY: submake clean dep submake: - $(MAKE) -C adt SUBSYS.o - $(MAKE) -C cache SUBSYS.o - $(MAKE) -C error SUBSYS.o - $(MAKE) -C fmgr SUBSYS.o - $(MAKE) -C hash SUBSYS.o - $(MAKE) -C init SUBSYS.o - $(MAKE) -C misc SUBSYS.o - $(MAKE) -C mmgr SUBSYS.o - $(MAKE) -C sort SUBSYS.o - $(MAKE) -C time SUBSYS.o + for i in $(DIRS); do $(MAKE) -C $$i SUBSYS.o; done fmgrtab.o: ../fmgr.h @@ -47,29 +40,10 @@ fmgr.h fmgrtab.c: ./Gen_fmgrtab.sh ../../include/catalog/pg_proc.h clean: rm -f SUBSYS.o fmgr.h fmgrtab.o fmgrtab.c - $(MAKE) -C adt clean - $(MAKE) -C cache clean - $(MAKE) -C error clean - $(MAKE) -C fmgr clean - $(MAKE) -C hash clean - $(MAKE) -C init clean - $(MAKE) -C misc clean - $(MAKE) -C mmgr clean - $(MAKE) -C sort clean - $(MAKE) -C time clean + for i in $(DIRS); do $(MAKE) -C $$i clean; done -dep: fmgr.h fmgrtab.c - $(CC) -MM $(INCLUDE_OPT) *.c >depend - $(MAKE) -C adt dep - $(MAKE) -C cache dep - $(MAKE) -C error dep - $(MAKE) -C fmgr dep - $(MAKE) -C hash dep - $(MAKE) -C init dep - $(MAKE) -C misc dep - $(MAKE) -C mmgr dep - $(MAKE) -C sort dep - $(MAKE) -C time dep +dep depend: fmgr.h fmgrtab.c + for i in $(DIRS); do $(MAKE) -C $$i depend; done ifeq (depend,$(wildcard depend)) include depend diff --git a/src/backend/utils/adt/Makefile b/src/backend/utils/adt/Makefile index 75cc755f7c..cd338b34bf 100644 --- a/src/backend/utils/adt/Makefile +++ b/src/backend/utils/adt/Makefile @@ -4,16 +4,15 @@ # Makefile for utils/adt # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.11 1998/03/15 07:38:42 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.12 1998/04/06 00:26:19 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. +CFLAGS += -I../.. -CFLAGS+=$(INCLUDE_OPT) ifdef MB CFLAGS+=-DMB=$(MB) endif @@ -31,7 +30,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/utils/cache/Makefile b/src/backend/utils/cache/Makefile index 4f0582cd95..46c267bbe5 100644 --- a/src/backend/utils/cache/Makefile +++ b/src/backend/utils/cache/Makefile @@ -4,16 +4,14 @@ # Makefile for utils/cache # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/cache/Makefile,v 1.5 1997/12/20 00:28:29 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/cache/Makefile,v 1.6 1998/04/06 00:26:33 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. - -CFLAGS+=$(INCLUDE_OPT) +CFLAGS += -I../.. OBJS = catcache.o inval.o rel.o relcache.o syscache.o lsyscache.o fcache.o @@ -23,7 +21,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/utils/error/Makefile b/src/backend/utils/error/Makefile index b83fa3b40b..20d7a9bc8b 100644 --- a/src/backend/utils/error/Makefile +++ b/src/backend/utils/error/Makefile @@ -4,16 +4,14 @@ # Makefile for utils/error # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/error/Makefile,v 1.4 1997/12/20 00:28:38 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/error/Makefile,v 1.5 1998/04/06 00:26:45 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. - -CFLAGS+=$(INCLUDE_OPT) +CFLAGS += -I../.. OBJS = assert.o elog.o exc.o excabort.o excid.o format.o @@ -23,7 +21,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/utils/fmgr/Makefile b/src/backend/utils/fmgr/Makefile index 1b354d1155..cf503d2cb8 100644 --- a/src/backend/utils/fmgr/Makefile +++ b/src/backend/utils/fmgr/Makefile @@ -4,24 +4,14 @@ # Makefile for utils/fmgr # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/fmgr/Makefile,v 1.5 1997/12/20 00:28:47 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/fmgr/Makefile,v 1.6 1998/04/06 00:26:52 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. - -CFLAGS+=$(INCLUDE_OPT) - -ifeq ($(PORTNAME), linux) -# LINUX_ELF tells us to use the ELF dynamic load facilities that come with -# Linux. - ifdef LINUX_ELF - CFLAGS+=-DLINUX_ELF - endif -endif +CFLAGS += -I../.. OBJS = dfmgr.o fmgr.o @@ -31,7 +21,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/utils/hash/Makefile b/src/backend/utils/hash/Makefile index 75b1de172c..419e204069 100644 --- a/src/backend/utils/hash/Makefile +++ b/src/backend/utils/hash/Makefile @@ -4,16 +4,14 @@ # Makefile for utils/hash # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/hash/Makefile,v 1.4 1997/12/20 00:28:58 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/hash/Makefile,v 1.5 1998/04/06 00:26:58 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. - -CFLAGS+=$(INCLUDE_OPT) +CFLAGS += -I../.. OBJS = dynahash.o hashfn.o @@ -23,7 +21,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/utils/init/Makefile b/src/backend/utils/init/Makefile index e1c7702f1e..debf029914 100644 --- a/src/backend/utils/init/Makefile +++ b/src/backend/utils/init/Makefile @@ -4,16 +4,14 @@ # Makefile for utils/init # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/init/Makefile,v 1.6 1997/12/20 00:29:06 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/init/Makefile,v 1.7 1998/04/06 00:27:07 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. - -CFLAGS += $(INCLUDE_OPT) +CFLAGS += -I../.. OBJS = enbl.o findbe.o globals.o miscinit.o postinit.o @@ -23,7 +21,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/utils/misc/Makefile b/src/backend/utils/misc/Makefile index 537d95225d..a827137ed0 100644 --- a/src/backend/utils/misc/Makefile +++ b/src/backend/utils/misc/Makefile @@ -4,16 +4,14 @@ # Makefile for utils/misc # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/misc/Makefile,v 1.5 1997/12/20 00:29:12 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/misc/Makefile,v 1.6 1998/04/06 00:27:16 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. - -CFLAGS += $(INCLUDE_OPT) +CFLAGS += -I../.. OBJS = database.o superuser.o @@ -23,7 +21,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/utils/mmgr/Makefile b/src/backend/utils/mmgr/Makefile index 4ac58d6dad..3d11b4fd37 100644 --- a/src/backend/utils/mmgr/Makefile +++ b/src/backend/utils/mmgr/Makefile @@ -4,16 +4,14 @@ # Makefile for utils/mmgr # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Makefile,v 1.4 1997/12/20 00:29:19 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Makefile,v 1.5 1998/04/06 00:27:24 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. - -CFLAGS+=$(INCLUDE_OPT) +CFLAGS += -I../.. OBJS = aset.o mcxt.o palloc.o portalmem.o oset.o @@ -23,7 +21,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/utils/sort/Makefile b/src/backend/utils/sort/Makefile index 56dd66b726..f2fb18dc6c 100644 --- a/src/backend/utils/sort/Makefile +++ b/src/backend/utils/sort/Makefile @@ -4,16 +4,14 @@ # Makefile for utils/sort # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/sort/Makefile,v 1.4 1997/12/20 00:29:29 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/sort/Makefile,v 1.5 1998/04/06 00:27:37 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. - -CFLAGS+=$(INCLUDE_OPT) +CFLAGS += -I../.. OBJS = lselect.o psort.o @@ -23,7 +21,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) diff --git a/src/backend/utils/time/Makefile b/src/backend/utils/time/Makefile index c2c6f834a8..a9ac73909f 100644 --- a/src/backend/utils/time/Makefile +++ b/src/backend/utils/time/Makefile @@ -4,16 +4,14 @@ # Makefile for utils/time # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/time/Makefile,v 1.4 1997/12/20 00:29:35 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/time/Makefile,v 1.5 1998/04/06 00:27:42 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. - -CFLAGS+=$(INCLUDE_OPT) +CFLAGS += -I../.. OBJS = tqual.o @@ -23,7 +21,7 @@ SUBSYS.o: $(OBJS) $(LD) -r -o SUBSYS.o $(OBJS) depend dep: - $(CC) -MM $(INCLUDE_OPT) *.c >depend + $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) |