Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitcb6edf9

Browse files
committed
Make sure -L and -I's for our source tree are always before system include
or library directories on the command line.
1 parentc4a9023 commitcb6edf9

File tree

39 files changed

+95
-100
lines changed

39 files changed

+95
-100
lines changed

‎contrib/array/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/array/Attic/Makefile,v 1.13 2000/10/2021:03:03 petere Exp $
2+
# $Header: /cvsroot/pgsql/contrib/array/Attic/Makefile,v 1.14 2001/02/2019:20:26 petere Exp $
33
#
44

55
subdir = contrib/array
@@ -9,7 +9,7 @@ include $(top_builddir)/src/Makefile.global
99
NAME:= array_iterator
1010
SONAME:=$(NAME)$(DLSUFFIX)
1111

12-
overrideCPPFLAGS+= -I$(srcdir)
12+
overrideCPPFLAGS:= -I$(srcdir)$(CPPFLAGS)
1313
overrideCFLAGS +=$(CFLAGS_SL)
1414

1515
all:$(SONAME)$(NAME).sql

‎contrib/cube/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/cube/Makefile,v 1.2 2001/02/10 22:31:42 petere Exp $
2+
# $Header: /cvsroot/pgsql/contrib/cube/Makefile,v 1.3 2001/02/20 19:20:27 petere Exp $
33
#
44

55
subdir = contrib/cube
@@ -14,7 +14,7 @@ NAME= cube
1414
SO_MAJOR_VERSION= 1
1515
SO_MINOR_VERSION= 0
1616

17-
overrideCPPFLAGS+= -I$(srcdir)
17+
overrideCPPFLAGS:= -I$(srcdir)$(CPPFLAGS)
1818

1919
OBJS= cube.o cubeparse.o cubescan.o buffer.o
2020

‎contrib/earthdistance/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/earthdistance/Makefile,v 1.7 2000/10/2021:03:03 petere Exp $
2+
# $Header: /cvsroot/pgsql/contrib/earthdistance/Makefile,v 1.8 2001/02/2019:20:27 petere Exp $
33
#
44

55
subdir = contrib/earthdistance
@@ -9,7 +9,7 @@ include ../../src/Makefile.global
99
NAME:= earthdistance
1010
SONAME:=$(NAME)$(DLSUFFIX)
1111

12-
overrideCPPFLAGS+= -I$(srcdir)
12+
overrideCPPFLAGS:= -I$(srcdir)$(CPPFLAGS)
1313
overrideCFLAGS +=$(CFLAGS_SL)
1414

1515
all:$(SONAME)$(NAME).sql

‎contrib/findoidjoins/Makefile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/findoidjoins/Attic/Makefile,v 1.11 2000/12/04 01:32:18 tgl Exp $
2+
# $Header: /cvsroot/pgsql/contrib/findoidjoins/Attic/Makefile,v 1.12 2001/02/20 19:20:27 petere Exp $
33
#
44

55
subdir = contrib/findoidjoins
66
top_builddir = ../..
77
include$(top_builddir)/src/Makefile.global
88

9-
overrideCPPFLAGS += -I$(libpgeasy_srcdir) -I$(libpq_srcdir)
9+
libpgeasy_srcdir =$(top_srcdir)/src/interfaces/libpgeasy
10+
libpgeasy_builddir =$(top_builddir)/src/interfaces/libpgeasy
11+
12+
overrideCPPFLAGS := -I$(libpgeasy_srcdir) -I$(libpq_srcdir)$(CPPFLAGS)
1013

1114
OBJS= findoidjoins.o
1215

1316
all: findoidjoins
1417

1518
findoidjoins:$(OBJS)$(libpgeasy_builddir)/libpgeasy.a$(libpq_builddir)/libpq.a
16-
$(CC)$(CFLAGS)$(LDFLAGS)$(OBJS)$(libpgeasy)$(libpq)$(LIBS) -o$@
19+
$(CC)$(CFLAGS)$(OBJS) -L$(libpgeasy_builddir) -lpgeasy$(libpq)$(LDFLAGS)$(LIBS) -o$@
1720

