Attached is a patch to deal with the ones that I missed the first time
around. I tested this patch under Cygwin and Linux. Note that I only changed dblink's Makefile in the most minimal way to fix the link problem under Cygwin (i.e., use the link rule from Makefile.shlib instead). dblink's Makefile should probably be further patched to be consistent with the other PostgreSQL Makefiles. Jason Tishler
This commit is contained in:
parent
2e81f3d204
commit
7aac048b59
@ -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' < $< > $@
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user