summaryrefslogtreecommitdiff
path: root/src/Makefile.global.in
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/Makefile.global.in
parentbe475f92cd43ce0c66246cb488fb29b0a12f5674 (diff)
Remove leftovers from subproject removals. Fixes for Python and Kerberos
configuration.
Diffstat (limited to 'src/Makefile.global.in')
-rw-r--r--src/Makefile.global.in26
1 files changed, 1 insertions, 25 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 5f73c93f3b..e0fd91dc92 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -1,5 +1,5 @@
# -*-makefile-*-
-# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.154 2002/09/03 21:45:41 petere Exp $
+# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.155 2002/09/04 22:54:18 petere Exp $
#------------------------------------------------------------------------------
# All PostgreSQL makefiles include this file and use the variables it sets,
@@ -121,7 +121,6 @@ localedir := @localedir@
#
# Records the choice of the various --enable-xxx and --with-xxx options.
-with_CXX = @with_CXX@
with_java = @with_java@
with_perl = @with_perl@
with_python = @with_python@
@@ -177,13 +176,6 @@ ifeq ($(GCC), yes)
CFLAGS += -Wall -Wmissing-prototypes -Wmissing-declarations
endif
-CXX = @CXX@
-GXX = @GXX@
-CXXFLAGS = @CXXFLAGS@
-ifeq ($(GXX), yes)
- CXXFLAGS += -Wall
-endif
-
# Kind-of compilers
YACC = @YACC@
@@ -207,13 +199,10 @@ X = @EXEEXT@
# Perl
PERL = @PERL@
-perl_installsitearch = @perl_installsitearch@
-perl_installman3dir = @perl_installman3dir@
perl_archlibexp = @perl_archlibexp@
perl_privlibexp = @perl_privlibexp@
perl_useshrplib = @perl_useshrplib@
perl_embed_ldflags = @perl_embed_ldflags@
-perl_man3ext = @perl_man3ext@
# Miscellaneous
@@ -224,7 +213,6 @@ MSGFMT = @MSGFMT@
MSGMERGE = @MSGMERGE@
PYTHON = @PYTHON@
TAR = @TAR@
-WISH = @WISH@
XGETTEXT = @XGETTEXT@
GZIP = gzip
@@ -436,10 +424,6 @@ ifndef COMPILE.c
COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) -c
endif
-ifndef COMPILE.cc
-COMPILE.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c
-endif
-
DEPDIR = .deps
df = $(DEPDIR)/$(*F)
@@ -462,14 +446,6 @@ ifeq ($(GCC), yes)
endif # GCC
-ifeq ($(GXX), yes)
-
-%.o : %.cc
- $(COMPILE.cc) -o $@ $< -MMD
- $(postprocess-depend)
-
-endif # GXX
-
# Include all the dependency files generated for the current
# directory. List /dev/null as dummy because if the wildcard expands
# to nothing then make would complain.