1821
install: all installdirs
1922
$(INSTALL_PROGRAM) findoidjoins$(X)$(bindir)

‎contrib/fulltextindex/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/fulltextindex/Attic/Makefile,v 1.8 2000/10/2021:03:10 petere Exp $
2+
# $Header: /cvsroot/pgsql/contrib/fulltextindex/Attic/Makefile,v 1.9 2001/02/2019:20:27 petere Exp $
33
#
44

55
subdir = contrib/fulltextindex
@@ -9,7 +9,7 @@ include ../../src/Makefile.global
99
NAME:= fti
1010
SONAME:=$(NAME)$(DLSUFFIX)
1111

12-
overrideCPPFLAGS+= -I$(srcdir)
12+
overrideCPPFLAGS:= -I$(srcdir)$(CPPFLAGS)
1313
overrideCFLAGS +=$(CFLAGS_SL)
1414

1515
all:$(SONAME)$(NAME).sql

‎contrib/intarray/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Header: /cvsroot/pgsql/contrib/intarray/Makefile,v 1.2 2001/01/13 02:18:31 petere Exp $
1+
# $Header: /cvsroot/pgsql/contrib/intarray/Makefile,v 1.3 2001/02/20 19:20:27 petere Exp $
22

33
subdir = contrib/intarray
44
top_builddir = ../..
@@ -12,7 +12,7 @@ NAME= _int
1212
SO_MAJOR_VERSION= 1
1313
SO_MINOR_VERSION= 0
1414

15-
overrideCPPFLAGS+= -I$(srcdir) -DPGSQL71
15+
overrideCPPFLAGS:= -I$(srcdir)$(CPPFLAGS) -DPGSQL71
1616

1717
OBJS= _int.o
1818

‎contrib/isbn_issn/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/isbn_issn/Attic/Makefile,v 1.8 2000/10/2021:03:13 petere Exp $
2+
# $Header: /cvsroot/pgsql/contrib/isbn_issn/Attic/Makefile,v 1.9 2001/02/2019:20:27 petere Exp $
33
#
44

55
subdir = contrib/isbn_issn
@@ -9,7 +9,7 @@ include $(top_builddir)/src/Makefile.global
99
NAME:= isbn_issn
1010
SONAME:=$(NAME)$(DLSUFFIX)
1111

12-
overrideCPPFLAGS+= -I$(srcdir)
12+
overrideCPPFLAGS:= -I$(srcdir)$(CPPFLAGS)
1313
overrideCFLAGS +=$(CFLAGS_SL)
1414

1515
all:$(SONAME)$(NAME).sql

‎contrib/lo/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/lo/Makefile,v 1.8 2000/10/2021:03:16 petere Exp $
2+
# $Header: /cvsroot/pgsql/contrib/lo/Makefile,v 1.9 2001/02/2019:20:27 petere Exp $
33
#
44

55
subdir = contrib/lo
@@ -12,7 +12,7 @@ SONAME:= $(NAME)$(DLSUFFIX)
1212
SQLS=$(NAME).sql lo_drop.sql lo_test.sql
1313
MODS=$(NAME)$(DLSUFFIX)
1414

15-
overrideCPPFLAGS+= -I$(srcdir)
15+
overrideCPPFLAGS:= -I$(srcdir)$(CPPFLAGS)
1616
overrideCFLAGS +=$(CFLAGS_SL)
1717

1818
ifdefREFINT_VERBOSE

‎contrib/mSQL-interface/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/mSQL-interface/Attic/Makefile,v 1.6 2000/10/2021:03:18 petere Exp $
2+
# $Header: /cvsroot/pgsql/contrib/mSQL-interface/Attic/Makefile,v 1.7 2001/02/2019:20:27 petere Exp $
33
#
44

