From 998aebf83c2796fdfabc2efd804ca14103adcaaf Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Mon, 25 Jan 2010 16:07:07 -0800 Subject: Various tweaks, switched to boost unit testing. --- test/Makefile.am | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'test/Makefile.am') diff --git a/test/Makefile.am b/test/Makefile.am index 0fbb18bf8..46b1de0e6 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -6,7 +6,7 @@ include $(top_srcdir)/Makefile.common SUBDIRS = -if HAVE_CPPUNIT +if HAVE_UNIT_TEST AM_CPPFLAGS = \ $(GENERAL_CPPFLAGS) \ @@ -14,15 +14,15 @@ AM_CPPFLAGS = \ LDADD = \ $(GENERAL_LDDFLAGS) \ - $(USRP_UHD_LA) \ - $(CPPUNIT_LIBS) + $(BOOST_UNIT_TEST_FRAMEWORK_LIB) \ + $(USRP_UHD_LA) -noinst_PROGRAMS = cppunit_test +noinst_PROGRAMS = main_test -cppunit_test_SOURCES = \ +main_test_SOURCES = \ + main_test.cpp \ addr_test.cpp \ device_test.cpp \ - cppunit_test.cpp \ usrp_dboard_test.cpp \ wax_test.cpp -- cgit v1.2.3