From ea754c64808205efb85678c0a8686d8169ed8740 Mon Sep 17 00:00:00 2001
From: astrojhgu <astrojhgu@ed2142bd-67ad-457f-ba7c-d818d4011675>
Date: Thu, 30 Apr 2009 06:19:55 +0000
Subject: git-svn-id: file:///home/svn/opt_utilities@36
 ed2142bd-67ad-457f-ba7c-d818d4011675

---
 makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'makefile')

diff --git a/makefile b/makefile
index d574675..71e6681 100644
--- a/makefile
+++ b/makefile
@@ -18,8 +18,8 @@ LDL=-ldl
 export AR = ar rv
 export RANLIB = ranlib
 export RM=rm -f
-export CFLAGS=-DNDEBUG -ansi -pedantic -g -O2 -Wall -c -I .
-export CPPFLAGS=-DNDEBUG -ansi -pedantic -g -O2 -Wall -c -I . -DHAVE_X_ERROR
+export CCFLAGS=-DNDEBUG -ansi -pedantic -g -O2 -Wall -c -I .
+export CXXFLAGS=-DNDEBUG -ansi -pedantic -g -O2 -Wall -c -I . -DHAVE_X_ERROR
 
 
 INC=-I. -I/usr/include/gsl/
@@ -31,13 +31,13 @@ TARGET=liboptcall test_dl.so models/strmodel1d.o models/models.o
 all: $(TARGET)
 
 models/models.o:models/models.cc ${OPT_HEADS}
-	$(CXX) -c $< -o $@ ${INC} ${CPPFLAGS}
+	$(CXX) -c $< -o $@ ${INC} ${CXXFLAGS}
 
 version_ctrl.o:version_ctrl.cc
-	$(CXX) -c $< ${CPPFLAGS}
+	$(CXX) -c $< ${CXXFLAGS}
 
 bin/test.o:test.cc ${OPT_HEADS}
-	$(CXX) -c $< -o $@ ${INC} ${CPPFLAGS} --ansi
+	$(CXX) -c $< -o $@ ${INC} ${CXXFLAGS} --ansi
 
 test:${OPT_OBJ} bin/test.o
 	$(CXX) bin/test.o models/strmodel1d.o models/models.o version_ctrl.o -o $@ ${LIB}
@@ -47,7 +47,7 @@ test_dl.so:models/dlmodel_template.c
 
 
 models/strmodel1d.o:models/strmodel1d.cc models/strmodel1d.hpp
-	$(CXX) -c $< -o $@ -I./muparser $(INC) $(CPPFLAGS)
+	$(CXX) -c $< -o $@ -I./muparser $(INC) $(CXXFLAGS)
 
 
 libmuparser:
-- 
cgit v1.2.2