diff options
| -rw-r--r-- | interface/makefile | 2 | ||||
| -rw-r--r-- | makefile | 12 | ||||
| -rw-r--r-- | muparser/makefile | 2 | ||||
| -rw-r--r-- | test/makefile | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/interface/makefile b/interface/makefile index 5cf7a99..62a53a7 100644 --- a/interface/makefile +++ b/interface/makefile @@ -5,7 +5,7 @@ libopt.a:opt.o $(AR) $@ opt.o opt.o:opt.cc opt.h - $(CPP) $< -o $@ $(INC) $(CPPFLAGS) + $(CXX) $< -o $@ $(INC) $(CXXFLAGS) clean: @@ -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: diff --git a/muparser/makefile b/muparser/makefile index 83d2cd5..17e342d 100644 --- a/muparser/makefile +++ b/muparser/makefile @@ -8,7 +8,7 @@ libmuparser.a:$(MUP_OBJ) $(AR) $@ *.o .cpp.o: - $(CPP) $< $(CPPFLAGS) + $(CXX) $< $(CXXFLAGS) clean: $(RM) *.o diff --git a/test/makefile b/test/makefile index 9933620..a801d7b 100644 --- a/test/makefile +++ b/test/makefile @@ -3,7 +3,7 @@ targets=test_optimizer all:$(targets) test_optimizer:test_optimizer.cpp - g++ $< -o $@ -I .. -O3 + $(CXX) $< -o $@ -I .. -O3 clean: |