From f9e9da666423f38d9c0f97277cf4e21973608baf Mon Sep 17 00:00:00 2001
From: Tom Lane
Date: Mon, 5 Jul 2010 23:15:56 +0000
Subject: 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.

---
 src/makefiles/Makefile.aix    | 2 +-
 src/makefiles/Makefile.cygwin | 4 ++--
 src/makefiles/Makefile.darwin | 2 +-
 src/makefiles/Makefile.win32  | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/makefiles/Makefile.aix b/src/makefiles/Makefile.aix
index 6f5715db151..1ea7afc28d9 100644
--- a/src/makefiles/Makefile.aix
+++ b/src/makefiles/Makefile.aix
@@ -39,4 +39,4 @@ MKLDEXPORT=$(top_srcdir)/src/backend/port/aix/mkldexport.sh
 
 # Rule for building a shared library from a single .o file
 %$(DLSUFFIX): %.o %.exp
-	$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -o $@ $*.o -Wl,-bE:$*.exp $(SHLIB_LINK)
+	$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -o $@ $*.o -Wl,-bE:$*.exp $(BE_DLLLIBS)
diff --git a/src/makefiles/Makefile.cygwin b/src/makefiles/Makefile.cygwin
index 2c0f87cd53d..1a5bdc85cd8 100644
--- a/src/makefiles/Makefile.cygwin
+++ b/src/makefiles/Makefile.cygwin
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/src/makefiles/Makefile.cygwin,v 1.14 2010/07/05 18:54:38 tgl Exp $
+# $PostgreSQL: pgsql/src/makefiles/Makefile.cygwin,v 1.15 2010/07/05 23:15:56 tgl Exp $
 DLLTOOL= dlltool
 DLLWRAP= dllwrap
 ifdef PGXS
@@ -41,5 +41,5 @@ endif
 # Rule for building a shared library from a single .o file
 %.dll: %.o
 	$(DLLTOOL) --export-all --output-def $*.def $<
-	$(DLLWRAP) -o $@ --def $*.def $< $(SHLIB_LINK)
+	$(DLLWRAP) -o $@ --def $*.def $< $(LDFLAGS) $(LDFLAGS_SL) $(BE_DLLLIBS)
 	rm -f $*.def
diff --git a/src/makefiles/Makefile.darwin b/src/makefiles/Makefile.darwin
index 2f6743ab14e..4fa4954b362 100644
--- a/src/makefiles/Makefile.darwin
+++ b/src/makefiles/Makefile.darwin
@@ -10,4 +10,4 @@ endif
 
 # Rule for building a shared library from a single .o file
 %.so: %.o
-	$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -bundle -o $@ $< $(BE_DLLLIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -bundle $(BE_DLLLIBS) -o $@ $<
diff --git a/src/makefiles/Makefile.win32 b/src/makefiles/Makefile.win32
index 09aa523ba6a..e6466304d46 100644
--- a/src/makefiles/Makefile.win32
+++ b/src/makefiles/Makefile.win32
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/src/makefiles/Makefile.win32,v 1.16 2010/07/05 18:54:38 tgl Exp $
+# $PostgreSQL: pgsql/src/makefiles/Makefile.win32,v 1.17 2010/07/05 23:15:56 tgl Exp $
 
 # Use replacement include files for those missing on Win32
 override CPPFLAGS+="-I$(top_srcdir)/src/include/port/win32"
@@ -69,5 +69,5 @@ win32ver.o: win32ver.rc
 # Rule for building a shared library from a single .o file
 %.dll: %.o
 	$(DLLTOOL) --export-all --output-def $*.def $<
-	$(DLLWRAP) -o $@ --def $*.def $< $(SHLIB_LINK)
+	$(DLLWRAP) -o $@ --def $*.def $< $(LDFLAGS) $(LDFLAGS_SL) $(BE_DLLLIBS)
 	rm -f $*.def
-- 
cgit v1.2.3