diff --git a/contrib/cube/Makefile b/contrib/cube/Makefile index 9438dbb9336a5011d5663102836e3ee7e52fb382..f661952858ce4fe3a1839714e7fb7fc733056b80 100644 --- a/contrib/cube/Makefile +++ b/contrib/cube/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/cube/Makefile,v 1.18 2006/04/03 18:47:41 petere Exp $ +# $PostgreSQL: pgsql/contrib/cube/Makefile,v 1.19 2007/02/09 17:24:33 petere Exp $ MODULE_big = cube OBJS= cube.o cubeparse.o @@ -10,8 +10,6 @@ REGRESS = cube EXTRA_CLEAN = y.tab.c y.tab.h -PG_CPPFLAGS = -I. - SHLIB_LINK += $(filter -lm, $(LIBS)) ifdef USE_PGXS diff --git a/contrib/hstore/Makefile b/contrib/hstore/Makefile index b299e6c2666f288afdd1c7ecae571e143e807953..d15d2ae775a50ed6ba0385119cee05f6ce412039 100644 --- a/contrib/hstore/Makefile +++ b/contrib/hstore/Makefile @@ -1,12 +1,9 @@ -# $PostgreSQL: pgsql/contrib/hstore/Makefile,v 1.3 2007/02/09 17:04:00 petere Exp $ +# $PostgreSQL: pgsql/contrib/hstore/Makefile,v 1.4 2007/02/09 17:24:33 petere Exp $ subdir = contrib/hstore top_builddir = ../.. include $(top_builddir)/src/Makefile.global - -override CPPFLAGS := -I. $(CPPFLAGS) - MODULE_big = hstore OBJS = hstore_io.o hstore_op.o hstore_gist.o crc32.o diff --git a/contrib/pg_trgm/Makefile b/contrib/pg_trgm/Makefile index b710df99569901be7403526c66758bdab2428b31..15f9e2cc27f79e1712ef5709942ffd8b194b98d4 100644 --- a/contrib/pg_trgm/Makefile +++ b/contrib/pg_trgm/Makefile @@ -1,6 +1,4 @@ -# $PostgreSQL: pgsql/contrib/pg_trgm/Makefile,v 1.5 2007/02/09 17:04:00 petere Exp $ - -PG_CPPFLAGS = -I. +# $PostgreSQL: pgsql/contrib/pg_trgm/Makefile,v 1.6 2007/02/09 17:24:33 petere Exp $ MODULE_big = pg_trgm OBJS = trgm_op.o trgm_gist.o diff --git a/contrib/seg/Makefile b/contrib/seg/Makefile index a0ccb97ec5299ff3a721b3efd82a860e260aa9c4..e0e95cf9ee8a3ae076fc283fa351009cf5311a22 100644 --- a/contrib/seg/Makefile +++ b/contrib/seg/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/seg/Makefile,v 1.17 2006/04/03 18:47:41 petere Exp $ +# $PostgreSQL: pgsql/contrib/seg/Makefile,v 1.18 2007/02/09 17:24:33 petere Exp $ MODULE_big = seg OBJS = seg.o segparse.o @@ -9,8 +9,6 @@ REGRESS = seg EXTRA_CLEAN = y.tab.c y.tab.h -PG_CPPFLAGS = -I. - ifdef USE_PGXS PGXS := $(shell pg_config --pgxs) include $(PGXS)