diff options
| author | Bruce Momjian <bruce@momjian.us> | 2004-10-04 20:36:12 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2004-10-04 20:36:12 +0000 |
| commit | ee7de3d66296513d50b6df1166f6fc84e2b9b5fe (patch) | |
| tree | 2de9ad5ec172699d00c7287e69f324484a6b6a5f /src/interfaces | |
| parent | 2e8252d67a82822e42e1fdee2dfe8a83ad3ac551 (diff) | |
Make sure no libs use libpgport by removing it from the link line.
Diffstat (limited to 'src/interfaces')
| -rw-r--r-- | src/interfaces/ecpg/ecpglib/Makefile | 5 | ||||
| -rw-r--r-- | src/interfaces/ecpg/pgtypeslib/Makefile | 5 | ||||
| -rw-r--r-- | src/interfaces/libpq/Makefile | 7 |
3 files changed, 13 insertions, 4 deletions
diff --git a/src/interfaces/ecpg/ecpglib/Makefile b/src/interfaces/ecpg/ecpglib/Makefile index 004bca7f742..e8bb4d983db 100644 --- a/src/interfaces/ecpg/ecpglib/Makefile +++ b/src/interfaces/ecpg/ecpglib/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.25 2004/07/13 00:06:41 tgl Exp $ +# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.26 2004/10/04 20:36:11 momjian Exp $ # #------------------------------------------------------------------------- @@ -21,6 +21,9 @@ override CPPFLAGS := -DFRONTEND -I$(top_srcdir)/src/interfaces/ecpg/include \ -I$(libpq_srcdir) -I$(top_builddir)/src/port $(CPPFLAGS) override CFLAGS += $(PTHREAD_CFLAGS) +# Need to recomple any libpgport object files +LIBS := $(patsubst -lpgport,, $(LIBS)) + OBJS= execute.o typename.o descriptor.o data.o error.o prepare.o memory.o \ connect.o misc.o path.o exec.o diff --git a/src/interfaces/ecpg/pgtypeslib/Makefile b/src/interfaces/ecpg/pgtypeslib/Makefile index 165b0346f7b..545bbc4949c 100644 --- a/src/interfaces/ecpg/pgtypeslib/Makefile +++ b/src/interfaces/ecpg/pgtypeslib/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/Makefile,v 1.22 2004/07/13 00:06:43 tgl Exp $ +# $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/Makefile,v 1.23 2004/10/04 20:36:12 momjian Exp $ # #------------------------------------------------------------------------- @@ -21,6 +21,9 @@ override CPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include \ -I$(top_srcdir)/src/include/utils -I$(libpq_srcdir) $(CPPFLAGS) \ $(PTHREAD_CFLAGS) -DFRONTEND +# Need to recomple any libpgport object files +LIBS := $(patsubst -lpgport,, $(LIBS)) + SHLIB_LINK += -lm OBJS= numeric.o datetime.o common.o dt_common.o timestamp.o interval.o \ diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile index d65b4775a0d..b0a90b010c7 100644 --- a/src/interfaces/libpq/Makefile +++ b/src/interfaces/libpq/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.113 2004/09/26 02:14:47 momjian Exp $ +# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.114 2004/10/04 20:36:12 momjian Exp $ # #------------------------------------------------------------------------- @@ -19,9 +19,12 @@ SO_MAJOR_VERSION= 3 SO_MINOR_VERSION= 2 DLTYPE= library -override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) -I$(top_builddir)/src/port -DFRONTEND +override CPPFLAGS := -DFRONTEND -I$(srcdir) $(CPPFLAGS) -I$(top_builddir)/src/port override CFLAGS += $(PTHREAD_CFLAGS) +# Need to recomple any libpgport object files +LIBS := $(patsubst -lpgport,, $(LIBS)) + OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \ fe-protocol2.o fe-protocol3.o pqexpbuffer.o pqsignal.o fe-secure.o \ dllist.o md5.o ip.o wchar.o encnames.o noblock.o pgstrcasecmp.o thread.o \ |