changeset 281:f042cbf427b3

Some tidying up post-merge of sampling branch:

* make Makefile a little bit cleaner, allowing specification of the
  libgsl linking directive through a variable;
* update INSTALL.txt

--- a/INSTALL.txt	Wed Jul 02 14:07:10 2008 +0000
+++ b/INSTALL.txt	Wed Jul 02 14:20:28 2008 +0000
@@ -15,6 +15,8 @@
 bash: audioDB's test suite depends on /bin/sh being bash, version 3.0
       or greater.
 
+gsl: the GNU Scientific Library.
+
 Compiling
 ---------
 
@@ -28,7 +30,8 @@
   GENGETOPT=/path/to/bin/gengetopt \
   SOAPCPP2=/path/to/bin/soapcpp2 \
   GSOAP_CPP=/path/to/gsoap/stdsoap2.cpp \
-  GSOAP_INCLUDE="-I /path/to/gsoap"
+  GSOAP_INCLUDE="-I /path/to/gsoap" \
+  LIBGSL="-L/path/to/libgsl/libraries -lgsl -lgslcblas"
 (where the path in GSOAP_INCLUDE should name the directory in which
 stdsoap2.h resides)
 

--- a/Makefile	Wed Jul 02 14:07:10 2008 +0000
+++ b/Makefile	Wed Jul 02 14:20:28 2008 +0000
@@ -2,6 +2,7 @@
 GENGETOPT=gengetopt
 SOAPCPP2=soapcpp2
 GSOAP_CPP=-lgsoap++
+LIBGSL=-lgsl -lgslcblas
 GSOAP_INCLUDE=
 
 override CFLAGS+=-O3 -g
@@ -40,7 +41,7 @@
 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} -lgsl -lgslcblas ${GSOAP_INCLUDE} $^ ${GSOAP_CPP}
+	g++ -o ${EXECUTABLE} ${CFLAGS} ${LIBGSL} ${GSOAP_INCLUDE} $^ ${GSOAP_CPP}
 
 clean:
 	-rm cmdline.c cmdline.h
@@ -48,10 +49,11 @@
 	-rm adb.nsmap adb.xsd adb.wsdl adb.*.req.xml adb.*.res.xml
 	-rm HELP.txt
 	-rm ${EXECUTABLE} ${EXECUTABLE}.1 ${OBJS}
+	-rm xthresh
 	-sh -c "cd tests && sh ./clean.sh"
 
 test: ${EXECUTABLE}
 	-sh -c "cd tests && sh ./run-tests.sh"
 
 xthresh: xthresh.c
-	gcc -o $@ -lgsl -lgslcblas $<
+	gcc -o $@ ${LIBGSL} $<