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

Commitc62b29a

Browse files
committed
Fix several contrib makefiles that failed in VPATH builds, particularly
when not using gcc (which has slightly nonstandard inclusion rules).
1 parent23836fb commitc62b29a

File tree

5 files changed

+21
-13
lines changed

5 files changed

+21
-13
lines changed

‎contrib/cube/Makefile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $PostgreSQL: pgsql/contrib/cube/Makefile,v 1.14 2005/09/27 17:13:00 tgl Exp $
1+
# $PostgreSQL: pgsql/contrib/cube/Makefile,v 1.15 2005/10/18 01:30:48 tgl Exp $
22

33
MODULE_big = cube
44
OBJS= cube.o cubeparse.o
@@ -9,6 +9,8 @@ REGRESS = cube
99

1010
EXTRA_CLEAN = cubeparse.c cubeparse.h cubescan.c y.tab.c y.tab.h
1111

12+
PG_CPPFLAGS = -I.
13+
1214
SHLIB_LINK +=$(filter -lm,$(LIBS))
1315

1416
ifdefUSE_PGXS

‎contrib/seg/Makefile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $PostgreSQL: pgsql/contrib/seg/Makefile,v 1.13 2005/09/27 17:13:09 tgl Exp $
1+
# $PostgreSQL: pgsql/contrib/seg/Makefile,v 1.14 2005/10/18 01:30:48 tgl Exp $
22

33
MODULE_big = seg
44
OBJS = seg.o segparse.o
@@ -8,6 +8,8 @@ REGRESS = seg
88

99
EXTRA_CLEAN = segparse.c segparse.h segscan.c y.tab.c y.tab.h
1010

11+
PG_CPPFLAGS = -I.
12+
1113
ifdefUSE_PGXS
1214
PGXS :=$(shell pg_config --pgxs)
1315
include$(PGXS)

‎contrib/tsearch2/ispell/Makefile‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
# $PostgreSQL: pgsql/contrib/tsearch2/ispell/Makefile,v 1.8 2005/09/27 17:13:11 tgl Exp $
1+
# $PostgreSQL: pgsql/contrib/tsearch2/ispell/Makefile,v 1.9 2005/10/18 01:30:48 tgl Exp $
22

3-
PG_CPPFLAGS = -I$(srcdir)/..
43
SUBOBJS = spell.o regis.o
4+
55
EXTRA_CLEAN = SUBSYS.o$(SUBOBJS)
66

7+
PG_CPPFLAGS = -I$(srcdir)/..
8+
79
ifdefUSE_PGXS
810
PGXS :=$(shell pg_config --pgxs)
911
include$(PGXS)
1012
else
11-
subdir = contrib/tsearch2
13+
subdir = contrib/tsearch2/ispell
1214
top_builddir = ../../..
1315
include$(top_builddir)/src/Makefile.global
1416
include$(top_srcdir)/contrib/contrib-global.mk

‎contrib/tsearch2/snowball/Makefile‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
# $PostgreSQL: pgsql/contrib/tsearch2/snowball/Makefile,v 1.7 2005/09/27 17:13:12 tgl Exp $
1+
# $PostgreSQL: pgsql/contrib/tsearch2/snowball/Makefile,v 1.8 2005/10/18 01:30:48 tgl Exp $
22

3-
4-
PG_CPPFLAGS = -I$(srcdir)/..
53
SUBOBJS = english_stem.o api.o russian_stem.o utilities.o
4+
65
EXTRA_CLEAN = SUBSYS.o$(SUBOBJS)
76

7+
PG_CPPFLAGS = -I$(srcdir)/..
8+
89
ifdefUSE_PGXS
910
PGXS :=$(shell pg_config --pgxs)
1011
include$(PGXS)
1112
else
12-
subdir = contrib/tsearch2
13+
subdir = contrib/tsearch2/snowball
1314
top_builddir = ../../..
1415
include$(top_builddir)/src/Makefile.global
1516
include$(top_srcdir)/contrib/contrib-global.mk

‎contrib/tsearch2/wordparser/Makefile‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
# $PostgreSQL: pgsql/contrib/tsearch2/wordparser/Makefile,v 1.7 2005/09/27 17:13:12 tgl Exp $
1+
# $PostgreSQL: pgsql/contrib/tsearch2/wordparser/Makefile,v 1.8 2005/10/18 01:30:49 tgl Exp $
22

3-
4-
PG_CPPFLAGS = -I$(srcdir)/..
53
SUBOBJS = parser.o deflex.o
4+
65
EXTRA_CLEAN = SUBSYS.o$(SUBOBJS) parser.c
76

7+
PG_CPPFLAGS = -I$(srcdir)/..
8+
89
ifdefUSE_PGXS
910
PGXS :=$(shell pg_config --pgxs)
1011
include$(PGXS)
1112
else
12-
subdir = contrib/tsearch2
13+
subdir = contrib/tsearch2/wordparser
1314
top_builddir = ../../..
1415
include$(top_builddir)/src/Makefile.global
1516
include$(top_srcdir)/contrib/contrib-global.mk

0 commit comments

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