1
0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00

Fix a few single-file (MODULES, not MODULE_big) contrib makefiles that were

supposing that they should set SHLIB_LINK rather than LDFLAGS_SL.  Since these
don't go through Makefile.shlib that was a no-op on most platforms.  Also
regularize the few platform-specific Makefiles that did pay attention to
SHLIB_LINK: it seems that the real value of that is to pull in BE_DLLLIBS,
so do that instead.  Per buildfarm failures on cygwin.
This commit is contained in:
Tom Lane
2010-07-05 23:15:56 +00:00
parent 291a957745
commit f9e9da6664
7 changed files with 13 additions and 13 deletions

View File

@ -1,11 +1,11 @@
# $PostgreSQL: pgsql/contrib/earthdistance/Makefile,v 1.19 2007/11/10 23:59:50 momjian Exp $
# $PostgreSQL: pgsql/contrib/earthdistance/Makefile,v 1.20 2010/07/05 23:15:55 tgl Exp $
MODULES = earthdistance
DATA_built = earthdistance.sql
DATA = uninstall_earthdistance.sql
REGRESS = earthdistance
SHLIB_LINK += $(filter -lm, $(LIBS))
LDFLAGS_SL += $(filter -lm, $(LIBS))
ifdef USE_PGXS
PG_CONFIG = pg_config

View File

@ -1,4 +1,4 @@
# $PostgreSQL: pgsql/contrib/spi/Makefile,v 1.28 2007/12/03 04:22:54 tgl Exp $
# $PostgreSQL: pgsql/contrib/spi/Makefile,v 1.29 2010/07/05 23:15:56 tgl Exp $
MODULES = autoinc insert_username moddatetime refint timetravel
DATA_built = $(addsuffix .sql, $(MODULES))
@ -8,6 +8,8 @@ DOCS = $(addsuffix .example, $(MODULES))
# comment out if you want a quieter refint package for other uses
PG_CPPFLAGS = -DREFINT_VERBOSE
LDFLAGS_SL += -L$(top_builddir)/src/port -lpgport
ifdef USE_PGXS
PG_CONFIG = pg_config
PGXS := $(shell $(PG_CONFIG) --pgxs)
@ -18,5 +20,3 @@ top_builddir = ../..
include $(top_builddir)/src/Makefile.global
include $(top_srcdir)/contrib/contrib-global.mk
endif
SHLIB_LINK += -L$(top_builddir)/src/port -lpgport

View File

@ -1,11 +1,11 @@
# $PostgreSQL: pgsql/contrib/tablefunc/Makefile,v 1.9 2007/11/10 23:59:51 momjian Exp $
# $PostgreSQL: pgsql/contrib/tablefunc/Makefile,v 1.10 2010/07/05 23:15:56 tgl Exp $
MODULES = tablefunc
DATA_built = tablefunc.sql
DATA = uninstall_tablefunc.sql
REGRESS = tablefunc
SHLIB_LINK += $(filter -lm, $(LIBS))
LDFLAGS_SL += $(filter -lm, $(LIBS))
ifdef USE_PGXS
PG_CONFIG = pg_config