Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit7aac048

Browse files
committed
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 wayto fix the link problem under Cygwin (i.e., use the link rule fromMakefile.shlib instead). dblink's Makefile should probably be furtherpatched to be consistent with the other PostgreSQL Makefiles.Jason Tishler
1 parent2e81f3d commit7aac048

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

‎contrib/dblink/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
subdir = contrib/dblink
22
top_builddir = ../..
33
include$(top_builddir)/src/Makefile.global
4-
include$(top_builddir)/src/Makefile.shlib
54
include_srcdir =$(top_builddir)/src/include
65

76

@@ -16,14 +15,15 @@ override DLLLIBS := $(BE_DLLLIBS) $(DLLLIBS)
1615

1716
OBJS=$(NAME).o
1817

18+
SHLIB_LINK=$(libpq)
19+
1920
all:$(OBJS)$(SONAME)$(NAME).sql
2021

22+
include$(top_builddir)/src/Makefile.shlib
23+
2124
$(OBJS):$(NAME).c
2225
$(CC) -o$@ -c$(CFLAGS)$<
2326

24-
$(SONAME):$(OBJS)
25-
$(LD) -o$@ -Bshareable$(libpq)$<
26-
2727
$(NAME).sql:$(NAME).sql.in
2828
sed -e's:MODULE_PATHNAME:$(libdir)/contrib/$(SONAME):g'<$<>$@
2929

‎contrib/metaphone/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/metaphone/Attic/Makefile,v 1.1 2001/05/09 23:00:44 momjian Exp $
2+
# $Header: /cvsroot/pgsql/contrib/metaphone/Attic/Makefile,v 1.2 2001/06/20 00:04:44 momjian Exp $
33
#
44

55
subdir = contrib/metaphone
@@ -11,6 +11,7 @@ SONAME:= $(NAME)$(DLSUFFIX)
1111

1212
overrideCPPFLAGS += -I$(srcdir)
1313
overrideCFLAGS +=$(CFLAGS_SL)
14+
overrideDLLLIBS :=$(BE_DLLLIBS)$(DLLLIBS)
1415

1516
all:$(SONAME)$(NAME).sql
1617

‎contrib/rtree_gist/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# $Header: /cvsroot/pgsql/contrib/rtree_gist/Attic/Makefile,v 1.1 2001/05/31 18:27:18 tgl Exp $
2+
# $Header: /cvsroot/pgsql/contrib/rtree_gist/Attic/Makefile,v 1.2 2001/06/20 00:04:44 momjian Exp $
33
#
44

55
subdir = contrib/rtree_gist
@@ -15,6 +15,7 @@ SO_MAJOR_VERSION= 1
1515
SO_MINOR_VERSION= 0
1616

1717
overrideCPPFLAGS := -I$(srcdir)$(CPPFLAGS)
18+
overrideDLLLIBS :=$(BE_DLLLIBS)$(DLLLIBS)
1819

1920
OBJS= rtree_gist.o
2021

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp