diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2000-10-23 21:44:12 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2000-10-23 21:44:12 +0000 |
| commit | 7b021ce17c4abe731a3a4c6cb5e23f13d6fd3f52 (patch) | |
| tree | 6cb59b5918e05e9fc04f1a86931cec3cfbae11aa /src/interfaces | |
| parent | bc083d3d90dd26b755a60c74d561f9dab5897d5c (diff) | |
| download | postgresql-7b021ce17c4abe731a3a4c6cb5e23f13d6fd3f52.tar.gz postgresql-7b021ce17c4abe731a3a4c6cb5e23f13d6fd3f52.zip | |
Polish shared library build to reduce number of special hacks. In
particular, allow linking with arbitrary commands rather than only $(AR) or
$(LD), and treat C++ without hacks.
Add option to disable shared libraries. This takes the place of the
BSD_SHLIB variable. The regression test driver ignores the plpgsql test
if there are no shared libraries available.
Diffstat (limited to 'src/interfaces')
| -rw-r--r-- | src/interfaces/libpq++/Makefile | 27 | ||||
| -rw-r--r-- | src/interfaces/odbc/GNUmakefile | 6 |
2 files changed, 5 insertions, 28 deletions
diff --git a/src/interfaces/libpq++/Makefile b/src/interfaces/libpq++/Makefile index 1d5b82e174d..0cff4877609 100644 --- a/src/interfaces/libpq++/Makefile +++ b/src/interfaces/libpq++/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.26 2000/10/20 21:04:12 petere Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.27 2000/10/23 21:43:57 petere Exp $ # #------------------------------------------------------------------------- @@ -20,28 +20,10 @@ override CPPFLAGS += -I$(libpq_srcdir) OBJS = pgconnection.o pgdatabase.o pgtransdb.o pgcursordb.o pglobject.o -ifeq ($(PORTNAME), win) -SHLIB_LINK+= --driver-name g++ $(libpq) -else SHLIB_LINK= $(libpq) -endif -# For CC on IRIX, must use CC as linker/archiver of C++ libraries -ifeq ($(PORTNAME), irix5) - ifneq ($(GXX), yes) - AR := CC - AROPT := -ar -o - LD := CC - endif -endif -# Same for Solaris with native compiler -ifeq ($(PORTNAME), solaris) - ifneq ($(GXX), yes) - AR := CC - AROPT := -xar -o - LD := CC - endif -endif +# communicate with Makefile.shlib +cplusplus := yes all: all-lib @@ -49,9 +31,6 @@ all: all-lib # Shared library stuff include $(top_srcdir)/src/Makefile.shlib -# Pull shared-lib CFLAGS into CXXFLAGS -override CXXFLAGS+= $(CFLAGS_SL) - .PHONY: examples examples: diff --git a/src/interfaces/odbc/GNUmakefile b/src/interfaces/odbc/GNUmakefile index ab849fbbc7a..e24d9e26f54 100644 --- a/src/interfaces/odbc/GNUmakefile +++ b/src/interfaces/odbc/GNUmakefile @@ -2,7 +2,7 @@ # # GNUMakefile for psqlodbc (Postgres ODBC driver) # -# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.5 2000/10/20 21:04:13 petere Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.6 2000/10/23 21:43:58 petere Exp $ # #------------------------------------------------------------------------- @@ -23,15 +23,13 @@ OBJS = info.o bind.o columninfo.o connection.o convert.o drvconn.o \ pgtypes.o psqlodbc.o qresult.o results.o socket.o parse.o statement.o \ gpps.o tuple.o tuplelist.o dlg_specific.o $(OBJX) -SHLIB_LINK= $(LD_FLAGS) +SHLIB_LINK= -lm all: all-lib # Shared library stuff include $(top_srcdir)/src/Makefile.shlib -LDFLAGS_SL+= $(LDFLAGS_ODBC) - odbc_headers = isql.h isqlext.h iodbc.h odbc_includedir = $(includedir)/iodbc |