Fix test of C++ lib installation & compile

dib-lab · Jul 31, 2015 · 8e60e7a · 8e60e7a
1 parent d995a3f
commit 8e60e7a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -219,11 +219,11 @@ libtest: FORCE
 	test -d install_target/include
 	test -f install_target/include/oxli/khmer.hh
 	test -d install_target/lib
-	test -f install_target/lib/libkhmer.a
+	test -f install_target/lib/liboxli.a
 	$(CXX) -o install_target/test-prog-static -I install_target/include \
-		lib/test-compile.cc install_target/lib/libkhmer.a
+		lib/test-compile.cc install_target/lib/liboxli.a
 	$(CXX) -o install_target/test-prog-dynamic -I install_target/include \
-		-L install_target/lib lib/test-compile.cc -lkhmer
+		-L install_target/lib lib/test-compile.cc -loxli
 	rm -rf install_target
 
 ## test        : run the khmer test suite

diff --git a/lib/Makefile b/lib/Makefile
@@ -261,12 +261,6 @@ install: $(LIBKHMERSO) liboxli.a oxli.pc $(KHMER_HEADERS)
 	ln -sf $(PREFIX)/lib/$(LIBKHMERSO) $(PREFIX)/lib/$(SONAME)
 	ln -sf $(PREFIX)/lib/$(SONAME) $(PREFIX)/lib/liboxli.$(SHARED_EXT)
 
-testinstall:
-	$(CXX) -I$(PREFIX)/include -L$(PREFIX)/lib -loxli -o test-shared test-compile.cc
-	rm -f test-shared
-	$(CXX) -I$(PREFIX)/include -o test-static test-compile.cc $(PREFIX)/lib/liboxli.a
-	rm -f test-static
-
 oxli.pc: oxli.pc.in
 	sed -e 's,@prefix@,$(PREFIX),'  -e 's,@VERSION@,$(VERSION),' $< >$@