55
subdir = contrib/mSQL-interface
@@ -11,7 +11,7 @@ SO_MAJOR_VERSION := 0
1111
SO_MINOR_VERSION := 0
1212
OBJS:= mpgsql.o
1313

14-
overrideCPPFLAGS+= -I$(libpq_srcdir)
14+
overrideCPPFLAGS:= -I$(libpq_srcdir)$(CPPFLAGS)
1515

1616
include$(top_srcdir)/src/Makefile.shlib
1717

‎contrib/miscutil/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/miscutil/Attic/Makefile,v 1.13 2000/10/2021:03:21 petere Exp $
2+
# $Header: /cvsroot/pgsql/contrib/miscutil/Attic/Makefile,v 1.14 2001/02/2019:20:27 petere Exp $
33
#
44

55
subdir = contrib/miscutil
@@ -9,7 +9,7 @@ include $(top_builddir)/src/Makefile.global
99
NAME:= misc_utils
1010
SONAME:=$(NAME)$(DLSUFFIX)
1111

12-
overrideCPPFLAGS+= -I$(srcdir)
12+
overrideCPPFLAGS:= -I$(srcdir)$(CPPFLAGS)
1313
overrideCFLAGS +=$(CFLAGS_SL)
1414

1515
all:$(SONAME)$(NAME).sql

‎contrib/noupdate/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/noupdate/Attic/Makefile,v 1.6 2000/10/2021:03:24 petere Exp $
2+
# $Header: /cvsroot/pgsql/contrib/noupdate/Attic/Makefile,v 1.7 2001/02/2019:20:27 petere Exp $
33
#
44

55
subdir = contrib/noupdate
@@ -9,7 +9,7 @@ include $(top_builddir)/src/Makefile.global
99
NAME:= noup
1010
SONAME:=$(NAME)$(DLSUFFIX)
1111

12-
overrideCPPFLAGS+= -I$(srcdir)
12+
overrideCPPFLAGS:= -I$(srcdir)$(CPPFLAGS)
1313
overrideCFLAGS +=$(CFLAGS_SL)
1414

1515
all:$(SONAME)$(NAME).sql

‎contrib/oid2name/Makefile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
#
2-
#
1+
# $Header: /cvsroot/pgsql/contrib/oid2name/Makefile,v 1.3 2001/02/20 19:20:27 petere Exp $
32

43
subdir = contrib/oid2name
54
top_builddir = ../..
65
include$(top_builddir)/src/Makefile.global
76

8-
overrideCPPFLAGS+= -I$(libpq_srcdir)
7+
overrideCPPFLAGS:= -I$(libpq_srcdir)$(CPPFLAGS)
98

109
OBJS= oid2name.o
1110

1211
all: oid2name
1312

1413
oid2name:$(OBJS)$(libpq_builddir)/libpq.a
15-
$(CC)$(CFLAGS)$(LDFLAGS)$(OBJS)$(libpq)$(LIBS) -o$@ -g
14+
$(CC)$(CFLAGS)$(OBJS)$(libpq)$(LDFLAGS)$(LIBS) -o$@ -g
1615

1716
install: all installdirs
1817
$(INSTALL_PROGRAM) oid2name$(X)$(bindir)

‎contrib/pg_dumplo/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/Makefile,v 1.9 2000/12/04 01:32:18 tgl Exp $
2+
# $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/Makefile,v 1.10 2001/02/20 19:20:27 petere Exp $
33
#
44

55
subdir = contrib/pg_dumplo
66
top_builddir = ../..
77
include$(top_builddir)/src/Makefile.global
88

9-
overrideCPPFLAGS+= -I$(libpq_srcdir)
9+
overrideCPPFLAGS:= -I$(libpq_srcdir)$(CPPFLAGS)
1010

1111
OBJS= main.o lo_export.o lo_import.o utils.o
1212

1313
all: pg_dumplo
1414

