Respect CC, CXX, CFLAGS and CXXFLAGS

This commit is contained in:
Kris Kennaway 2001-04-30 01:57:59 +00:00
parent 605271bb09
commit 8b3d4249c7
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=42060

View file

@ -1,5 +1,5 @@
--- Makefile.orig Sat Oct 10 00:15:02 1998
+++ Makefile Mon Jan 31 14:38:24 2000
--- Makefile.orig Sat Oct 10 04:15:02 1998
+++ Makefile Mon Apr 30 01:06:08 2001
@@ -1,11 +1,12 @@
# Copyright (c) 1994, 1995 James Clark
# See the file COPYING for copying permission.
@ -15,15 +15,34 @@
# You might want to uncomment this on BSD systems
#INSTALL=install
@@ -33,7 +34,7 @@
@@ -13,7 +14,7 @@
# you must use -fno-implicit-templates
# and -O (or any optimization level >= 1).
# c++ is a front-end for gcc which takes care of linking with -lstdc++
-CXX=c++ -fno-implicit-templates -O2
+CXX+=-fno-implicit-templates
WARN=#-Wall -Wno-reorder -Wwrite-strings -Wpointer-arith -Wnested-externs -Woverloaded-virtual -Wbad-function-cast
# Executables will be *very* large if you use -g.
DEBUG=
@@ -33,14 +34,14 @@
# Add -Dsig_atomic_t=int on SunOS 4.1.x with g++ (or any other platform
# which doesn't appropriately define sig_atomic_t).
# Add -DJADE_MIF to include the Jade MIF backend
-XDEFINES=
+XDEFINES=-DSGML_CATALOG_FILES_DEFAULT=\"/usr/local/share/sgml/catalog\"
DEFINES=-DSP_HAVE_BOOL -DSP_ANSI_CLASS_INST -DSP_MULTI_BYTE $(XDEFINES)
CXXFLAGS=-ansi $(DEBUG) $(WARN)
-CXXFLAGS=-ansi $(DEBUG) $(WARN)
+CXXFLAGS+=-ansi $(DEBUG) $(WARN)
# Flag to pass to CXX to make it output list of dependencies as a Makefile.
CXXDEPGENFLAGS=-MM
LDFLAGS=
-CC=gcc
-CFLAGS=-O $(DEBUG)
+#CC=gcc
+CFLAGS+=$(DEBUG)
# Missing library functions
# Uncomment these if your C++ system doesn't provide them.
LIBOBJS=#strerror.o memmove.o
@@ -48,14 +49,14 @@
# If you defined SP_HAVE_SOCKET, add any libraries that are needed for sockets
# -lsocket -lnsl needed on Solaris 2.x