summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rw-r--r--contrib/array/Makefile7
-rw-r--r--contrib/earthdistance/Makefile5
-rw-r--r--contrib/findoidjoins/Makefile8
-rw-r--r--contrib/fulltextindex/Makefile5
-rw-r--r--contrib/isbn_issn/Makefile7
-rw-r--r--contrib/lo/Makefile9
-rw-r--r--contrib/mSQL-interface/Makefile4
-rw-r--r--contrib/miscutil/Makefile7
-rw-r--r--contrib/noupdate/Makefile7
-rw-r--r--contrib/pg_dumplo/Makefile8
-rw-r--r--contrib/pgbench/Makefile8
-rw-r--r--contrib/soundex/Makefile5
-rw-r--r--contrib/spi/Makefile9
-rw-r--r--contrib/string/Makefile7
-rw-r--r--contrib/userlock/Makefile7
-rw-r--r--contrib/vacuumlo/Makefile8
16 files changed, 61 insertions, 50 deletions
diff --git a/contrib/array/Makefile b/contrib/array/Makefile
index 61f12fcfc9..14e748506c 100644
--- a/contrib/array/Makefile
+++ b/contrib/array/Makefile
@@ -1,15 +1,16 @@
#
-# $Header: /cvsroot/pgsql/contrib/array/Attic/Makefile,v 1.12 2000/07/09 13:12:59 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/array/Attic/Makefile,v 1.13 2000/10/20 21:03:03 petere Exp $
#
subdir = contrib/array
top_builddir = ../..
-include ../../src/Makefile.global
+include $(top_builddir)/src/Makefile.global
NAME := array_iterator
SONAME := $(NAME)$(DLSUFFIX)
-CFLAGS += -I. $(CFLAGS_SL)
+override CPPFLAGS += -I$(srcdir)
+override CFLAGS += $(CFLAGS_SL)
all: $(SONAME) $(NAME).sql
diff --git a/contrib/earthdistance/Makefile b/contrib/earthdistance/Makefile
index 733f128b82..47e1cf96e2 100644
--- a/contrib/earthdistance/Makefile
+++ b/contrib/earthdistance/Makefile
@@ -1,5 +1,5 @@
#
-# $Header: /cvsroot/pgsql/contrib/earthdistance/Makefile,v 1.6 2000/07/09 13:13:00 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/earthdistance/Makefile,v 1.7 2000/10/20 21:03:03 petere Exp $
#
subdir = contrib/earthdistance
@@ -9,7 +9,8 @@ include ../../src/Makefile.global
NAME := earthdistance
SONAME := $(NAME)$(DLSUFFIX)
-CFLAGS += -I. $(CFLAGS_SL)
+override CPPFLAGS += -I$(srcdir)
+override CFLAGS += $(CFLAGS_SL)
all: $(SONAME) $(NAME).sql
diff --git a/contrib/findoidjoins/Makefile b/contrib/findoidjoins/Makefile
index 0c43051c7b..16bbc3e527 100644
--- a/contrib/findoidjoins/Makefile
+++ b/contrib/findoidjoins/Makefile
@@ -1,13 +1,13 @@
#
-# $Header: /cvsroot/pgsql/contrib/findoidjoins/Attic/Makefile,v 1.9 2000/08/31 16:08:59 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/findoidjoins/Attic/Makefile,v 1.10 2000/10/20 21:03:06 petere Exp $
#
subdir = contrib/findoidjoins
top_builddir = ../..
-include ../../src/Makefile.global
+include $(top_builddir)/src/Makefile.global
-CFLAGS += -I$(libpgeasy_srcdir) -I$(libpq_srcdir)
-LIBS += $(libpgeasy)
+override CPPFLAGS += -I$(libpgeasy_srcdir) -I$(libpq_srcdir)
+override LIBS += $(libpgeasy)
all: findoidjoins
diff --git a/contrib/fulltextindex/Makefile b/contrib/fulltextindex/Makefile
index cb76c19405..15b95138cc 100644
--- a/contrib/fulltextindex/Makefile
+++ b/contrib/fulltextindex/Makefile
@@ -1,5 +1,5 @@
#
-# $Header: /cvsroot/pgsql/contrib/fulltextindex/Attic/Makefile,v 1.7 2000/07/09 13:13:07 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/fulltextindex/Attic/Makefile,v 1.8 2000/10/20 21:03:10 petere Exp $
#
subdir = contrib/fulltextindex
@@ -9,7 +9,8 @@ include ../../src/Makefile.global
NAME := fti
SONAME := $(NAME)$(DLSUFFIX)
-CFLAGS += -I. $(CFLAGS_SL)
+override CPPFLAGS += -I$(srcdir)
+override CFLAGS += $(CFLAGS_SL)
all: $(SONAME) $(NAME).sql
diff --git a/contrib/isbn_issn/Makefile b/contrib/isbn_issn/Makefile
index 6969063eeb..dd91574ebd 100644
--- a/contrib/isbn_issn/Makefile
+++ b/contrib/isbn_issn/Makefile
@@ -1,15 +1,16 @@
#
-# $Header: /cvsroot/pgsql/contrib/isbn_issn/Attic/Makefile,v 1.7 2000/07/09 13:13:10 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/isbn_issn/Attic/Makefile,v 1.8 2000/10/20 21:03:13 petere Exp $
#
subdir = contrib/isbn_issn
top_builddir = ../..
-include ../../src/Makefile.global
+include $(top_builddir)/src/Makefile.global
NAME := isbn_issn
SONAME := $(NAME)$(DLSUFFIX)
-CFLAGS += -I. $(CFLAGS_SL)
+override CPPFLAGS += -I$(srcdir)
+override CFLAGS += $(CFLAGS_SL)
all: $(SONAME) $(NAME).sql
diff --git a/contrib/lo/Makefile b/contrib/lo/Makefile
index ed192a9d28..bfa1f7561a 100644
--- a/contrib/lo/Makefile
+++ b/contrib/lo/Makefile
@@ -1,10 +1,10 @@
#
-# $Header: /cvsroot/pgsql/contrib/lo/Makefile,v 1.7 2000/07/09 13:13:14 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/lo/Makefile,v 1.8 2000/10/20 21:03:16 petere Exp $
#
subdir = contrib/lo
top_builddir = ../..
-include ../../src/Makefile.global
+include $(top_builddir)/src/Makefile.global
NAME := lo
SONAME := $(NAME)$(DLSUFFIX)
@@ -12,10 +12,11 @@ SONAME := $(NAME)$(DLSUFFIX)
SQLS = $(NAME).sql lo_drop.sql lo_test.sql
MODS = $(NAME)$(DLSUFFIX)
-CFLAGS += -I. $(CFLAGS_SL)
+override CPPFLAGS += -I$(srcdir)
+override CFLAGS += $(CFLAGS_SL)
ifdef REFINT_VERBOSE
-CFLAGS+= -DREFINT_VERBOSE
+override CPPFLAGS+= -DREFINT_VERBOSE
endif
all: $(SONAME) $(NAME).sql
diff --git a/contrib/mSQL-interface/Makefile b/contrib/mSQL-interface/Makefile
index 23d866dd1c..179dbe864e 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.5 2000/08/31 16:09:00 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/mSQL-interface/Attic/Makefile,v 1.6 2000/10/20 21:03:18 petere Exp $
#
subdir = contrib/mSQL-interface
@@ -11,7 +11,7 @@ SO_MAJOR_VERSION := 0
SO_MINOR_VERSION := 0
OBJS := mpgsql.o
-CFLAGS += -I$(libpq_srcdir)
+override CPPFLAGS += -I$(libpq_srcdir)
include $(top_srcdir)/src/Makefile.shlib
diff --git a/contrib/miscutil/Makefile b/contrib/miscutil/Makefile
index 6ed5712bf4..e57f8e7826 100644
--- a/contrib/miscutil/Makefile
+++ b/contrib/miscutil/Makefile
@@ -1,15 +1,16 @@
#
-# $Header: /cvsroot/pgsql/contrib/miscutil/Attic/Makefile,v 1.12 2000/07/09 13:13:20 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/miscutil/Attic/Makefile,v 1.13 2000/10/20 21:03:21 petere Exp $
#
subdir = contrib/miscutil
top_builddir = ../..
-include ../../src/Makefile.global
+include $(top_builddir)/src/Makefile.global
NAME := misc_utils
SONAME := $(NAME)$(DLSUFFIX)
-CFLAGS += -I. $(CFLAGS_SL)
+override CPPFLAGS += -I$(srcdir)
+override CFLAGS += $(CFLAGS_SL)
all: $(SONAME) $(NAME).sql
diff --git a/contrib/noupdate/Makefile b/contrib/noupdate/Makefile
index 65a6e06737..f165dad275 100644
--- a/contrib/noupdate/Makefile
+++ b/contrib/noupdate/Makefile
@@ -1,15 +1,16 @@
#
-# $Header: /cvsroot/pgsql/contrib/noupdate/Attic/Makefile,v 1.5 2000/07/09 13:13:24 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/noupdate/Attic/Makefile,v 1.6 2000/10/20 21:03:24 petere Exp $
#
subdir = contrib/noupdate
top_builddir = ../..
-include ../../src/Makefile.global
+include $(top_builddir)/src/Makefile.global
NAME := noup
SONAME := $(NAME)$(DLSUFFIX)
-CFLAGS += -I. $(CFLAGS_SL)
+override CPPFLAGS += -I$(srcdir)
+override CFLAGS += $(CFLAGS_SL)
all: $(SONAME) $(NAME).sql
diff --git a/contrib/pg_dumplo/Makefile b/contrib/pg_dumplo/Makefile
index f9d534508e..f8900b17c7 100644
--- a/contrib/pg_dumplo/Makefile
+++ b/contrib/pg_dumplo/Makefile
@@ -1,18 +1,18 @@
#
-# $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/Makefile,v 1.6 2000/08/31 16:09:05 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/Makefile,v 1.7 2000/10/20 21:03:25 petere Exp $
#
subdir = contrib/pg_dumplo
top_builddir = ../..
-include ../../src/Makefile.global
+include $(top_builddir)/src/Makefile.global
OBJS = main.o lo_export.o lo_import.o utils.o
-CFLAGS += -I$(libpq_srcdir)
+override CPPFLAGS += -I$(libpq_srcdir)
all: pg_dumplo
pg_dumplo: $(OBJS) $(libpq_builddir)/libpq.a
- $(CC) $(CFLAGS) -o $@ $(OBJS) $(libpq)
+ $(CC) -o $@ $(OBJS) $(libpq) $(CFLAGS) $(LDFLAGS)
install: all installdirs
$(INSTALL_PROGRAM) pg_dumplo$(X) $(bindir)
diff --git a/contrib/pgbench/Makefile b/contrib/pgbench/Makefile
index 64eeeb701b..bedb1d0de3 100644
--- a/contrib/pgbench/Makefile
+++ b/contrib/pgbench/Makefile
@@ -1,13 +1,13 @@
#
-# $Header: /cvsroot/pgsql/contrib/pgbench/Makefile,v 1.6 2000/08/31 16:09:09 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/pgbench/Makefile,v 1.7 2000/10/20 21:03:26 petere Exp $
#
subdir = contrib/pgbench
top_builddir = ../..
-include ../../src/Makefile.global
+include $(top_builddir)/src/Makefile.global
-CFLAGS += -I$(libpq_srcdir)
-LIBS += $(libpq)
+override CPPFLAGS += -I$(libpq_srcdir)
+override LIBS += $(libpq)
all: pgbench
diff --git a/contrib/soundex/Makefile b/contrib/soundex/Makefile
index 9bfc813f97..54b4fa0b44 100644
--- a/contrib/soundex/Makefile
+++ b/contrib/soundex/Makefile
@@ -1,5 +1,5 @@
#
-# $Header: /cvsroot/pgsql/contrib/soundex/Attic/Makefile,v 1.8 2000/10/04 19:25:34 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/soundex/Attic/Makefile,v 1.9 2000/10/20 21:03:28 petere Exp $
#
subdir = contrib/soundex
@@ -9,7 +9,8 @@ include $(top_builddir)/src/Makefile.global
NAME := soundex
SONAME := $(NAME)$(DLSUFFIX)
-CFLAGS += -I. $(CFLAGS_SL)
+override CPPFLAGS += -I$(srcdir)
+override CFLAGS += $(CFLAGS_SL)
all: $(SONAME) $(NAME).sql
diff --git a/contrib/spi/Makefile b/contrib/spi/Makefile
index 60bc2e6dbf..bdce795f95 100644
--- a/contrib/spi/Makefile
+++ b/contrib/spi/Makefile
@@ -1,10 +1,10 @@
#
-# $Header: /cvsroot/pgsql/contrib/spi/Makefile,v 1.17 2000/07/09 13:13:36 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/spi/Makefile,v 1.18 2000/10/20 21:03:31 petere Exp $
#
subdir = contrib/spi
top_builddir = ../..
-include ../../src/Makefile.global
+include $(top_builddir)/src/Makefile.global
OBJS = autoinc.o insert_username.o moddatetime.o refint.o timetravel.o
DOCS = README.spi
@@ -12,10 +12,11 @@ SQLS = $(OBJS:.o=.sql)
EXAMPLES= $(OBJS:.o=.example)
MODS = $(OBJS:.o=$(DLSUFFIX))
-CFLAGS += -I. $(CFLAGS_SL)
+override CPPFLAGS += -I$(srcdir)
+override CFLAGS += $(CFLAGS_SL)
ifdef REFINT_VERBOSE
-CFLAGS+= -DREFINT_VERBOSE
+override CPPFLAGS+= -DREFINT_VERBOSE
endif
all: $(MODS) $(SQLS)
diff --git a/contrib/string/Makefile b/contrib/string/Makefile
index 1b01e63afb..05b6fafb7f 100644
--- a/contrib/string/Makefile
+++ b/contrib/string/Makefile
@@ -1,15 +1,16 @@
#
-# $Header: /cvsroot/pgsql/contrib/string/Attic/Makefile,v 1.12 2000/07/09 13:13:43 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/string/Attic/Makefile,v 1.13 2000/10/20 21:03:32 petere Exp $
#
subdir = contrib/string
top_builddir = ../..
-include ../../src/Makefile.global
+include $(top_builddir)/src/Makefile.global
NAME := string_io
SONAME := $(NAME)$(DLSUFFIX)
-CFLAGS += -I. $(CFLAGS_SL)
+override CPPFLAGS += -I$(srcdir)
+override CFLAGS += $(CFLAGS_SL)
all: $(SONAME) $(NAME).sql
diff --git a/contrib/userlock/Makefile b/contrib/userlock/Makefile
index 7c262087c9..e33d6d9e24 100644
--- a/contrib/userlock/Makefile
+++ b/contrib/userlock/Makefile
@@ -1,15 +1,16 @@
#
-# $Header: /cvsroot/pgsql/contrib/userlock/Attic/Makefile,v 1.12 2000/07/09 13:13:52 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/userlock/Attic/Makefile,v 1.13 2000/10/20 21:03:34 petere Exp $
#
subdir = contrib/userlock
top_builddir = ../..
-include ../../src/Makefile.global
+include $(top_builddir)/src/Makefile.global
NAME := user_locks
SONAME := $(NAME)$(DLSUFFIX)
-CFLAGS += -I. $(CFLAGS_SL)
+override CPPFLAGS += -I$(srcdir)
+override CFLAGS += $(CFLAGS_SL)
all: $(SONAME) $(NAME).sql
diff --git a/contrib/vacuumlo/Makefile b/contrib/vacuumlo/Makefile
index 85961d090a..b06568c0a1 100644
--- a/contrib/vacuumlo/Makefile
+++ b/contrib/vacuumlo/Makefile
@@ -1,13 +1,13 @@
#
-# $Header: /cvsroot/pgsql/contrib/vacuumlo/Makefile,v 1.7 2000/08/31 16:09:12 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/vacuumlo/Makefile,v 1.8 2000/10/20 21:03:36 petere Exp $
#
subdir = contrib/vacuumlo
top_builddir = ../..
-include ../../src/Makefile.global
+include $(top_builddir)/src/Makefile.global
-CPPFLAGS += -I$(libpq_srcdir)
-LIBS += $(libpq)
+override CPPFLAGS += -I$(libpq_srcdir)
+override LIBS += $(libpq)
all: vacuumlo
View Lorry Controller Status