changeset 694:55aa1919d735

include sample.o in LIBOBJS also link in LIBGSL to the audioDB library. Tests now pass.
author mas01cr
date Thu, 22 Apr 2010 21:03:53 +0000
parents b1723ae7675e
children 01e25f938b63
files Makefile
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Thu Apr 22 21:03:47 2010 +0000
+++ b/Makefile	Thu Apr 22 21:03:53 2010 +0000
@@ -16,8 +16,8 @@
 INCLUDEDIR=$(PREFIX)/include
 MANDIR=$(PREFIX)/share/man
 
-LIBOBJS=lock.o pointpair.o create.o open.o power.o l2norm.o insert.o status.o query.o dump.o close.o index-utils.o query-indexed.o liszt.o retrieve.o lshlib.o
-OBJS=$(LIBOBJS) index.o soap.o sample.o cmdline.o audioDB.o common.o
+LIBOBJS=lock.o pointpair.o create.o open.o power.o l2norm.o insert.o status.o query.o dump.o close.o index-utils.o query-indexed.o liszt.o retrieve.o lshlib.o sample.o
+OBJS=$(LIBOBJS) index.o soap.o cmdline.o audioDB.o common.o
 
 EXECUTABLE=audioDB
 
@@ -75,7 +75,7 @@
 	$(CXX) -o $(EXECUTABLE) $(CFLAGS) $^ $(LIBGSL) $(GSOAP_INCLUDE) $(GSOAP_CPP)
 
 $(LIBRARY): $(LIBOBJS)
-	$(CXX) $(SHARED_LIB_FLAGS) -o $(LIBRARY) $(CFLAGS) $^
+	$(CXX) $(SHARED_LIB_FLAGS) -o $(LIBRARY) $(LIBGSL) $(CFLAGS) $^
 
 tags:
 	ctags *.cpp *.h