comparison Makefile @ 282:f6b80b9f6afe

modifed the makefile to correctly link to gsl on a mac

 HELP2MAN=help2man
 GENGETOPT=gengetopt
 SOAPCPP2=soapcpp2
 GSOAP_CPP=-lgsoap++
 LIBGSL=-lgsl -lgslcblas
+GSL_INCLUDE=
 GSOAP_INCLUDE=
 
 override CFLAGS+=-O3 -g
 
 ifeq ($(shell uname),Linux)

 
 soapServer.cpp soapClient.cpp soapC.cpp adb.nsmap: audioDBws.h
 	${SOAPCPP2} audioDBws.h
 
 %.o: %.cpp audioDB.h adb.nsmap cmdline.h reporter.h
-	g++ -c ${CFLAGS} ${GSOAP_INCLUDE} -Wall -Werror $<
+	g++ -c ${CFLAGS} ${GSOAP_INCLUDE} ${GSL_INCLUDE} -Wall  $<
 
 OBJS=insert.o create.o common.o dump.o query.o soap.o sample.o audioDB.o
 
 ${EXECUTABLE}: ${OBJS} soapServer.cpp soapClient.cpp soapC.cpp cmdline.c
-	g++ -o ${EXECUTABLE} ${CFLAGS} ${LIBGSL} ${GSOAP_INCLUDE} $^ ${GSOAP_CPP}
+	g++ -o ${EXECUTABLE} ${CFLAGS} ${GSL_INCLUDE} ${LIBGSL} ${GSOAP_INCLUDE} $^ ${GSOAP_CPP}
 
 clean:
 	-rm cmdline.c cmdline.h
 	-rm soapServer.cpp soapClient.cpp soapC.cpp soapObject.h soapStub.h soapProxy.h soapH.h soapServerLib.cpp soapClientLib.cpp
 	-rm adb.nsmap adb.xsd adb.wsdl adb.*.req.xml adb.*.res.xml

 
 test: ${EXECUTABLE}
 	-sh -c "cd tests && sh ./run-tests.sh"
 
 xthresh: xthresh.c
-	gcc -o $@ ${LIBGSL} $<
+	gcc -o $@ ${CFLAGS} ${GSL_INCLUDE} ${LIBGSL} $<