diff options
| author | Tom Lane | 2010-07-05 23:15:56 +0000 |
|---|---|---|
| committer | Tom Lane | 2010-07-05 23:15:56 +0000 |
| commit | f9e9da666423f38d9c0f97277cf4e21973608baf (patch) | |
| tree | 31ca431a9ed6a347619c80f5364b6ee9df8ad779 /contrib | |
| parent | 291a9577454a63f99b5537e48a3dceae6d35ea8d (diff) | |
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.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/earthdistance/Makefile | 4 | ||||
| -rw-r--r-- | contrib/spi/Makefile | 6 | ||||
| -rw-r--r-- | contrib/tablefunc/Makefile | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/contrib/earthdistance/Makefile b/contrib/earthdistance/Makefile index 64cc40fedc..ab72ac7fc9 100644 --- a/contrib/earthdistance/Makefile +++ b/contrib/earthdistance/Makefile @@ -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 diff --git a/contrib/spi/Makefile b/contrib/spi/Makefile index ed7d551c70..7a078a9b0e 100644 --- a/contrib/spi/Makefile +++ b/contrib/spi/Makefile @@ -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 diff --git a/contrib/tablefunc/Makefile b/contrib/tablefunc/Makefile index 94aa740d18..1207c62ef7 100644 --- a/contrib/tablefunc/Makefile +++ b/contrib/tablefunc/Makefile @@ -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 |