Make sure -L and -I's for our source tree are always before system include

or library directories on the command line.

20 files changed, 47 insertions, 45 deletions

diff --git a/contrib/array/Makefile b/contrib/array/Makefile
index 14e748506c..260b56e60f 100644
--- a/contrib/array/Makefile
+++ b/contrib/array/Makefile
@@ -1,5 +1,5 @@
 #
-# $Header: /cvsroot/pgsql/contrib/array/Attic/Makefile,v 1.13 2000/10/20 21:03:03 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/array/Attic/Makefile,v 1.14 2001/02/20 19:20:26 petere Exp $
 #
 
 subdir = contrib/array
@@ -9,7 +9,7 @@ include $(top_builddir)/src/Makefile.global
 NAME	:= array_iterator
 SONAME	:= $(NAME)$(DLSUFFIX)
 
-override CPPFLAGS += -I$(srcdir)
+override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
 override CFLAGS += $(CFLAGS_SL)
 
 all: $(SONAME) $(NAME).sql
diff --git a/contrib/cube/Makefile b/contrib/cube/Makefile
index 7ac1d008c6..014fafa1fe 100644
--- a/contrib/cube/Makefile
+++ b/contrib/cube/Makefile
@@ -1,5 +1,5 @@
 #
-# $Header: /cvsroot/pgsql/contrib/cube/Makefile,v 1.2 2001/02/10 22:31:42 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/cube/Makefile,v 1.3 2001/02/20 19:20:27 petere Exp $
 #
 
 subdir = contrib/cube
@@ -14,7 +14,7 @@ NAME= cube
 SO_MAJOR_VERSION= 1
 SO_MINOR_VERSION= 0
 
-override CPPFLAGS += -I$(srcdir)
+override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
 
 OBJS= cube.o cubeparse.o cubescan.o buffer.o
 
diff --git a/contrib/earthdistance/Makefile b/contrib/earthdistance/Makefile
index 47e1cf96e2..7c754befe7 100644
--- a/contrib/earthdistance/Makefile
+++ b/contrib/earthdistance/Makefile
@@ -1,5 +1,5 @@
 #
-# $Header: /cvsroot/pgsql/contrib/earthdistance/Makefile,v 1.7 2000/10/20 21:03:03 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/earthdistance/Makefile,v 1.8 2001/02/20 19:20:27 petere Exp $
 #
 
 subdir = contrib/earthdistance
@@ -9,7 +9,7 @@ include ../../src/Makefile.global
 NAME	:= earthdistance
 SONAME	:= $(NAME)$(DLSUFFIX)
 
-override CPPFLAGS += -I$(srcdir)
+override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
 override CFLAGS += $(CFLAGS_SL)
 
 all: $(SONAME) $(NAME).sql
diff --git a/contrib/findoidjoins/Makefile b/contrib/findoidjoins/Makefile
index ab1750e71b..34cea18ca9 100644
--- a/contrib/findoidjoins/Makefile
+++ b/contrib/findoidjoins/Makefile
@@ -1,19 +1,22 @@
 #
-# $Header: /cvsroot/pgsql/contrib/findoidjoins/Attic/Makefile,v 1.11 2000/12/04 01:32:18 tgl Exp $
+# $Header: /cvsroot/pgsql/contrib/findoidjoins/Attic/Makefile,v 1.12 2001/02/20 19:20:27 petere Exp $
 #
 
 subdir = contrib/findoidjoins
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 
-override CPPFLAGS += -I$(libpgeasy_srcdir) -I$(libpq_srcdir)
+libpgeasy_srcdir = $(top_srcdir)/src/interfaces/libpgeasy
+libpgeasy_builddir = $(top_builddir)/src/interfaces/libpgeasy
+
+override CPPFLAGS := -I$(libpgeasy_srcdir) -I$(libpq_srcdir) $(CPPFLAGS)
 
 OBJS	= findoidjoins.o
 
 all: findoidjoins
 
 findoidjoins: $(OBJS) $(libpgeasy_builddir)/libpgeasy.a $(libpq_builddir)/libpq.a
-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(libpgeasy) $(libpq) $(LIBS) -o $@
+	$(CC) $(CFLAGS) $(OBJS) -L$(libpgeasy_builddir) -lpgeasy $(libpq) $(LDFLAGS) $(LIBS) -o $@
 
 install: all installdirs
 	$(INSTALL_PROGRAM) findoidjoins$(X)	$(bindir)
diff --git a/contrib/fulltextindex/Makefile b/contrib/fulltextindex/Makefile
index 15b95138cc..3a60a6cf09 100644
--- a/contrib/fulltextindex/Makefile
+++ b/contrib/fulltextindex/Makefile
@@ -1,5 +1,5 @@
 #
