From dc094b2338282dbbc86f9218ca26fc21257a8524 Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Tue, 20 Mar 2007 22:00:11 +0000 Subject: [PATCH] Solaris 10 Updates: Changed CXX_FLAGS to CFLAGS in a bunch of ext directories. --- ext/cvode/Makefile.in | 2 +- ext/f2c_blas/Makefile.in | 7 +++++-- ext/f2c_lapack/Makefile.in | 7 +++++-- ext/f2c_libs/Makefile.in | 2 +- ext/f2c_math/Makefile.in | 6 ++++-- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ext/cvode/Makefile.in b/ext/cvode/Makefile.in index b717058aa..b603db88d 100755 --- a/ext/cvode/Makefile.in +++ b/ext/cvode/Makefile.in @@ -25,7 +25,7 @@ all: @buildlib@/libcvode.a COMPILER = @CC@ -OPTS = -I../include @CXXFLAGS@ $(CXX_OPT) +OPTS = -I../include @CFLAGS@ $(CXX_OPT) OBJS = source/cvode.o source/cvdense.o source/dense.o source/cvband.o \ source/band.o source/cvdiag.o source/cvspgmr.o source/spgmr.o \ diff --git a/ext/f2c_blas/Makefile.in b/ext/f2c_blas/Makefile.in index a1912ad42..c4b2f3cb6 100755 --- a/ext/f2c_blas/Makefile.in +++ b/ext/f2c_blas/Makefile.in @@ -28,16 +28,19 @@ CC = @CC@ # C++ compile flags CXX_FLAGS = @CXXFLAGS@ $(CXX_OPT) +# C compile flags +CFLAGS = @CFLAGS@ + # Local include files CXX_INCLUDES=-I../f2c_libs # How to compile the dependency file .c.d: - @CXX_DEPENDS@ $(CXX_FLAGS) $(CXX_INCLUDES) $*.c > $*.d + @CXX_DEPENDS@ $(CFLAGS) $(CXX_INCLUDES) $*.c > $*.d # How to compile a C file .c.o: - @CC@ -c $< @DEFS@ $(CXX_FLAGS) $(CXX_INCLUDES) + @CC@ -c $< @DEFS@ $(CFLAGS) $(CXX_INCLUDES) # ----------------------------------------------- diff --git a/ext/f2c_lapack/Makefile.in b/ext/f2c_lapack/Makefile.in index d700f9c67..0b811073e 100755 --- a/ext/f2c_lapack/Makefile.in +++ b/ext/f2c_lapack/Makefile.in @@ -23,15 +23,18 @@ CC = @CC@ # C++ compile flags CXX_FLAGS = @CXXFLAGS@ +# C compile flags +CFLAGS = @CFLAGS@ + # Local include files CXX_INCLUDES=-I../f2c_libs # How to compile the dependency file .c.d: - @CXX_DEPENDS@ $(CXX_FLAGS) $(CXX_INCLUDES) $*.c > $*.d + @CXX_DEPENDS@ $(CFLAGS) $(CXX_INCLUDES) $*.c > $*.d .c.o: - @CC@ -c $< $(CXX_FLAGS) $(CXX_INCLUDES) + @CC@ -c $< $(CFLAGS) $(CXX_INCLUDES) # ----------------------------------------------- diff --git a/ext/f2c_libs/Makefile.in b/ext/f2c_libs/Makefile.in index 199f5d101..cbceb0263 100755 --- a/ext/f2c_libs/Makefile.in +++ b/ext/f2c_libs/Makefile.in @@ -26,7 +26,7 @@ SHELL = /bin/sh do_ranlib = @DO_RANLIB@ do_stripsymbols = @HAVE_STRIPSYMBOLS@ -CFLAGS = @CXXFLAGS@ $(CXX_OPT) +CFLAGS = @CFLAGS@ $(CXX_OPT) # Destination f2c lib located in Cantera's build directory # -> Calling it ctf2c diff --git a/ext/f2c_math/Makefile.in b/ext/f2c_math/Makefile.in index ea788a59e..a07df5fae 100644 --- a/ext/f2c_math/Makefile.in +++ b/ext/f2c_math/Makefile.in @@ -25,19 +25,21 @@ CC = @CC@ # C++ compile flags CXX_FLAGS = @CXXFLAGS@ $(CXX_OPT) +CFLAGS = @CFLAGS@ $(CXX_OPT) + # Local include files CXX_INCLUDES=-I../f2c_libs # How to compile the dependency file .c.d: - @CXX_DEPENDS@ $(CXX_FLAGS) $(CXX_INCLUDES) $*.c > $*.d + @CXX_DEPENDS@ $(CFLAGS) $(CXX_INCLUDES) $*.c > $*.d .cpp.d: @CXX_DEPENDS@ $(CXX_FLAGS) $(CXX_INCLUDES) $*.cpp > $*.d # How to compile a C file .c.o: - @CC@ -c $< @DEFS@ $(CXX_FLAGS) $(CXX_INCLUDES) + @CC@ -c $< @DEFS@ $(CFLAGS) $(CXX_INCLUDES) # How to compile a Cpp file .cpp.o: