diff options
| -rw-r--r-- | src/interfaces/libpgtcl/Makefile.in | 37 | ||||
| -rw-r--r-- | src/interfaces/libpq/Makefile.in | 69 |
2 files changed, 62 insertions, 44 deletions
diff --git a/src/interfaces/libpgtcl/Makefile.in b/src/interfaces/libpgtcl/Makefile.in index 705ff0b9e57..c2dc435ec5b 100644 --- a/src/interfaces/libpgtcl/Makefile.in +++ b/src/interfaces/libpgtcl/Makefile.in @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.20 1998/08/22 04:24:26 momjian Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.21 1998/09/10 04:59:00 momjian Exp $ # #------------------------------------------------------------------------- @@ -35,7 +35,7 @@ LIBPQ = -L$(SRCDIR)/interfaces/libpq -lpq ifeq ($(PORTNAME), linux) install-shlib-dep := install-shlib - shlib := libpgtcl.so.1 + shlib := libpgtcl.so.1 CFLAGS += $(CFLAGS_SL) LDFLAGS_SL = -shared endif @@ -51,40 +51,49 @@ endif ifeq ($(PORTNAME), bsdi) ifdef BSD_SHLIB - install-shlib-dep := install-shlib - shlib := libpgtcl.o - LD := shlicc - LDFLAGS_SL += -O -r - CFLAGS += $(CFLAGS_SL) + ifeq ($(LDSUFFIX), .so) + install-shlib-dep := install-shlib + shlib := libpgtcl.so + LD := shlicc + LDFLAGS_SL += -O -shared + CFLAGS += $(CFLAGS_SL) + endif + ifeq ($(LDSUFFIX), .o) + install-shlib-dep := install-shlib + shlib := libpgtcl.o + LD := shlicc + LDFLAGS_SL += -O -r + CFLAGS += $(CFLAGS_SL) + endif endif endif ifeq ($(PORTNAME), solaris) install-shlib-dep := install-shlib shlib := libpgtcl.so.1 - LDFLAGS_SL = -G -z text + LDFLAGS_SL := -G -z text CFLAGS += $(CFLAGS_SL) endif ifeq ($(PORTNAME), unixware) install-shlib-dep := install-shlib shlib := libpgtcl.so.1 - LDFLAGS_SL = -G -z text + LDFLAGS_SL := -G -z text CFLAGS += $(CFLAGS_SL) endif ifeq ($(PORTNAME), univel) install-shlib-dep := install-shlib shlib := libpgtcl.so.1 - LDFLAGS_SL = -G -z text + LDFLAGS_SL := -G -z text CFLAGS += $(CFLAGS_SL) endif ifeq ($(PORTNAME), hpux) - install-shlib-dep := install-shlib - shlib := libpgtcl.sl - LDFLAGS_SL = -b - CFLAGS += $(CFLAGS_SL) + install-shlib-dep := install-shlib + shlib := libpgtcl.sl + LDFLAGS_SL := -b + CFLAGS += $(CFLAGS_SL) endif OBJS= pgtcl.o pgtclCmds.o pgtclId.o diff --git a/src/interfaces/libpq/Makefile.in b/src/interfaces/libpq/Makefile.in index 11c37624731..220d7764d28 100644 --- a/src/interfaces/libpq/Makefile.in +++ b/src/interfaces/libpq/Makefile.in @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.27 1998/08/22 04:24:28 momjian Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.28 1998/09/10 04:59:01 momjian Exp $ # #------------------------------------------------------------------------- @@ -41,57 +41,66 @@ shlib := install-shlib-dep := ifeq ($(PORTNAME), linux) - install-shlib-dep := install-shlib - shlib := libpq.so.$(SO_MAJOR_VERSION) - LDFLAGS_SL = -shared -soname libpq.so.$(SO_MAJOR_VERSION) - CFLAGS += $(CFLAGS_SL) + install-shlib-dep := install-shlib + shlib := libpq.so.$(SO_MAJOR_VERSION) + LDFLAGS_SL := -shared -soname libpq.so.$(SO_MAJOR_VERSION) + CFLAGS += $(CFLAGS_SL) endif ifeq ($(PORTNAME), bsd) ifdef BSD_SHLIB - install-shlib-dep := install-shlib - shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) - LDFLAGS_SL = -x -Bshareable -Bforcearchive - CFLAGS += $(CFLAGS_SL) + install-shlib-dep := install-shlib + shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) + LDFLAGS_SL := -x -Bshareable -Bforcearchive + CFLAGS += $(CFLAGS_SL) endif endif ifeq ($(PORTNAME), bsdi) ifdef BSD_SHLIB - install-shlib-dep := install-shlib - shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) - LD=shlicc - LDFLAGS_SL = -r -O - CFLAGS += $(CFLAGS_SL) + ifeq ($(LDSUFFIX), .so) + install-shlib-dep := install-shlib + shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) + LD := shlicc + LDFLAGS_SL += -O -shared + CFLAGS += $(CFLAGS_SL) + endif + ifeq ($(LDSUFFIX), .o) + install-shlib-dep := install-shlib + shlib := libpq.o.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) + LD :=shlicc + LDFLAGS_SL += -O -r + CFLAGS += $(CFLAGS_SL) + endif endif endif ifeq ($(PORTNAME), solaris) - install-shlib-dep := install-shlib - shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) - LDFLAGS_SL = -G -z text - CFLAGS += $(CFLAGS_SL) + install-shlib-dep := install-shlib + shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) + LDFLAGS_SL := -G -z text + CFLAGS += $(CFLAGS_SL) endif ifeq ($(PORTNAME), unixware) - install-shlib-dep := install-shlib - shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) - LDFLAGS_SL = -G -z text - CFLAGS += $(CFLAGS_SL) + install-shlib-dep := install-shlib + shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) + LDFLAGS_SL := -G -z text + CFLAGS += $(CFLAGS_SL) endif ifeq ($(PORTNAME), univel) - install-shlib-dep := install-shlib - shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) - LDFLAGS_SL = -G -z text - CFLAGS += $(CFLAGS_SL) + install-shlib-dep := install-shlib + shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) + LDFLAGS_SL := -G -z text + CFLAGS += $(CFLAGS_SL) endif ifeq ($(PORTNAME), hpux) - install-shlib-dep := install-shlib - shlib := libpq.sl - LDFLAGS_SL = -b - CFLAGS += $(CFLAGS_SL) + install-shlib-dep := install-shlib + shlib := libpq.sl + LDFLAGS_SL := -b + CFLAGS += $(CFLAGS_SL) endif all: libpq.a $(shlib) |