diff options
| author | Peter Eisentraut | 2002-09-05 18:28:46 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2002-09-05 18:28:46 +0000 |
| commit | 337da0678ab3b0fe7e339cd35c6c50ad5441a534 (patch) | |
| tree | 62b6d649585ee864a16c1922736e4c8d66ebc54b /contrib | |
| parent | a11ea5e2a3bc47321eaff824b588c07a5974a729 (diff) | |
Assorted fixes for Cygwin:
Eliminate the mysterious games that the Cygwin build plays with the linker
flag variables. DLLLIBS is gone, use SHLIB_LINK like everyone else.
Detect cygipc in configure, after the linker flags are set up, otherwise
configure might not work at all.
Make sure everything is covered by make clean.
Fix the build of the new conversion procedure modules.
Add new DLLIMPORT markers where required.
Finally, the compiler complains if we use an explicit
-I/usr/local/include, so don't do that. Curiously, -L/usr/local/lib is
still necessary.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/contrib-global.mk | 6 | ||||
| -rw-r--r-- | contrib/rserv/Makefile | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/contrib/contrib-global.mk b/contrib/contrib-global.mk index 415cc273e77..61025aad428 100644 --- a/contrib/contrib-global.mk +++ b/contrib/contrib-global.mk @@ -1,4 +1,4 @@ -# $Header: /cvsroot/pgsql/contrib/contrib-global.mk,v 1.2 2001/09/16 16:11:08 petere Exp $ +# $Header: /cvsroot/pgsql/contrib/contrib-global.mk,v 1.3 2002/09/05 18:28:45 petere Exp $ # This file contains generic rules to build many kinds of simple # contrib modules. You only need to set a few variables and include @@ -45,7 +45,7 @@ override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) ifdef MODULES override CFLAGS += $(CFLAGS_SL) -override DLLLIBS := $(BE_DLLLIBS) $(DLLLIBS) +SHLIB_LINK += $(BE_DLLLIBS) endif ifdef PG_CPPFLAGS @@ -61,7 +61,7 @@ SO_MAJOR_VERSION= 0 SO_MINOR_VERSION= 0 rpath = -override DLLLIBS := $(BE_DLLLIBS) $(DLLLIBS) +SHLIB_LINK += $(BE_DLLLIBS) include $(top_srcdir)/src/Makefile.shlib diff --git a/contrib/rserv/Makefile b/contrib/rserv/Makefile index 27251197466..984a839415d 100644 --- a/contrib/rserv/Makefile +++ b/contrib/rserv/Makefile @@ -16,7 +16,7 @@ SCRIPTS = InitRservTest override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) override CFLAGS += $(CFLAGS_SL) -override DLLLIBS := $(BE_DLLLIBS) $(DLLLIBS) +SHLIB_LINK = $(BE_DLLLIBS) all: $(SQLS) $(TCLS) $(PERLS) $(SCRIPTS) $(SONAME) |