1515
pg_dumplo:$(OBJS)$(libpq_builddir)/libpq.a
16-
$(CC)$(CFLAGS)$(LDFLAGS)$(OBJS)$(libpq)$(LIBS) -o$@
16+
$(CC)$(CFLAGS)$(OBJS)$(libpq)$(LDFLAGS)$(LIBS) -o$@
1717

1818
install: all installdirs
1919
$(INSTALL_PROGRAM) pg_dumplo$(X)$(bindir)

‎contrib/pgbench/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/pgbench/Makefile,v 1.8 2000/12/04 01:32:19 tgl Exp $
2+
# $Header: /cvsroot/pgsql/contrib/pgbench/Makefile,v 1.9 2001/02/20 19:20:27 petere Exp $
33
#
44

55
subdir = contrib/pgbench
66
top_builddir = ../..
77
include$(top_builddir)/src/Makefile.global
88

9-
overrideCPPFLAGS+= -I$(libpq_srcdir)
9+
overrideCPPFLAGS:= -I$(libpq_srcdir)$(CPPFLAGS)
1010

1111
OBJS= pgbench.o
1212

1313
all: pgbench
1414

1515
pgbench:$(OBJS)$(libpq_builddir)/libpq.a
16-
$(CC)$(CFLAGS)$(LDFLAGS)$(OBJS)$(libpq)$(LIBS) -o$@
16+
$(CC)$(CFLAGS)$(OBJS)$(libpq)$(LDFLAGS)$(LIBS) -o$@
1717

1818
install: all installdirs
1919
$(INSTALL_PROGRAM) pgbench$(X)$(bindir)

‎contrib/rserv/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ PERLS+= SlaveInit SlaveAddTable GetSyncID
1414
PERLS+= PrepareSnapshot ApplySnapshot
1515
SCRIPTS= InitRservTest
1616

17-
overrideCPPFLAGS+= -I$(srcdir)
17+
overrideCPPFLAGS:= -I$(srcdir)$(CPPFLAGS)
1818
overrideCFLAGS +=$(CFLAGS_SL)
1919

2020

‎contrib/seg/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/seg/Makefile,v 1.2 2001/02/10 22:31:42 petere Exp $
2+
# $Header: /cvsroot/pgsql/contrib/seg/Makefile,v 1.3 2001/02/20 19:20:28 petere Exp $
33
#
44

55
subdir = contrib/seg
@@ -14,7 +14,7 @@ NAME= seg
1414
SO_MAJOR_VERSION= 1
1515
SO_MINOR_VERSION= 0
1616

17-
overrideCPPFLAGS+= -I$(srcdir)
17+
overrideCPPFLAGS:= -I$(srcdir)$(CPPFLAGS)
1818

1919
OBJS= seg.o segparse.o segscan.o buffer.o
2020

‎contrib/spi/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/spi/Makefile,v 1.18 2000/10/2021:03:31 petere Exp $
2+
# $Header: /cvsroot/pgsql/contrib/spi/Makefile,v 1.19 2001/02/2019:20:28 petere Exp $
33
#
44

55
subdir = contrib/spi
@@ -12,7 +12,7 @@ SQLS= $(OBJS:.o=.sql)
1212
EXAMPLES=$(OBJS:.o=.example)
1313
MODS=$(OBJS:.o=$(DLSUFFIX))
1414

15-
overrideCPPFLAGS+= -I$(srcdir)
15+
overrideCPPFLAGS:= -I$(srcdir)$(CPPFLAGS)
1616
overrideCFLAGS +=$(CFLAGS_SL)
1717

1818
ifdefREFINT_VERBOSE

‎contrib/string/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/string/Attic/Makefile,v 1.13 2000/10/2021:03:32 petere Exp $
2+
# $Header: /cvsroot/pgsql/contrib/string/Attic/Makefile,v 1.14 2001/02/2019:20:28 petere Exp $
33
#
44