-# $Header: /cvsroot/pgsql/contrib/fulltextindex/Attic/Makefile,v 1.8 2000/10/20 21:03:10 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/fulltextindex/Attic/Makefile,v 1.9 2001/02/20 19:20:27 petere Exp $
 #
 
 subdir = contrib/fulltextindex
@@ -9,7 +9,7 @@ include ../../src/Makefile.global
 NAME	:= fti
 SONAME	:= $(NAME)$(DLSUFFIX)
 
-override CPPFLAGS += -I$(srcdir)
+override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
 override CFLAGS += $(CFLAGS_SL)
 
 all: $(SONAME) $(NAME).sql
diff --git a/contrib/intarray/Makefile b/contrib/intarray/Makefile
index 151817f7e1..b4d125b0f9 100644
--- a/contrib/intarray/Makefile
+++ b/contrib/intarray/Makefile
@@ -1,4 +1,4 @@
-# $Header: /cvsroot/pgsql/contrib/intarray/Makefile,v 1.2 2001/01/13 02:18:31 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/intarray/Makefile,v 1.3 2001/02/20 19:20:27 petere Exp $
 
 subdir = contrib/intarray
 top_builddir = ../..
@@ -12,7 +12,7 @@ NAME= _int
 SO_MAJOR_VERSION= 1
 SO_MINOR_VERSION= 0
 
-override CPPFLAGS += -I$(srcdir) -DPGSQL71
+override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) -DPGSQL71
 
 OBJS= _int.o
 
diff --git a/contrib/isbn_issn/Makefile b/contrib/isbn_issn/Makefile
index dd91574ebd..9f73cc0085 100644
--- a/contrib/isbn_issn/Makefile
+++ b/contrib/isbn_issn/Makefile
@@ -1,5 +1,5 @@
 #
-# $Header: /cvsroot/pgsql/contrib/isbn_issn/Attic/Makefile,v 1.8 2000/10/20 21:03:13 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/isbn_issn/Attic/Makefile,v 1.9 2001/02/20 19:20:27 petere Exp $
 #
 
 subdir = contrib/isbn_issn
@@ -9,7 +9,7 @@ include $(top_builddir)/src/Makefile.global
 NAME	:= isbn_issn
 SONAME	:= $(NAME)$(DLSUFFIX)
 
-override CPPFLAGS += -I$(srcdir)
+override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
 override CFLAGS += $(CFLAGS_SL)
 
 all: $(SONAME) $(NAME).sql
diff --git a/contrib/lo/Makefile b/contrib/lo/Makefile
index bfa1f7561a..913ad507ff 100644
--- a/contrib/lo/Makefile
+++ b/contrib/lo/Makefile
@@ -1,5 +1,5 @@
 #
-# $Header: /cvsroot/pgsql/contrib/lo/Makefile,v 1.8 2000/10/20 21:03:16 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/lo/Makefile,v 1.9 2001/02/20 19:20:27 petere Exp $
 #
 
 subdir = contrib/lo
@@ -12,7 +12,7 @@ SONAME	:= $(NAME)$(DLSUFFIX)
 SQLS	= $(NAME).sql lo_drop.sql lo_test.sql
 MODS	= $(NAME)$(DLSUFFIX)
 
-override CPPFLAGS += -I$(srcdir)
+override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
 override CFLAGS += $(CFLAGS_SL)
 
 ifdef REFINT_VERBOSE
diff --git a/contrib/mSQL-interface/Makefile b/contrib/mSQL-interface/Makefile
index 179dbe864e..063569d9c7 100644
--- a/contrib/mSQL-interface/Makefile
+++ b/contrib/mSQL-interface/Makefile
@@ -1,5 +1,5 @@
 #
-# $Header: /cvsroot/pgsql/contrib/mSQL-interface/Attic/Makefile,v 1.6 2000/10/20 21:03:18 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/mSQL-interface/Attic/Makefile,v 1.7 2001/02/20 19:20:27 petere Exp $
 #
 
 subdir = contrib/mSQL-interface
@@ -11,7 +11,7 @@ SO_MAJOR_VERSION := 0
 SO_MINOR_VERSION := 0
 OBJS	:= mpgsql.o
 
-override CPPFLAGS += -I$(libpq_srcdir)
+override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
 
 include $(top_srcdir)/src/Makefile.shlib
 
diff --git a/contrib/miscutil/Makefile b/contrib/miscutil/Makefile
index e57f8e7826..a745d7f610 100644
--- a/contrib/miscutil/Makefile
+++ b/contrib/miscutil/Makefile
@@ -1,5 +1,5 @@
 #
-# $Header: /cvsroot/pgsql/contrib/miscutil/Attic/Makefile,v 1.13 2000/10/20 21:03:21 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/miscutil/Attic/Makefile,v 1.14 2001/02/20 19:20:27 petere Exp $
 #
 
 subdir = contrib/miscutil
