aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contrib/dblink/Makefile8
-rw-r--r--contrib/metaphone/Makefile3
-rw-r--r--contrib/rtree_gist/Makefile3
3 files changed, 8 insertions, 6 deletions
diff --git a/contrib/dblink/Makefile b/contrib/dblink/Makefile
index 71e34b8c337..86e65ebc6b8 100644
--- a/contrib/dblink/Makefile
+++ b/contrib/dblink/Makefile
@@ -1,7 +1,6 @@
subdir = contrib/dblink
top_builddir = ../..
include $(top_builddir)/src/Makefile.global
-include $(top_builddir)/src/Makefile.shlib
include_srcdir = $(top_builddir)/src/include
@@ -16,14 +15,15 @@ override DLLLIBS := $(BE_DLLLIBS) $(DLLLIBS)
OBJS = $(NAME).o
+SHLIB_LINK= $(libpq)
+
all: $(OBJS) $(SONAME) $(NAME).sql
+include $(top_builddir)/src/Makefile.shlib
+
$(OBJS): $(NAME).c
$(CC) -o $@ -c $(CFLAGS) $<
-$(SONAME): $(OBJS)
- $(LD) -o $@ -Bshareable $(libpq) $<
-
$(NAME).sql: $(NAME).sql.in
sed -e 's:MODULE_PATHNAME:$(libdir)/contrib/$(SONAME):g' < $< > $@
diff --git a/contrib/metaphone/Makefile b/contrib/metaphone/Makefile
index 6212401dc87..cc1696ae014 100644
--- a/contrib/metaphone/Makefile
+++ b/contrib/metaphone/Makefile
@@ -1,5 +1,5 @@
#
-# $Header: /cvsroot/pgsql/contrib/metaphone/Attic/Makefile,v 1.1 2001/05/09 23:00:44 momjian Exp $
+# $Header: /cvsroot/pgsql/contrib/metaphone/Attic/Makefile,v 1.2 2001/06/20 00:04:44 momjian Exp $
#
subdir = contrib/metaphone
@@ -11,6 +11,7 @@ SONAME := $(NAME)$(DLSUFFIX)
override CPPFLAGS += -I$(srcdir)
override CFLAGS += $(CFLAGS_SL)
+override DLLLIBS := $(BE_DLLLIBS) $(DLLLIBS)
all: $(SONAME) $(NAME).sql
diff --git a/contrib/rtree_gist/Makefile b/contrib/rtree_gist/Makefile
index 2699ec58498..ef61277d744 100644
--- a/contrib/rtree_gist/Makefile
+++ b/contrib/rtree_gist/Makefile
@@ -1,5 +1,5 @@
#
-# $Header: /cvsroot/pgsql/contrib/rtree_gist/Attic/Makefile,v 1.1 2001/05/31 18:27:18 tgl Exp $
+# $Header: /cvsroot/pgsql/contrib/rtree_gist/Attic/Makefile,v 1.2 2001/06/20 00:04:44 momjian Exp $
#
subdir = contrib/rtree_gist
@@ -15,6 +15,7 @@ SO_MAJOR_VERSION= 1
SO_MINOR_VERSION= 0
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
+override DLLLIBS := $(BE_DLLLIBS) $(DLLLIBS)
OBJS= rtree_gist.o