summaryrefslogtreecommitdiff
path: root/src/makefiles
diff options
context:
space:
mode:
authorPeter Eisentraut2002-09-04 22:54:18 +0000
committerPeter Eisentraut2002-09-04 22:54:18 +0000
commite43ecb3d1a1c5af574fdd6333bdd64330a148bf6 (patch)
tree897b6c54db9c33efff536be673cc6d94fd490d54 /src/makefiles
parentbe475f92cd43ce0c66246cb488fb29b0a12f5674 (diff)
Remove leftovers from subproject removals. Fixes for Python and Kerberos
configuration.
Diffstat (limited to 'src/makefiles')
-rw-r--r--src/makefiles/Makefile.hpux5
-rw-r--r--src/makefiles/Makefile.qnx43
-rw-r--r--src/makefiles/Makefile.sco5
-rw-r--r--src/makefiles/Makefile.solaris7
-rw-r--r--src/makefiles/Makefile.sunos45
-rw-r--r--src/makefiles/Makefile.unixware5
6 files changed, 1 insertions, 29 deletions
diff --git a/src/makefiles/Makefile.hpux b/src/makefiles/Makefile.hpux
index cfdbee114b9..d1d18fb878f 100644
--- a/src/makefiles/Makefile.hpux
+++ b/src/makefiles/Makefile.hpux
@@ -42,11 +42,6 @@ CFLAGS_SL = -fPIC
else
CFLAGS_SL = +z
endif
-ifeq ($(GXX), yes)
-CXXFLAGS_SL = -fPIC
-else
-CXXFLAGS_SL = +z
-endif
# Rule for building shared libs (currently used only for regression test
# shlib ... should go away, since this is not really enough knowledge)
diff --git a/src/makefiles/Makefile.qnx4 b/src/makefiles/Makefile.qnx4
index 23364955ed2..de82e7f1ea5 100644
--- a/src/makefiles/Makefile.qnx4
+++ b/src/makefiles/Makefile.qnx4
@@ -13,7 +13,4 @@ CFLAGS_SL =
%$(DLSUFFIX): %.o
@echo 'cannot make shared object $@ from $<'
-override CXXFLAGS +=-I/usr/local/include/g++
-override CFLAGS +=-I/usr/local/include
-
sqlmansect = 7
diff --git a/src/makefiles/Makefile.sco b/src/makefiles/Makefile.sco
index 4cd2bcfe2f3..0d8a7c8b231 100644
--- a/src/makefiles/Makefile.sco
+++ b/src/makefiles/Makefile.sco
@@ -8,11 +8,6 @@ CFLAGS_SL = -fpic
else
CFLAGS_SL = -K PIC
endif
-ifeq ($(GXX), yes)
-CXXFLAGS_SL = -fpic
-else
-CXXFLAGS_SL = -K PIC
-endif
%.so: %.o
$(LD) -G -Bdynamic -o $@ $<
diff --git a/src/makefiles/Makefile.solaris b/src/makefiles/Makefile.solaris
index 3bc4f5a914f..eb7dbd79a34 100644
--- a/src/makefiles/Makefile.solaris
+++ b/src/makefiles/Makefile.solaris
@@ -1,4 +1,4 @@
-# $Header: /cvsroot/pgsql/src/makefiles/Makefile.solaris,v 1.8 2001/11/11 19:20:53 momjian Exp $
+# $Header: /cvsroot/pgsql/src/makefiles/Makefile.solaris,v 1.9 2002/09/04 22:54:18 petere Exp $
AROPT = crs
@@ -16,11 +16,6 @@ CFLAGS_SL = -fPIC
else
CFLAGS_SL = -KPIC
endif
-ifeq ($(GXX), yes)
-CXXFLAGS_SL = -fPIC
-else
-CXXFLAGS_SL = -KPIC
-endif
%.so: %.o
$(LD) -G -Bdynamic -o $@ $<
diff --git a/src/makefiles/Makefile.sunos4 b/src/makefiles/Makefile.sunos4
index f9e9fc63d90..d408dd3c462 100644
--- a/src/makefiles/Makefile.sunos4
+++ b/src/makefiles/Makefile.sunos4
@@ -6,11 +6,6 @@ CFLAGS_SL = -fpic
else
CFLAGS_SL = -PIC
endif
-ifeq ($(GXX), yes)
-CXXFLAGS_SL = -fPIC
-else
-CXXFLAGS_SL = -PIC
-endif
%.so: %.o
$(LD) -assert pure-text -Bdynamic -o $@ $<
diff --git a/src/makefiles/Makefile.unixware b/src/makefiles/Makefile.unixware
index 5722c46a177..9e4d715932a 100644
--- a/src/makefiles/Makefile.unixware
+++ b/src/makefiles/Makefile.unixware
@@ -20,11 +20,6 @@ CFLAGS_SL = -fpic
else
CFLAGS_SL = -K PIC
endif
-ifeq ($(GXX), yes)
-CXXFLAGS_SL = -fpic
-else
-CXXFLAGS_SL = -K PIC
-endif
ifeq ($(GCC), yes)
SO_FLAGS = -shared
else