1
0
mirror of https://github.com/postgres/postgres.git synced 2025-07-27 12:41:57 +03:00

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

or library directories on the command line.
This commit is contained in:
Peter Eisentraut
2001-02-20 19:20:30 +00:00
parent c4a9023d52
commit cb6edf9d56
39 changed files with 95 additions and 100 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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)

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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)