database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-25 21:42:33 +03:00
Code

Fix several contrib makefiles that failed in VPATH builds, particularly

Browse Source 
when not using gcc (which has slightly nonstandard inclusion rules).
This commit is contained in:
Tom Lane 2005-10-18 01:30:49 +00:00
parent 23836fb1fb
commit c62b29a603
5 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/cube/Makefile
View File

@ -1,4 +1,4 @@
# $PostgreSQL: pgsql/contrib/cube/Makefile,v 1.14 2005/09/27 17:13:00 tgl Exp $ # $PostgreSQL: pgsql/contrib/cube/Makefile,v 1.15 2005/10/18 01:30:48 tgl Exp $
MODULE_big = cube MODULE_big = cube
OBJS= cube.o cubeparse.o OBJS= cube.o cubeparse.o
@ -9,6 +9,8 @@ REGRESS = cube
EXTRA_CLEAN = cubeparse.c cubeparse.h cubescan.c y.tab.c y.tab.h EXTRA_CLEAN = cubeparse.c cubeparse.h cubescan.c y.tab.c y.tab.h
PG_CPPFLAGS = -I.
SHLIB_LINK += $(filter -lm, $(LIBS)) SHLIB_LINK += $(filter -lm, $(LIBS))
ifdef USE_PGXS ifdef USE_PGXS

4
contrib/seg/Makefile
View File

@ -1,4 +1,4 @@
# $PostgreSQL: pgsql/contrib/seg/Makefile,v 1.13 2005/09/27 17:13:09 tgl Exp $ # $PostgreSQL: pgsql/contrib/seg/Makefile,v 1.14 2005/10/18 01:30:48 tgl Exp $
MODULE_big = seg MODULE_big = seg
OBJS = seg.o segparse.o OBJS = seg.o segparse.o
@ -8,6 +8,8 @@ REGRESS = seg
EXTRA_CLEAN = segparse.c segparse.h segscan.c y.tab.c y.tab.h EXTRA_CLEAN = segparse.c segparse.h segscan.c y.tab.c y.tab.h
PG_CPPFLAGS = -I.
ifdef USE_PGXS ifdef USE_PGXS
PGXS := $(shell pg_config --pgxs) PGXS := $(shell pg_config --pgxs)
include $(PGXS) include $(PGXS)

10
contrib/tsearch2/ispell/Makefile
View File

@ -1,14 +1,16 @@
# $PostgreSQL: pgsql/contrib/tsearch2/ispell/Makefile,v 1.8 2005/09/27 17:13:11 tgl Exp $ # $PostgreSQL: pgsql/contrib/tsearch2/ispell/Makefile,v 1.9 2005/10/18 01:30:48 tgl Exp $
SUBOBJS = spell.o regis.o
EXTRA_CLEAN = SUBSYS.o $(SUBOBJS)
PG_CPPFLAGS = -I$(srcdir)/.. PG_CPPFLAGS = -I$(srcdir)/..
SUBOBJS = spell.o regis.o
EXTRA_CLEAN = SUBSYS.o $(SUBOBJS)
ifdef USE_PGXS ifdef USE_PGXS
PGXS := $(shell pg_config --pgxs) PGXS := $(shell pg_config --pgxs)
include $(PGXS) include $(PGXS)
else else
subdir = contrib/tsearch2 subdir = contrib/tsearch2/ispell
top_builddir = ../../.. top_builddir = ../../..
include $(top_builddir)/src/Makefile.global include $(top_builddir)/src/Makefile.global
include $(top_srcdir)/contrib/contrib-global.mk include $(top_srcdir)/contrib/contrib-global.mk

9
contrib/tsearch2/snowball/Makefile
View File

@ -1,15 +1,16 @@
# $PostgreSQL: pgsql/contrib/tsearch2/snowball/Makefile,v 1.7 2005/09/27 17:13:12 tgl Exp $ # $PostgreSQL: pgsql/contrib/tsearch2/snowball/Makefile,v 1.8 2005/10/18 01:30:48 tgl Exp $
SUBOBJS = english_stem.o api.o russian_stem.o utilities.o
EXTRA_CLEAN = SUBSYS.o $(SUBOBJS)
PG_CPPFLAGS = -I$(srcdir)/.. PG_CPPFLAGS = -I$(srcdir)/..
SUBOBJS = english_stem.o api.o russian_stem.o utilities.o
EXTRA_CLEAN = SUBSYS.o $(SUBOBJS)
ifdef USE_PGXS ifdef USE_PGXS
PGXS := $(shell pg_config --pgxs) PGXS := $(shell pg_config --pgxs)
include $(PGXS) include $(PGXS)
else else
subdir = contrib/tsearch2 subdir = contrib/tsearch2/snowball
top_builddir = ../../.. top_builddir = ../../..
include $(top_builddir)/src/Makefile.global include $(top_builddir)/src/Makefile.global
include $(top_srcdir)/contrib/contrib-global.mk include $(top_srcdir)/contrib/contrib-global.mk

9
contrib/tsearch2/wordparser/Makefile
View File

@ -1,15 +1,16 @@
# $PostgreSQL: pgsql/contrib/tsearch2/wordparser/Makefile,v 1.7 2005/09/27 17:13:12 tgl Exp $ # $PostgreSQL: pgsql/contrib/tsearch2/wordparser/Makefile,v 1.8 2005/10/18 01:30:49 tgl Exp $
SUBOBJS = parser.o deflex.o
EXTRA_CLEAN = SUBSYS.o $(SUBOBJS) parser.c
PG_CPPFLAGS = -I$(srcdir)/.. PG_CPPFLAGS = -I$(srcdir)/..
SUBOBJS = parser.o deflex.o
EXTRA_CLEAN = SUBSYS.o $(SUBOBJS) parser.c
ifdef USE_PGXS ifdef USE_PGXS
PGXS := $(shell pg_config --pgxs) PGXS := $(shell pg_config --pgxs)
include $(PGXS) include $(PGXS)
else else
subdir = contrib/tsearch2 subdir = contrib/tsearch2/wordparser
top_builddir = ../../.. top_builddir = ../../..
include $(top_builddir)/src/Makefile.global include $(top_builddir)/src/Makefile.global
include $(top_srcdir)/contrib/contrib-global.mk include $(top_srcdir)/contrib/contrib-global.mk