From 3099d2011c505c0c73c4304344e9ee936caab7a3 Mon Sep 17 00:00:00 2001
From: astrojhgu <astrojhgu@ed2142bd-67ad-457f-ba7c-d818d4011675>
Date: Fri, 21 Aug 2009 04:14:23 +0000
Subject: git-svn-id: file:///home/svn/opt_utilities@45
 ed2142bd-67ad-457f-ba7c-d818d4011675

---
 makefile | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'makefile')

diff --git a/makefile b/makefile
index 71e6681..ee38e29 100644
--- a/makefile
+++ b/makefile
@@ -18,12 +18,12 @@ LDL=-ldl
 export AR = ar rv
 export RANLIB = ranlib
 export RM=rm -f
-export CCFLAGS=-DNDEBUG -ansi -pedantic -g -O2 -Wall -c -I .
-export CXXFLAGS=-DNDEBUG -ansi -pedantic -g -O2 -Wall -c -I . -DHAVE_X_ERROR
+export CCFLAGS=-DNDEBUG -ansi -pedantic -g -O2 -Wall -c -I . -g
+export CXXFLAGS=-DNDEBUG -ansi -pedantic -g -O2 -Wall -c -I . -g
 
 
 INC=-I. -I/usr/include/gsl/
-LIB= -L./muparser  $(LDL) -lmuparser -g -lgsl -lgslcblas
+LIB=-lgsl -lgslcblas
 OPT_OBJ=models/models.o version_ctrl.o models/strmodel1d.o
 
 TARGET=liboptcall test_dl.so models/strmodel1d.o models/models.o
@@ -47,20 +47,15 @@ test_dl.so:models/dlmodel_template.c
 
 
 models/strmodel1d.o:models/strmodel1d.cc models/strmodel1d.hpp
-	$(CXX) -c $< -o $@ -I./muparser $(INC) $(CXXFLAGS)
+	$(CXX) -c $< -o $@ $(CXXFLAGS)
 
 
-libmuparser:
-	make -C muparser
-
 liboptcall:
 	make -C interface
 
 clean:
 	rm -f `find .|grep \~`
 	rm -f `find .|grep '\.o'`
-	rm -f muparser/libmuparser.a
-	make -C muparser clean
 	make -C interface clean
 
 distclean:clean
-- 
cgit v1.2.2