55
subdir = contrib/string
@@ -9,7 +9,7 @@ include $(top_builddir)/src/Makefile.global
99
NAME:= string_io
1010
SONAME:=$(NAME)$(DLSUFFIX)
1111

12-
overrideCPPFLAGS+= -I$(srcdir)
12+
overrideCPPFLAGS:= -I$(srcdir)$(CPPFLAGS)
1313
overrideCFLAGS +=$(CFLAGS_SL)
1414

1515
all:$(SONAME)$(NAME).sql

‎contrib/userlock/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/userlock/Attic/Makefile,v 1.13 2000/10/2021:03:34 petere Exp $
2+
# $Header: /cvsroot/pgsql/contrib/userlock/Attic/Makefile,v 1.14 2001/02/2019:20:28 petere Exp $
33
#
44

55
subdir = contrib/userlock
@@ -9,7 +9,7 @@ include $(top_builddir)/src/Makefile.global
99
NAME:= user_locks
1010
SONAME:=$(NAME)$(DLSUFFIX)
1111

12-
overrideCPPFLAGS+= -I$(srcdir)
12+
overrideCPPFLAGS:= -I$(srcdir)$(CPPFLAGS)
1313
overrideCFLAGS +=$(CFLAGS_SL)
1414

1515
all:$(SONAME)$(NAME).sql

‎contrib/vacuumlo/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/vacuumlo/Makefile,v 1.9 2000/12/04 01:32:19 tgl Exp $
2+
# $Header: /cvsroot/pgsql/contrib/vacuumlo/Makefile,v 1.10 2001/02/20 19:20:28 petere Exp $
33
#
44

55
subdir = contrib/vacuumlo
66
top_builddir = ../..
77
include$(top_builddir)/src/Makefile.global
88

9-
overrideCPPFLAGS+= -I$(libpq_srcdir)
9+
overrideCPPFLAGS:= -I$(libpq_srcdir)$(CPPFLAGS)
1010

1111
OBJS= vacuumlo.o
1212

1313
all: vacuumlo
1414

1515
vacuumlo:$(OBJS)$(libpq_builddir)/libpq.a
16-
$(CC)$(CFLAGS)$(LDFLAGS)$(OBJS)$(libpq)$(LIBS) -o$@
16+
$(CC)$(CFLAGS)$(OBJS)$(libpq)$(LDFLAGS)$(LIBS) -o$@
1717

1818
install: all installdirs
1919
$(INSTALL_PROGRAM) vacuumlo$(X)$(bindir)

‎src/Makefile.global.in

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*-makefile-*-
2-
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.118 2001/02/0720:13:27 tgl Exp $
2+
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.119 2001/02/20 19:20:28 petere Exp $
33

44
#------------------------------------------------------------------------------
55
# All PostgreSQL makefiles include this file and use the variables it sets,
@@ -137,7 +137,7 @@ DOCBOOKSTYLE= @DOCBOOKSTYLE@
137137

138138
CPP = @CPP@
139139
CPPFLAGS = @CPPFLAGS@
140-
overrideCPPFLAGS+=$(sort -I$(top_srcdir)/src/include -I$(top_builddir)/src/include)
140+
overrideCPPFLAGS:=$(sort -I$(top_srcdir)/src/include -I$(top_builddir)/src/include)$(CPPFLAGS)
141141

142142
CC = @CC@
143143
GCC = @GCC@
@@ -240,10 +240,6 @@ libpq_srcdir = $(top_srcdir)/src/interfaces/libpq
240240
libpq_builddir =$(top_builddir)/src/interfaces/libpq
241241
libpq = -L$(libpq_builddir) -lpq
242242

243-
libpgeasy_srcdir =$(top_srcdir)/src/interfaces/libpgeasy
244-
libpgeasy_builddir =$(top_builddir)/src/interfaces/libpgeasy
245-
libpgeasy = -L$(libpgeasy_builddir) -lpgeasy
246-
247243

248244
##########################################################################
249245
#

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp