cleanup for LINUX_ELF

diff --git a/src/Makefile.global b/src/Makefile.global
index 8886517..e20f50a 100644 (file)
--- a/src/Makefile.global
+++ b/src/Makefile.global
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.84 1997/01/08 08:30:21 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.85 1997/01/10 18:54:49 momjian Exp $
 #
 # NOTES
 #    Essentially all Postgres make files include this file and use the 
@@ -71,7 +71,7 @@ PORTNAME= UNDEFINED
 # Ignore LINUX_ELF if you're not using Linux.  But if you are, and you're
 # compiling to a.out (which means you're using the dld dynamic loading 
 # library), set LINUX_ELF to null in Makefile.custom.
-LINUX_ELF= 1
+LINUX_ELF= true
 
 LIBPQDIR:= $(SRCDIR)/libpq
 

diff --git a/src/backend/utils/fmgr/Makefile b/src/backend/utils/fmgr/Makefile
index 05baf3b..599e0a1 100644 (file)
--- a/src/backend/utils/fmgr/Makefile
+++ b/src/backend/utils/fmgr/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for utils/fmgr
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/fmgr/Makefile,v 1.2 1996/11/09 06:23:18 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/fmgr/Makefile,v 1.3 1997/01/10 18:55:00 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -20,9 +20,9 @@ CFLAGS+=$(INCLUDE_OPT)
 ifeq ($(PORTNAME), linux)
 # LINUX_ELF tells us to use the ELF dynamic load facilities that come with
 # Linux.
-ifdef LINUX_ELF
-CFLAGS+=-DLINUX_ELF
-endif
+  ifdef LINUX_ELF
+    CFLAGS+=-DLINUX_ELF
+  endif
 endif
 
 OBJS = dfmgr.o fmgr.o

diff --git a/src/interfaces/libpgtcl/Makefile b/src/interfaces/libpgtcl/Makefile
index c7d35a0..a9853c1 100644 (file)
--- a/src/interfaces/libpgtcl/Makefile
+++ b/src/interfaces/libpgtcl/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.7 1997/01/10 17:40:07 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.8 1997/01/10 18:55:14 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -25,8 +25,12 @@ ifdef KRBVERS
 CFLAGS+= $(KRBFLAGS)
 endif
 
-ifdef LINUX_ELF
-CFLAGS += -fPIC
+ifeq ($(PORTNAME), linux)
+  ifdef LINUX_ELF
+    ifeq ($(CC), gcc)
+      CFLAGS += -fpic -fPIC
+    endif
+  endif
 endif
 
 OBJS= pgtcl.o pgtclCmds.o pgtclId.o

diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile
index 96c1d9c..726b551 100644 (file)
--- a/src/interfaces/libpq/Makefile
+++ b/src/interfaces/libpq/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.25 1997/01/10 04:01:09 vadim Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.26 1997/01/10 18:55:24 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -32,16 +32,11 @@ OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-lobj.o \
 
 shlib := 
 install-shlib-dep :=
-ifdef LINUX_ELF
-install-shlib-dep := install-shlib
 ifeq ($(PORTNAME), linux)
-shlib := libpq.so.1
-endif
-ifeq ($(PORTNAME), BSD44_derived)
-shlib := libpq.so.1.0
-CFLAGS+= -fpic -DPIC
-LDFLAGS=-Bshareable -Bforcearchive
-endif
+  ifdef LINUX_ELF
+    install-shlib-dep := install-shlib
+    shlib := libpq.so.1
+  endif
 endif
 
 all: libpq.a $(shlib) c.h