From e2d9501094815b141eff6c9338897068eb5868db Mon Sep 17 00:00:00 2001 From: "Marc G. Fournier" Date: Wed, 17 Dec 1997 04:31:34 +0000 Subject: [PATCH] Clean up the Makefiles Essentially, this cleans things up so that if PORTNAME isn't defined (I'm working on getting rid of it for FreeBSD, at least, to see if its possible) none of the PORTNAME related stuff gets passed around. Had a little bit of -I related redundancy as well --- src/backend/access/common/Makefile | 10 ++++++---- src/backend/access/gist/Makefile | 12 +++++++----- src/backend/access/hash/Makefile | 12 +++++++----- src/backend/access/heap/Makefile | 12 +++++++----- src/backend/access/index/Makefile | 12 +++++++----- src/backend/access/nbtree/Makefile | 12 +++++++----- src/backend/access/rtree/Makefile | 12 +++++++----- src/backend/access/transam/Makefile | 12 +++++++----- 8 files changed, 55 insertions(+), 39 deletions(-) diff --git a/src/backend/access/common/Makefile b/src/backend/access/common/Makefile index ed53e982a6..3233903698 100644 --- a/src/backend/access/common/Makefile +++ b/src/backend/access/common/Makefile @@ -4,16 +4,18 @@ # Makefile for access/common # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.6 1996/11/05 07:42:39 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.7 1997/12/17 04:30:45 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. + +ifdef PORTNAME +INCLUDE_OPT += -I../../port/$(PORTNAME) +endif CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/access/gist/Makefile b/src/backend/access/gist/Makefile index c0f811a237..de695c4777 100644 --- a/src/backend/access/gist/Makefile +++ b/src/backend/access/gist/Makefile @@ -4,18 +4,20 @@ # Makefile for access/gist # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/gist/Makefile,v 1.3 1996/11/05 08:18:42 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/gist/Makefile,v 1.4 1997/12/17 04:30:47 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. -CFLAGS+=$(INCLUDE_OPT) +ifdef PORTNAME +INCLUDE_OPT += -I../../port/$(PORTNAME) +endif + +CFLAGS += $(INCLUDE_OPT) OBJS = gist.o gistget.o gistscan.o giststrat.o diff --git a/src/backend/access/hash/Makefile b/src/backend/access/hash/Makefile index 923c8e5f3c..dbb71318ea 100644 --- a/src/backend/access/hash/Makefile +++ b/src/backend/access/hash/Makefile @@ -4,18 +4,20 @@ # Makefile for access/hash # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/hash/Makefile,v 1.3 1996/11/05 09:40:16 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/hash/Makefile,v 1.4 1997/12/17 04:30:52 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. -CFLAGS+=$(INCLUDE_OPT) +ifdef PORTNAME + INCLUDE_OPT += -I../../port/$(PORTNAME) +endif + +CFLAGS += $(INCLUDE_OPT) 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 e4e99a4ef2..42a5ba6d94 100644 --- a/src/backend/access/heap/Makefile +++ b/src/backend/access/heap/Makefile @@ -4,18 +4,20 @@ # Makefile for access/heap # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/heap/Makefile,v 1.3 1996/11/09 06:17:34 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/heap/Makefile,v 1.4 1997/12/17 04:31:00 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. -CFLAGS+=$(INCLUDE_OPT) +ifdef PORTNAME +INCLUDE_OPT += -I../../port/$(PORTNAME) +endif + +CFLAGS += $(INCLUDE_OPT) OBJS = heapam.o hio.o stats.o diff --git a/src/backend/access/index/Makefile b/src/backend/access/index/Makefile index 13f4b102d8..9c7455a712 100644 --- a/src/backend/access/index/Makefile +++ b/src/backend/access/index/Makefile @@ -4,18 +4,20 @@ # Makefile for access/index # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/index/Makefile,v 1.3 1996/11/05 10:02:01 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/index/Makefile,v 1.4 1997/12/17 04:31:11 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. -CFLAGS+=$(INCLUDE_OPT) +ifdef PORTNAME +INCLUDE_OPT += -I../../port/$(PORTNAME) +endif + +CFLAGS += $(INCLUDE_OPT) OBJS = genam.o indexam.o istrat.o diff --git a/src/backend/access/nbtree/Makefile b/src/backend/access/nbtree/Makefile index 3dfa3bcc91..44528aa0c3 100644 --- a/src/backend/access/nbtree/Makefile +++ b/src/backend/access/nbtree/Makefile @@ -4,18 +4,20 @@ # Makefile for access/nbtree # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/nbtree/Makefile,v 1.3 1996/11/05 10:35:27 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/nbtree/Makefile,v 1.4 1997/12/17 04:31:19 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. -CFLAGS+=$(INCLUDE_OPT) +ifdef PORTNAME +INCLUDE_OPT += -I../../port/$(PORTNAME) +endif + +CFLAGS += $(INCLUDE_OPT) 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 f5896bd266..2d073e09c1 100644 --- a/src/backend/access/rtree/Makefile +++ b/src/backend/access/rtree/Makefile @@ -4,18 +4,20 @@ # Makefile for access/rtree # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/Makefile,v 1.3 1996/11/05 10:54:15 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/Makefile,v 1.4 1997/12/17 04:31:24 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. -CFLAGS+=$(INCLUDE_OPT) +ifdef PORTNAME +INCLUDE_OPT += -I../../port/$(PORTNAME) +endif + +CFLAGS += $(INCLUDE_OPT) 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 a4e5f72235..13328630c6 100644 --- a/src/backend/access/transam/Makefile +++ b/src/backend/access/transam/Makefile @@ -4,18 +4,20 @@ # Makefile for access/transam # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/transam/Makefile,v 1.3 1996/11/09 06:17:38 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/transam/Makefile,v 1.4 1997/12/17 04:31:34 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. -CFLAGS+=$(INCLUDE_OPT) +ifdef PORTNAME +INCLUDE_OPT += -I../../port/$(PORTNAME) +endif + +CFLAGS += $(INCLUDE_OPT) OBJS = transam.o transsup.o varsup.o xact.o xid.o -- 2.40.0