Index: dblink/Makefile
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/contrib/dblink/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- dblink/Makefile	2001/06/18 21:38:01	1.2
+++ dblink/Makefile	2001/06/19 15:22:43
@@ -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,13 +15,14 @@ override DLLLIBS := $(BE_DLLLIBS) $(DLLL
 
 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' < $< > $@
Index: metaphone/Makefile
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/contrib/metaphone/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- metaphone/Makefile	2001/05/09 23:00:44	1.1
+++ metaphone/Makefile	2001/06/19 15:22:46
@@ -11,6 +11,7 @@ SONAME	:= $(NAME)$(DLSUFFIX)
 
 override CPPFLAGS += -I$(srcdir)
 override CFLAGS += $(CFLAGS_SL)
+override DLLLIBS := $(BE_DLLLIBS) $(DLLLIBS)
 
 all: $(SONAME) $(NAME).sql
 
Index: rtree_gist/Makefile
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/contrib/rtree_gist/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- rtree_gist/Makefile	2001/05/31 18:27:18	1.1
+++ rtree_gist/Makefile	2001/06/19 15:22:48
@@ -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