diff options
Diffstat (limited to 'src')
45 files changed, 94 insertions, 106 deletions
diff --git a/src/backend/access/heap/Makefile b/src/backend/access/heap/Makefile index a440ab63216..e4e99a4ef20 100644 --- a/src/backend/access/heap/Makefile +++ b/src/backend/access/heap/Makefile @@ -4,14 +4,15 @@ # Makefile for access/heap # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/heap/Makefile,v 1.2 1996/10/31 08:28:50 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/heap/Makefile,v 1.3 1996/11/09 06:17:34 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../../port/$(PORTNAME) \ +INCLUDE_OPT = -I../.. \ + -I../../port/$(PORTNAME) \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/access/transam/Makefile b/src/backend/access/transam/Makefile index c231de38055..a4e5f72235b 100644 --- a/src/backend/access/transam/Makefile +++ b/src/backend/access/transam/Makefile @@ -4,14 +4,15 @@ # Makefile for access/transam # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/transam/Makefile,v 1.2 1996/11/03 09:07:03 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/transam/Makefile,v 1.3 1996/11/09 06:17:38 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../../port/$(PORTNAME) \ +INCLUDE_OPT = -I../.. \ + -I../../port/$(PORTNAME) \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/bootstrap/Makefile b/src/backend/bootstrap/Makefile index b5dd5c55306..beb2756c94e 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.2 1996/11/08 05:55:46 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.3 1996/11/09 06:17:44 momjian Exp $ # # # We must build bootparse.c and bootscanner.c with yacc and lex and sed, @@ -23,7 +23,6 @@ include ../../Makefile.global INCLUDE_OPT = -I.. \ -I../port/$(PORTNAME) \ - -I../include \ -I../../include CFLAGS += $(INCLUDE_OPT) -Wno-error diff --git a/src/backend/lib/Makefile b/src/backend/lib/Makefile index 8127b78e607..330bf4babb8 100644 --- a/src/backend/lib/Makefile +++ b/src/backend/lib/Makefile @@ -4,14 +4,15 @@ # Makefile for lib (miscellaneous stuff) # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/lib/Makefile,v 1.2 1996/10/31 10:26:26 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/lib/Makefile,v 1.3 1996/11/09 06:17:54 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../.. include ../../Makefile.global -INCLUDE_OPT = -I../port/$(PORTNAME) \ +INCLUDE_OPT = -I.. \ + -I../port/$(PORTNAME) \ -I../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/main/Makefile b/src/backend/main/Makefile index a465d2a6adb..093296511d4 100644 --- a/src/backend/main/Makefile +++ b/src/backend/main/Makefile @@ -4,7 +4,7 @@ # Makefile for main # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/main/Makefile,v 1.1 1996/10/27 09:47:59 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/main/Makefile,v 1.2 1996/11/09 06:18:04 momjian Exp $ # #------------------------------------------------------------------------- @@ -13,7 +13,6 @@ include ../../Makefile.global INCLUDE_OPT = -I.. \ -I../port/$(PORTNAME) \ - -I../include \ -I../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/optimizer/path/Makefile b/src/backend/optimizer/path/Makefile index 5617b2cc649..e91ee4bdc04 100644 --- a/src/backend/optimizer/path/Makefile +++ b/src/backend/optimizer/path/Makefile @@ -4,14 +4,15 @@ # Makefile for optimizer/path # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/optimizer/path/Makefile,v 1.2 1996/10/31 10:58:58 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/optimizer/path/Makefile,v 1.3 1996/11/09 06:18:10 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../../port/$(PORTNAME) \ +INCLUDE_OPT = -I../.. \ + -I../../port/$(PORTNAME) \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/optimizer/plan/Makefile b/src/backend/optimizer/plan/Makefile index 6b3eb220ba3..d2fb0502159 100644 --- a/src/backend/optimizer/plan/Makefile +++ b/src/backend/optimizer/plan/Makefile @@ -4,14 +4,15 @@ # Makefile for optimizer/plan # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/optimizer/plan/Makefile,v 1.2 1996/10/31 10:59:05 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/optimizer/plan/Makefile,v 1.3 1996/11/09 06:18:17 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../../port/$(PORTNAME) \ +INCLUDE_OPT = -I../.. \ + -I../../port/$(PORTNAME) \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/optimizer/prep/Makefile b/src/backend/optimizer/prep/Makefile index b15e06aee63..eb8ef61a68c 100644 --- a/src/backend/optimizer/prep/Makefile +++ b/src/backend/optimizer/prep/Makefile @@ -4,14 +4,15 @@ # Makefile for optimizer/prep # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/optimizer/prep/Makefile,v 1.2 1996/10/31 10:59:23 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/optimizer/prep/Makefile,v 1.3 1996/11/09 06:18:23 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../../port/$(PORTNAME) \ +INCLUDE_OPT = -I../.. \ + -I../../port/$(PORTNAME) \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/parser/Makefile b/src/backend/parser/Makefile index 452c11932c0..63b01a5418f 100644 --- a/src/backend/parser/Makefile +++ b/src/backend/parser/Makefile @@ -4,7 +4,7 @@ # Makefile for parser # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.2 1996/11/08 05:57:18 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.3 1996/11/09 06:18:34 momjian Exp $ # #------------------------------------------------------------------------- @@ -13,7 +13,6 @@ include ../../Makefile.global INCLUDE_OPT = -I.. \ -I../port/$(PORTNAME) \ - -I../include \ -I../../include CFLAGS+=$(INCLUDE_OPT) -Wno-error diff --git a/src/backend/port/BSD44_derived/Makefile b/src/backend/port/BSD44_derived/Makefile index 2ddd33efea7..1be099252d1 100644 --- a/src/backend/port/BSD44_derived/Makefile +++ b/src/backend/port/BSD44_derived/Makefile @@ -4,7 +4,7 @@ # Makefile for port/BSD44_derived # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/port/BSD44_derived/Attic/Makefile,v 1.1 1996/10/27 09:49:20 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/port/BSD44_derived/Attic/Makefile,v 1.2 1996/11/09 06:18:40 momjian Exp $ # #------------------------------------------------------------------------- @@ -12,7 +12,6 @@ SRCDIR = ../../.. include ../../../Makefile.global INCLUDE_OPT = -I../.. \ - -I../../include \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/port/aix/Makefile b/src/backend/port/aix/Makefile index 3e95b2162c5..711d77e955f 100644 --- a/src/backend/port/aix/Makefile +++ b/src/backend/port/aix/Makefile @@ -4,7 +4,7 @@ # Makefile for port/aix # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/port/aix/Attic/Makefile,v 1.1 1996/10/27 09:49:27 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/port/aix/Attic/Makefile,v 1.2 1996/11/09 06:18:48 momjian Exp $ # #------------------------------------------------------------------------- @@ -12,7 +12,6 @@ SRCDIR = ../../.. include ../../../Makefile.global INCLUDE_OPT = -I../.. \ - -I../../include \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/port/alpha/Makefile b/src/backend/port/alpha/Makefile index 44e1407883c..b6ef2569f8b 100644 --- a/src/backend/port/alpha/Makefile +++ b/src/backend/port/alpha/Makefile @@ -4,7 +4,7 @@ # Makefile for port/alpha # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/port/alpha/Attic/Makefile,v 1.1 1996/10/27 09:49:37 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/port/alpha/Attic/Makefile,v 1.2 1996/11/09 06:18:57 momjian Exp $ # #------------------------------------------------------------------------- @@ -12,7 +12,6 @@ SRCDIR = ../../.. include ../../../Makefile.global INCLUDE_OPT = -I../.. \ - -I../../include \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/port/bsdi/Makefile b/src/backend/port/bsdi/Makefile index 97b5cbcc1f7..c4b75ed3d7f 100644 --- a/src/backend/port/bsdi/Makefile +++ b/src/backend/port/bsdi/Makefile @@ -4,7 +4,7 @@ # Makefile for port/bsdi # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/port/bsdi/Attic/Makefile,v 1.3 1996/11/01 03:35:54 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/port/bsdi/Attic/Makefile,v 1.4 1996/11/09 06:19:06 momjian Exp $ # #------------------------------------------------------------------------- @@ -12,7 +12,6 @@ SRCDIR = ../../.. include ../../../Makefile.global INCLUDE_OPT = -I../.. \ - -I../../include \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/port/dgux/Makefile b/src/backend/port/dgux/Makefile index e84f9ab4114..0c6f9675f40 100644 --- a/src/backend/port/dgux/Makefile +++ b/src/backend/port/dgux/Makefile @@ -4,7 +4,7 @@ # Makefile for port/dgux # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/port/dgux/Attic/Makefile,v 1.1 1996/10/27 09:49:57 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/port/dgux/Attic/Makefile,v 1.2 1996/11/09 06:19:14 momjian Exp $ # #------------------------------------------------------------------------- @@ -12,7 +12,6 @@ SRCDIR = ../../.. include ../../../Makefile.global INCLUDE_OPT = -I../.. \ - -I../../include \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/port/hpux/Makefile b/src/backend/port/hpux/Makefile index 2ca2af0dce8..155a4fd6598 100644 --- a/src/backend/port/hpux/Makefile +++ b/src/backend/port/hpux/Makefile @@ -4,7 +4,7 @@ # Makefile for port/hpux # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/port/hpux/Attic/Makefile,v 1.1 1996/10/27 09:50:12 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/port/hpux/Attic/Makefile,v 1.2 1996/11/09 06:19:21 momjian Exp $ # #------------------------------------------------------------------------- @@ -12,7 +12,6 @@ SRCDIR = ../../.. include ../../../Makefile.global INCLUDE_OPT = -I../.. \ - -I../../include \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/port/i386_solaris/Makefile b/src/backend/port/i386_solaris/Makefile index b3450ec68c8..08042fdbfdc 100644 --- a/src/backend/port/i386_solaris/Makefile +++ b/src/backend/port/i386_solaris/Makefile @@ -4,7 +4,7 @@ # Makefile for port/i386_solaris # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/port/i386_solaris/Attic/Makefile,v 1.1 1996/10/27 09:50:17 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/port/i386_solaris/Attic/Makefile,v 1.2 1996/11/09 06:19:27 momjian Exp $ # #------------------------------------------------------------------------- @@ -12,7 +12,6 @@ SRCDIR = ../../.. include ../../../Makefile.global INCLUDE_OPT = -I../.. \ - -I../../include \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/port/irix5/Makefile b/src/backend/port/irix5/Makefile index 34630be1372..c93938c4ee7 100644 --- a/src/backend/port/irix5/Makefile +++ b/src/backend/port/irix5/Makefile @@ -4,7 +4,7 @@ # Makefile for port/irix5 # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/port/irix5/Attic/Makefile,v 1.1 1996/10/27 09:50:24 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/port/irix5/Attic/Makefile,v 1.2 1996/11/09 06:19:36 momjian Exp $ # #------------------------------------------------------------------------- @@ -12,7 +12,6 @@ SRCDIR = ../../.. include ../../../Makefile.global INCLUDE_OPT = -I../.. \ - -I../../include \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/port/linux/Makefile b/src/backend/port/linux/Makefile index 9ee8ad8ef54..769dc605721 100644 --- a/src/backend/port/linux/Makefile +++ b/src/backend/port/linux/Makefile @@ -4,7 +4,7 @@ # Makefile for port/linux # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/port/linux/Attic/Makefile,v 1.1 1996/10/27 09:50:31 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/port/linux/Attic/Makefile,v 1.2 1996/11/09 06:19:51 momjian Exp $ # #------------------------------------------------------------------------- @@ -12,7 +12,6 @@ SRCDIR = ../../.. include ../../../Makefile.global INCLUDE_OPT = -I../.. \ - -I../../include \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/port/sparc/Makefile b/src/backend/port/sparc/Makefile index f92e659e765..89071267fee 100644 --- a/src/backend/port/sparc/Makefile +++ b/src/backend/port/sparc/Makefile @@ -4,7 +4,7 @@ # Makefile for port/sparc # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/port/sparc/Attic/Makefile,v 1.1 1996/10/27 09:50:43 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/port/sparc/Attic/Makefile,v 1.2 1996/11/09 06:20:07 momjian Exp $ # #------------------------------------------------------------------------- @@ -12,7 +12,6 @@ SRCDIR = ../../.. include ../../../Makefile.global INCLUDE_OPT = -I../.. \ - -I../../include \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/port/sparc_solaris/Makefile b/src/backend/port/sparc_solaris/Makefile index 30b9a223e97..d2e4aea12b6 100644 --- a/src/backend/port/sparc_solaris/Makefile +++ b/src/backend/port/sparc_solaris/Makefile @@ -4,7 +4,7 @@ # Makefile for port/sparc_solaris # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/port/sparc_solaris/Attic/Makefile,v 1.1 1996/10/27 09:50:50 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/port/sparc_solaris/Attic/Makefile,v 1.2 1996/11/09 06:20:17 momjian Exp $ # #------------------------------------------------------------------------- @@ -12,7 +12,6 @@ SRCDIR = ../../.. include ../../../Makefile.global INCLUDE_OPT = -I../.. \ - -I../../include \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/port/svr4/Makefile b/src/backend/port/svr4/Makefile index d1e78edc7ca..a120021e9ca 100644 --- a/src/backend/port/svr4/Makefile +++ b/src/backend/port/svr4/Makefile @@ -4,7 +4,7 @@ # Makefile for port/svr4 # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/port/svr4/Attic/Makefile,v 1.1 1996/10/27 09:50:57 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/port/svr4/Attic/Makefile,v 1.2 1996/11/09 06:20:26 momjian Exp $ # #------------------------------------------------------------------------- @@ -12,7 +12,6 @@ SRCDIR = ../../.. include ../../../Makefile.global INCLUDE_OPT = -I../.. \ - -I../../include \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/port/ultrix4/Makefile b/src/backend/port/ultrix4/Makefile index 550fdc9c12a..0a235ab5b0a 100644 --- a/src/backend/port/ultrix4/Makefile +++ b/src/backend/port/ultrix4/Makefile @@ -4,7 +4,7 @@ # Makefile for port/ultrix # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/port/ultrix4/Attic/Makefile,v 1.1 1996/10/27 09:51:05 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/port/ultrix4/Attic/Makefile,v 1.2 1996/11/09 06:20:36 momjian Exp $ # #------------------------------------------------------------------------- @@ -12,7 +12,6 @@ SRCDIR = ../../.. include ../../../Makefile.global INCLUDE_OPT = -I../.. \ - -I../../include \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/postmaster/Makefile b/src/backend/postmaster/Makefile index 8115e61dbdc..c83f541f4a1 100644 --- a/src/backend/postmaster/Makefile +++ b/src/backend/postmaster/Makefile @@ -4,14 +4,15 @@ # Makefile for postmaster # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/postmaster/Makefile,v 1.2 1996/11/03 04:48:27 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/postmaster/Makefile,v 1.3 1996/11/09 06:20:48 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../.. include ../../Makefile.global -INCLUDE_OPT = -I../port/$(PORTNAME) \ +INCLUDE_OPT = -I.. \ + -I../port/$(PORTNAME) \ -I../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/regex/Makefile b/src/backend/regex/Makefile index b405ac8abfc..6944a8e2b66 100644 --- a/src/backend/regex/Makefile +++ b/src/backend/regex/Makefile @@ -4,7 +4,7 @@ # Makefile for regex # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/regex/Makefile,v 1.1 1996/10/27 09:51:27 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/regex/Makefile,v 1.2 1996/11/09 06:20:58 momjian Exp $ # #------------------------------------------------------------------------- @@ -13,7 +13,6 @@ include ../../Makefile.global INCLUDE_OPT = -I.. \ -I../port/$(PORTNAME) \ - -I../include \ -I../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/rewrite/Makefile b/src/backend/rewrite/Makefile index fd8e4c5e4a2..5478c49d309 100644 --- a/src/backend/rewrite/Makefile +++ b/src/backend/rewrite/Makefile @@ -4,14 +4,15 @@ # Makefile for rewrite # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/rewrite/Makefile,v 1.2 1996/11/03 04:51:50 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/rewrite/Makefile,v 1.3 1996/11/09 06:21:12 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../.. include ../../Makefile.global -INCLUDE_OPT = -I../port/$(PORTNAME) \ +INCLUDE_OPT = -I.. \ + -I../port/$(PORTNAME) \ -I../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/storage/buffer/Makefile b/src/backend/storage/buffer/Makefile index a228205488a..d6eeab09092 100644 --- a/src/backend/storage/buffer/Makefile +++ b/src/backend/storage/buffer/Makefile @@ -4,14 +4,15 @@ # Makefile for storage/buffer # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/buffer/Makefile,v 1.2 1996/11/03 04:56:57 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/buffer/Makefile,v 1.3 1996/11/09 06:21:30 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../../port/$(PORTNAME) \ +INCLUDE_OPT = -I../.. \ + -I../../port/$(PORTNAME) \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/storage/file/Makefile b/src/backend/storage/file/Makefile index a1077d3b337..6eb0cabcc72 100644 --- a/src/backend/storage/file/Makefile +++ b/src/backend/storage/file/Makefile @@ -4,7 +4,7 @@ # Makefile for storage/file # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/file/Makefile,v 1.1 1996/10/27 09:52:01 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/file/Makefile,v 1.2 1996/11/09 06:21:38 momjian Exp $ # #------------------------------------------------------------------------- @@ -13,7 +13,6 @@ include ../../../Makefile.global INCLUDE_OPT = -I../.. \ -I../../port/$(PORTNAME) \ - -I../../include \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/storage/ipc/Makefile b/src/backend/storage/ipc/Makefile index 6f6701d38b2..821bf688cf0 100644 --- a/src/backend/storage/ipc/Makefile +++ b/src/backend/storage/ipc/Makefile @@ -4,14 +4,15 @@ # Makefile for storage/ipc # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/ipc/Makefile,v 1.2 1996/11/03 05:06:52 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/ipc/Makefile,v 1.3 1996/11/09 06:21:47 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../../port/$(PORTNAME) \ +INCLUDE_OPT = -I../.. \ + -I../../port/$(PORTNAME) \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/storage/large_object/Makefile b/src/backend/storage/large_object/Makefile index c679d0bb0a7..f8ce861de12 100644 --- a/src/backend/storage/large_object/Makefile +++ b/src/backend/storage/large_object/Makefile @@ -4,14 +4,15 @@ # Makefile for storage/large_object # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/large_object/Makefile,v 1.2 1996/11/03 05:07:07 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/large_object/Makefile,v 1.3 1996/11/09 06:21:59 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../../port/$(PORTNAME) \ +INCLUDE_OPT = -I../.. \ + -I../../port/$(PORTNAME) \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/storage/lmgr/Makefile b/src/backend/storage/lmgr/Makefile index ab4965df92c..51511e065aa 100644 --- a/src/backend/storage/lmgr/Makefile +++ b/src/backend/storage/lmgr/Makefile @@ -4,14 +4,15 @@ # Makefile for storage/lmgr # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Makefile,v 1.2 1996/11/03 05:07:19 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Makefile,v 1.3 1996/11/09 06:22:05 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../../port/$(PORTNAME) \ +INCLUDE_OPT = -I../.. \ + -I../../port/$(PORTNAME) \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/storage/page/Makefile b/src/backend/storage/page/Makefile index 53bd2d9967e..b3cbf676622 100644 --- a/src/backend/storage/page/Makefile +++ b/src/backend/storage/page/Makefile @@ -4,14 +4,15 @@ # Makefile for storage/page # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/page/Makefile,v 1.2 1996/11/03 05:07:43 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/page/Makefile,v 1.3 1996/11/09 06:22:14 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../../port/$(PORTNAME) \ +INCLUDE_OPT = -I../.. \ + -I../../port/$(PORTNAME) \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/storage/smgr/Makefile b/src/backend/storage/smgr/Makefile index a1e02dd8633..0951656362f 100644 --- a/src/backend/storage/smgr/Makefile +++ b/src/backend/storage/smgr/Makefile @@ -4,14 +4,15 @@ # Makefile for storage/smgr # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/smgr/Makefile,v 1.2 1996/11/03 05:07:50 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/smgr/Makefile,v 1.3 1996/11/09 06:22:28 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../../port/$(PORTNAME) \ +INCLUDE_OPT = -I../.. \ + -I../../port/$(PORTNAME) \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/tcop/Makefile b/src/backend/tcop/Makefile index 4dd7fbcb5f6..d577e94c810 100644 --- a/src/backend/tcop/Makefile +++ b/src/backend/tcop/Makefile @@ -4,14 +4,15 @@ # Makefile for tcop # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.4 1996/11/08 05:59:20 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.5 1996/11/09 06:22:37 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../.. include ../../Makefile.global -INCLUDE_OPT = -I../port/$(PORTNAME) \ +INCLUDE_OPT = -I.. \ + -I../port/$(PORTNAME) \ -I../../include CFLAGS+=$(INCLUDE_OPT) -Wno-error diff --git a/src/backend/tioga/Makefile b/src/backend/tioga/Makefile index b8ca54c0346..d1c5c97436a 100644 --- a/src/backend/tioga/Makefile +++ b/src/backend/tioga/Makefile @@ -4,14 +4,14 @@ # Makefile for tioga # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/tioga/Attic/Makefile,v 1.2 1996/11/03 06:52:43 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/tioga/Attic/Makefile,v 1.3 1996/11/09 06:22:42 momjian Exp $ # #------------------------------------------------------------------------- SRCDIR = ../.. include ../../Makefile.global -INCLUDE_OPT = +INCLUDE_OPT = -I.. \ -I../port/$(PORTNAME) \ -I../../include diff --git a/src/backend/utils/Makefile b/src/backend/utils/Makefile index 510bb4ed0ee..a0a95ead8fd 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.3 1996/11/03 09:28:31 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.4 1996/11/09 06:22:52 momjian Exp $ # #------------------------------------------------------------------------- @@ -12,7 +12,6 @@ SRCDIR = ../.. include ../../Makefile.global INCLUDE_OPT = -I.. \ - -I../include \ -I../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/utils/error/Makefile b/src/backend/utils/error/Makefile index 154b95e3149..84c8c2216d6 100644 --- a/src/backend/utils/error/Makefile +++ b/src/backend/utils/error/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/error # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/error/Makefile,v 1.1 1996/10/27 09:53:33 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/error/Makefile,v 1.2 1996/11/09 06:23:02 momjian Exp $ # #------------------------------------------------------------------------- @@ -13,7 +13,6 @@ include ../../../Makefile.global INCLUDE_OPT = -I../.. \ -I../../port/$(PORTNAME) \ - -I../../include \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/utils/fmgr/Makefile b/src/backend/utils/fmgr/Makefile index b214470578d..05baf3b20c6 100644 --- a/src/backend/utils/fmgr/Makefile +++ b/src/backend/utils/fmgr/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/fmgr # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/fmgr/Makefile,v 1.1 1996/10/27 09:53:40 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/fmgr/Makefile,v 1.2 1996/11/09 06:23:18 momjian Exp $ # #------------------------------------------------------------------------- @@ -13,7 +13,6 @@ include ../../../Makefile.global INCLUDE_OPT = -I../.. \ -I../../port/$(PORTNAME) \ - -I../../include \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/utils/hash/Makefile b/src/backend/utils/hash/Makefile index 79d0c194dd5..f3503b0f9b7 100644 --- a/src/backend/utils/hash/Makefile +++ b/src/backend/utils/hash/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/hash # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/hash/Makefile,v 1.1 1996/10/27 09:53:48 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/hash/Makefile,v 1.2 1996/11/09 06:23:33 momjian Exp $ # #------------------------------------------------------------------------- @@ -13,7 +13,6 @@ include ../../../Makefile.global INCLUDE_OPT = -I../.. \ -I../../port/$(PORTNAME) \ - -I../../include \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/utils/init/Makefile b/src/backend/utils/init/Makefile index 4ce8f93030c..ea6e8f8493d 100644 --- a/src/backend/utils/init/Makefile +++ b/src/backend/utils/init/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/init # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/init/Makefile,v 1.1 1996/10/27 09:54:01 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/init/Makefile,v 1.2 1996/11/09 06:23:41 momjian Exp $ # #------------------------------------------------------------------------- @@ -13,7 +13,6 @@ include ../../../Makefile.global INCLUDE_OPT = -I../.. \ -I../../port/$(PORTNAME) \ - -I../../include \ -I../../../include CFLAGS += $(INCLUDE_OPT) diff --git a/src/backend/utils/mmgr/Makefile b/src/backend/utils/mmgr/Makefile index d855f61e1d6..6aa9908e5b7 100644 --- a/src/backend/utils/mmgr/Makefile +++ b/src/backend/utils/mmgr/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/mmgr # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Makefile,v 1.1 1996/10/27 09:54:06 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Makefile,v 1.2 1996/11/09 06:23:50 momjian Exp $ # #------------------------------------------------------------------------- @@ -13,7 +13,6 @@ include ../../../Makefile.global INCLUDE_OPT = -I../.. \ -I../../port/$(PORTNAME) \ - -I../../include \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/utils/sort/Makefile b/src/backend/utils/sort/Makefile index 14096e3abd5..2064c5bb187 100644 --- a/src/backend/utils/sort/Makefile +++ b/src/backend/utils/sort/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/sort # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/sort/Makefile,v 1.1 1996/10/27 09:54:15 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/sort/Makefile,v 1.2 1996/11/09 06:24:04 momjian Exp $ # #------------------------------------------------------------------------- @@ -13,7 +13,6 @@ include ../../../Makefile.global INCLUDE_OPT = -I../.. \ -I../../port/$(PORTNAME) \ - -I../../include \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/utils/time/Makefile b/src/backend/utils/time/Makefile index 38c7c2f56cd..c491f73181d 100644 --- a/src/backend/utils/time/Makefile +++ b/src/backend/utils/time/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/time # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/time/Makefile,v 1.1 1996/10/27 09:54:25 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/time/Makefile,v 1.2 1996/11/09 06:24:12 momjian Exp $ # #------------------------------------------------------------------------- @@ -13,7 +13,6 @@ include ../../../Makefile.global INCLUDE_OPT = -I../.. \ -I../../port/$(PORTNAME) \ - -I../../include \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/bin/Makefile.global b/src/bin/Makefile.global index 937d1cf0fe6..ddc57941b65 100644 --- a/src/bin/Makefile.global +++ b/src/bin/Makefile.global @@ -7,24 +7,23 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/Attic/Makefile.global,v 1.8 1996/08/28 23:00:07 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/bin/Attic/Makefile.global,v 1.9 1996/11/09 06:24:23 momjian Exp $ # #------------------------------------------------------------------------- CFLAGS+= -I$(srcdir)/backend \ - -I$(srcdir)/backend/include \ - -I$(srcdir)/libpq \ - -I$(srcdir)/include + -I$(srcdir)/include \ + -I$(srcdir)/libpq # # link with libpq, so we put it here. # -LIBPQ:= -L$(srcdir)/libpq/$(objdir) -lpq +LIBPQ:= -L$(srcdir)/libpq -lpq LD_ADD+= $(LIBPQ) DPADD+= $(LIBPQ) # LIB_DEP is the list of dependencies on libraries for the link. -LIB_DEP+= $(srcdir)/libpq/$(objdir)/libpq.a +LIB_DEP+= $(srcdir)/libpq/libpq.a # # And where libpq goes, so goes the authentication stuff... diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile index 2fd82e931d1..55133cd36c8 100644 --- a/src/bin/psql/Makefile +++ b/src/bin/psql/Makefile @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.9 1996/11/08 06:01:27 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.10 1996/11/09 06:24:39 momjian Exp $ # #------------------------------------------------------------------------- @@ -65,10 +65,10 @@ endif all: psql -psql: $(OBJS) $(LIBPQDIR)/obj/libpq.a - $(CC) $(LDFLAGS) -o psql -L$(LIBPQDIR)/obj $(OBJS) -lpq $(LD_ADD) +psql: $(OBJS) $(LIBPQDIR)/libpq.a + $(CC) $(LDFLAGS) -o psql -L$(LIBPQDIR) $(OBJS) -lpq $(LD_ADD) -$(srcdir)/libpq/obj/libpq.a: +$(srcdir)/libpq/libpq.a: $(MAKE) -C $(LIBPQDIR) libpq.a install: diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile index 78fb765e612..624c2fb7d43 100644 --- a/src/interfaces/libpq/Makefile +++ b/src/interfaces/libpq/Makefile @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.14 1996/11/08 21:40:11 momjian Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.15 1996/11/09 06:24:51 momjian Exp $ # #------------------------------------------------------------------------- @@ -36,19 +36,19 @@ endif shlib := ifdef LINUX_ELF ifeq ($(PORTNAME), linux) -shlib := obj/libpq.so.1 +shlib := libpq.so.1 endif endif -all: obj/libpq.a $(shlib) postgres.h c.h +all: libpq.a $(shlib) postgres.h c.h -obj/libpq.a: $(OBJS) +libpq.a: $(OBJS) ifdef MK_NO_LORDER - $(AR) $(AROPT) obj/libpq.a $(OBJS) + $(AR) $(AROPT) libpq.a $(OBJS) else - $(AR) $(AROPT) obj/libpq.a `lorder $(OBJS) | tsort` + $(AR) $(AROPT) libpq.a `lorder $(OBJS) | tsort` endif - $(RANLIB) obj/libpq.a + $(RANLIB) libpq.a fe-lobj.o:: ../backend/fmgr.h @@ -61,8 +61,8 @@ fe-lobj.o:: ../backend/fmgr.h ../backend/lib/dllist.o: $(MAKE) -C ../backend/lib dllist.o -obj/libpq.so.1: $(OBJS) - $(CC) $(LDFLAGS) -shared $(OBJS) -o obj/libpq.so.1 +libpq.so.1: $(OBJS) + $(CC) $(LDFLAGS) -shared $(OBJS) -o libpq.so.1 postgres.h: ../include/postgres.h # Note: ../backend/include/postgres.h needs to be named something different @@ -128,17 +128,17 @@ install-shlib-dep := endif install-libpq: - $(INSTALL) $(INSTL_LIB_OPTS) obj/libpq.a $(DESTDIR)$(LIBDIR)/libpq.a + $(INSTALL) $(INSTL_LIB_OPTS) libpq.a $(DESTDIR)$(LIBDIR)/libpq.a install-shlib: - $(INSTALL) $(INSTL_LIB_OPTS) obj/libpq.so.1 $(DESTDIR)$(LIBDIR)/libpq.so.1 + $(INSTALL) $(INSTL_LIB_OPTS) libpq.so.1 $(DESTDIR)$(LIBDIR)/libpq.so.1 depend dep: $(CC) -MM $(INCLUDE_OPT) *.c >depend .PHONY: clean clean: - rm -f obj/libpq.a obj/libpq.so.1 $(OBJS) c.h postgres.h + rm -f libpq.a libpq.so.1 $(OBJS) c.h postgres.h ifeq (depend,$(wildcard depend)) include depend |