@@ -9,7 +9,7 @@ include $(top_builddir)/src/Makefile.global
 NAME	:= misc_utils
 SONAME	:= $(NAME)$(DLSUFFIX)
 
-override CPPFLAGS += -I$(srcdir)
+override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
 override CFLAGS += $(CFLAGS_SL)
 
 all: $(SONAME) $(NAME).sql
diff --git a/contrib/noupdate/Makefile b/contrib/noupdate/Makefile
index f165dad275..fbfe66fde3 100644
--- a/contrib/noupdate/Makefile
+++ b/contrib/noupdate/Makefile
@@ -1,5 +1,5 @@
 #
-# $Header: /cvsroot/pgsql/contrib/noupdate/Attic/Makefile,v 1.6 2000/10/20 21:03:24 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/noupdate/Attic/Makefile,v 1.7 2001/02/20 19:20:27 petere Exp $
 #
 
 subdir = contrib/noupdate
@@ -9,7 +9,7 @@ include $(top_builddir)/src/Makefile.global
 NAME	:= noup
 SONAME	:= $(NAME)$(DLSUFFIX)
 
-override CPPFLAGS += -I$(srcdir)
+override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
 override CFLAGS += $(CFLAGS_SL)
 
 all: $(SONAME) $(NAME).sql
diff --git a/contrib/oid2name/Makefile b/contrib/oid2name/Makefile
index 4303164d6a..370cd7de12 100644
--- a/contrib/oid2name/Makefile
+++ b/contrib/oid2name/Makefile
@@ -1,18 +1,17 @@
-#
-#
+# $Header: /cvsroot/pgsql/contrib/oid2name/Makefile,v 1.3 2001/02/20 19:20:27 petere Exp $
 
 subdir = contrib/oid2name
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 
-override CPPFLAGS += -I$(libpq_srcdir)
+override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
 
 OBJS	= oid2name.o
 
 all: oid2name
 
 oid2name: $(OBJS) $(libpq_builddir)/libpq.a
