# HG changeset patch
# User map01bf
# Date 1215018850 0
# Node ID f6b80b9f6afeaf7e32eaed63c51646dd0459a9ef
# Parent  f042cbf427b38127e404d334b2336dac188a9865
modifed the makefile to correctly link to gsl on a mac

diff -r f042cbf427b3 -r f6b80b9f6afe INSTALL.txt
--- a/INSTALL.txt	Wed Jul 02 14:20:28 2008 +0000
+++ b/INSTALL.txt	Wed Jul 02 17:14:10 2008 +0000
@@ -31,9 +31,11 @@
   SOAPCPP2=/path/to/bin/soapcpp2 \
   GSOAP_CPP=/path/to/gsoap/stdsoap2.cpp \
   GSOAP_INCLUDE="-I /path/to/gsoap" \
+  GSL_INCLUDE'"-I /path/to/gsl/"
   LIBGSL="-L/path/to/libgsl/libraries -lgsl -lgslcblas"
 (where the path in GSOAP_INCLUDE should name the directory in which
-stdsoap2.h resides)
+stdsoap2.h resides and the path to GSL_INCLUDE should name the directory
+which gsl_rng.h resides.)
 
 Testing
 -------
diff -r f042cbf427b3 -r f6b80b9f6afe Makefile
--- a/Makefile	Wed Jul 02 14:20:28 2008 +0000
+++ b/Makefile	Wed Jul 02 17:14:10 2008 +0000
@@ -3,6 +3,7 @@
 SOAPCPP2=soapcpp2
 GSOAP_CPP=-lgsoap++
 LIBGSL=-lgsl -lgslcblas
+GSL_INCLUDE=
 GSOAP_INCLUDE=
 
 override CFLAGS+=-O3 -g
@@ -36,12 +37,12 @@
 	${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
@@ -56,4 +57,4 @@
 	-sh -c "cd tests && sh ./run-tests.sh"
 
 xthresh: xthresh.c
-	gcc -o $@ ${LIBGSL} $<
+	gcc -o $@ ${CFLAGS} ${GSL_INCLUDE} ${LIBGSL} $<