Changes in src/unittests/Makefile.am [9ee38b:e4decc]

File:

• src/unittests/Makefile.am (modified) (6 diffs)

src/unittests/Makefile.am

@@ -16 +16 @@
   atomsCalculationTest \
   AtomDescriptorTest \
-  BaseShapesUnitTest \
   BondGraphUnitTest \
   BoxUnittest \
@@ -50 +49 @@
 noinst_PROGRAMS = $(TESTS) TestRunner
 
+BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_THREAD_LIB)
 GSLLIBS = \
         ../LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la \
         ../Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la \
         ../Helpers/libMolecuilderHelpers-@MOLECUILDER_API_VERSION@.la \
-        $(BOOST_LIB) \
-        ${BOOST_THREAD_LIB}
+        $(BOOST_LIB)
 ALLLIBS = \
         ../UIElements/libMolecuilderUI-@MOLECUILDER_API_VERSION@.la \
@@ -61 +60 @@
         ${PARSERLIBS} \
         ../libMolecuilder-@MOLECUILDER_API_VERSION@.la \
-        ${GSLLIBS} \
-        ${BOOST_PROGRAM_OPTIONS_LIB}
+        ${GSLLIBS}
+
 PARSERLIBS = ../Parser/libMolecuilderParser-@MOLECUILDER_API_VERSION@.la
 UILIBS = ../UIElements/libMolecuilderUI-@MOLECUILDER_API_VERSION@.la  
@@ -75 +74 @@
   AtomDescriptorTest.cpp \
   atomsCalculationTest.cpp \
-  BaseShapesUnittest.cpp \
   bondgraphunittest.cpp \
   BoxUnittest.cpp \
@@ -114 +112 @@
   AtomDescriptorTest.hpp \
   atomsCalculationTest.hpp \
-  BaseShapesUnittest.hpp \
   bondgraphunittest.hpp \
   BoxUnittest.hpp \
@@ -168 +165 @@
 AtomDescriptorTest_LDADD = ${ALLLIBS}
 
-BaseShapesUnitTest_SOURCES = UnitTestMain.cpp BaseShapesUnittest.cpp BaseShapesUnittest.hpp
-BaseShapesUnitTest_LDADD = ${ALLLIBS}
-
 BondGraphUnitTest_SOURCES = UnitTestMain.cpp bondgraphunittest.cpp bondgraphunittest.hpp
 BondGraphUnitTest_LDADD = ${ALLLIBS}