-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(libpq) $(LIBS) -o $@ -g
+	$(CC) $(CFLAGS) $(OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@ -g
 
 install: all installdirs
 	$(INSTALL_PROGRAM) oid2name$(X) $(bindir)
diff --git a/contrib/pg_dumplo/Makefile b/contrib/pg_dumplo/Makefile
index a3156945c3..9a21898f79 100644
--- a/contrib/pg_dumplo/Makefile
+++ b/contrib/pg_dumplo/Makefile
@@ -1,19 +1,19 @@
 #
-# $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/Makefile,v 1.9 2000/12/04 01:32:18 tgl Exp $
+# $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/Makefile,v 1.10 2001/02/20 19:20:27 petere Exp $
 #
 
 subdir = contrib/pg_dumplo
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 
-override CPPFLAGS += -I$(libpq_srcdir)
+override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
 
 OBJS	= main.o lo_export.o lo_import.o utils.o
 
 all: pg_dumplo
 
 pg_dumplo: $(OBJS) $(libpq_builddir)/libpq.a
-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(libpq) $(LIBS) -o $@
+	$(CC) $(CFLAGS) $(OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@
 
 install: all installdirs
 	$(INSTALL_PROGRAM) pg_dumplo$(X)	$(bindir)
diff --git a/contrib/pgbench/Makefile b/contrib/pgbench/Makefile
index 61f71e58f1..157e9c168c 100644
--- a/contrib/pgbench/Makefile
+++ b/contrib/pgbench/Makefile
@@ -1,19 +1,19 @@
 #
-# $Header: /cvsroot/pgsql/contrib/pgbench/Makefile,v 1.8 2000/12/04 01:32:19 tgl Exp $
+# $Header: /cvsroot/pgsql/contrib/pgbench/Makefile,v 1.9 2001/02/20 19:20:27 petere Exp $
 #
 
 subdir = contrib/pgbench
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 
-override CPPFLAGS += -I$(libpq_srcdir)
+override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
 
 OBJS	= pgbench.o
 
 all: pgbench
 
 pgbench: $(OBJS) $(libpq_builddir)/libpq.a
-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(libpq) $(LIBS) -o $@
+	$(CC) $(CFLAGS) $(OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@
 
 install: all installdirs
 	$(INSTALL_PROGRAM) pgbench$(X)	$(bindir)
diff --git a/contrib/rserv/Makefile b/contrib/rserv/Makefile
index c721420bde..bd2b4f1557 100644
--- a/contrib/rserv/Makefile
+++ b/contrib/rserv/Makefile
@@ -14,7 +14,7 @@ PERLS	+= SlaveInit SlaveAddTable GetSyncID
 PERLS	+= PrepareSnapshot ApplySnapshot
 SCRIPTS	= InitRservTest
 
-override CPPFLAGS += -I$(srcdir)
+override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
 override CFLAGS += $(CFLAGS_SL)
 
 
diff --git a/contrib/seg/Makefile b/contrib/seg/Makefile
index 1efc1c3198..0df4644cf5 100644
--- a/contrib/seg/Makefile
+++ b/contrib/seg/Makefile
@@ -1,5 +1,5 @@
 #
-# $Header: /cvsroot/pgsql/contrib/seg/Makefile,v 1.2 2001/02/10 22:31:42 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/seg/Makefile,v 1.3 2001/02/20 19:20:28 petere Exp $
 #
 
 subdir = contrib/seg
@@ -14,7 +14,7 @@ NAME= seg
 SO_MAJOR_VERSION= 1
 SO_MINOR_VERSION= 0
 
-override CPPFLAGS += -I$(srcdir)
+override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
 
 OBJS= seg.o segparse.o segscan.o buffer.o
 
diff --git a/contrib/spi/Makefile b/contrib/spi/Makefile
index bdce795f95..6a44b355de 100644
--- a/contrib/spi/Makefile
+++ b/contrib/spi/Makefile
@@ -1,5 +1,5 @@
 #
-# $Header: /cvsroot/pgsql/contrib/spi/Makefile,v 1.18 2000/10/20 21:03:31 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/spi/Makefile,v 1.19 2001/02/20 19:20:28 petere Exp $
 #
 
 subdir = contrib/spi
@@ -12,7 +12,7 @@ SQLS	= $(OBJS:.o=.sql)
 EXAMPLES= $(OBJS:.o=.example)
 MODS	= $(OBJS:.o=$(DLSUFFIX))
 
-override CPPFLAGS += -I$(srcdir)
+override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
 override CFLAGS += $(CFLAGS_SL)
 
 ifdef REFINT_VERBOSE
diff --git a/contrib/string/Makefile b/contrib/string/Makefile
index 05b6fafb7f..086b03a6a0 100644
--- a/contrib/string/Makefile
+++ b/contrib/string/Makefile
@@ -1,5 +1,5 @@
  #
-# $Header: /cvsroot/pgsql/contrib/string/Attic/Makefile,v 1.13 2000/10/20 21:03:32 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/string/Attic/Makefile,v 1.14 2001/02/20 19:20:28 petere Exp $
 #
 
 subdir = contrib/string
@@ -9,7 +9,7 @@ include $(top_builddir)/src/Makefile.global
 NAME	:= string_io
 SONAME	:= $(NAME)$(DLSUFFIX)
 
-override CPPFLAGS += -I$(srcdir)
+override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
 override CFLAGS += $(CFLAGS_SL)
 
 all: $(SONAME) $(NAME).sql
diff --git a/contrib/userlock/Makefile b/contrib/userlock/Makefile
index e33d6d9e24..ca13469bd6 100644
--- a/contrib/userlock/Makefile
+++ b/contrib/userlock/Makefile
@@ -1,5 +1,5 @@
 #
-# $Header: /cvsroot/pgsql/contrib/userlock/Attic/Makefile,v 1.13 2000/10/20 21:03:34 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/userlock/Attic/Makefile,v 1.14 2001/02/20 19:20:28 petere Exp $
 #
 
 subdir = contrib/userlock
@@ -9,7 +9,7 @@ include $(top_builddir)/src/Makefile.global
 NAME	:= user_locks
 SONAME	:= $(NAME)$(DLSUFFIX)
 
-override CPPFLAGS += -I$(srcdir)
+override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
 override CFLAGS += $(CFLAGS_SL)
 
 all: $(SONAME) $(NAME).sql
diff --git a/contrib/vacuumlo/Makefile b/contrib/vacuumlo/Makefile
index a61733ee58..8e57a148f8 100644
--- a/contrib/vacuumlo/Makefile
+++ b/contrib/vacuumlo/Makefile
@@ -1,19 +1,19 @@
 #
-# $Header: /cvsroot/pgsql/contrib/vacuumlo/Makefile,v 1.9 2000/12/04 01:32:19 tgl Exp $
+# $Header: /cvsroot/pgsql/contrib/vacuumlo/Makefile,v 1.10 2001/02/20 19:20:28 petere Exp $
 #
 
 subdir = contrib/vacuumlo
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 
-override CPPFLAGS += -I$(libpq_srcdir)
+override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
 
 OBJS	= vacuumlo.o
 
 all: vacuumlo
 
 vacuumlo: $(OBJS) $(libpq_builddir)/libpq.a
-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(libpq) $(LIBS) -o $@
+	$(CC) $(CFLAGS) $(OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@
 
 install: all installdirs
 	$(INSTALL_PROGRAM) vacuumlo$(X) $(bindir)