Changes in src/unittests/Makefile.am [63c1f6:9fe36b]

File:

• src/unittests/Makefile.am (modified) (1 diff)

src/unittests/Makefile.am

@@ -4 +4 @@
 AM_CXXFLAGS = $(CPPUNIT_CFLAGS)
 
-MENUTESTS = ActionSequenceTest
+MENUTESTS = ActionSequenceTest 
 
-TESTS = \
-  ActOnAllUnitTest \
-  AnalysisBondsUnitTests \
-  AnalysisCorrelationToPointUnitTest \
-  AnalysisCorrelationToSurfaceUnitTest \
-  AnalysisPairCorrelationUnitTest \
-  BondGraphUnitTest \
-  GSLMatrixSymmetricUnitTest \
-  GSLMatrixUnitTest \
-  GSLVectorUnitTest \
-  InfoUnitTest \
-  LinearSystemOfEquationsUnitTest \
-  ListOfBondsUnitTest \
-  LogUnitTest \
-  MemoryUsageObserverUnitTest \
-  MemoryAllocatorUnitTest \
-  StackClassUnitTest \
-  TesselationUnitTest \
-  Tesselation_BoundaryTriangleUnitTest \
-  Tesselation_InOutsideUnitTest \
-  VectorUnitTest \
-  ObserverTest \
-  ${MENUTESTS}  
-    
-  
+TESTS = ActOnAllUnitTest AnalysisBondsUnitTests AnalysisCorrelationToPointUnitTest AnalysisCorrelationToSurfaceUnitTest AnalysisPairCorrelationUnitTest BondGraphUnitTest ListOfBondsUnitTest LogUnitTest MemoryUsageObserverUnitTest MemoryAllocatorUnitTest StackClassUnitTest VectorUnitTest ObserverTest $(MENUTESTS)
 check_PROGRAMS = $(TESTS) 
 noinst_PROGRAMS = $(TESTS)
 
 ActOnAllUnitTest_SOURCES = ../test/ActOnAllTest.hpp ActOnAllUnitTest.cpp ActOnAllUnitTest.hpp
-ActOnAllUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
+ActOnAllUnitTest_LDADD = ../libmolecuilder.a
 
 AnalysisBondsUnitTests_SOURCES = analysisbondsunittest.cpp analysisbondsunittest.hpp
-AnalysisBondsUnitTests_LDADD = ../libmolecuilder.a ../libgslwrapper.a
+AnalysisBondsUnitTests_LDADD = ../libmolecuilder.a
 
 AnalysisCorrelationToPointUnitTest_SOURCES = analysis_correlation.hpp AnalysisCorrelationToPointUnitTest.cpp AnalysisCorrelationToPointUnitTest.hpp
-AnalysisCorrelationToPointUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
+AnalysisCorrelationToPointUnitTest_LDADD = ../libmolecuilder.a
 
 AnalysisCorrelationToSurfaceUnitTest_SOURCES = analysis_correlation.hpp AnalysisCorrelationToSurfaceUnitTest.cpp AnalysisCorrelationToSurfaceUnitTest.hpp
-AnalysisCorrelationToSurfaceUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
+AnalysisCorrelationToSurfaceUnitTest_LDADD = ../libmolecuilder.a
 
 AnalysisPairCorrelationUnitTest_SOURCES = analysis_correlation.hpp AnalysisPairCorrelationUnitTest.cpp AnalysisPairCorrelationUnitTest.hpp
-AnalysisPairCorrelationUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
+AnalysisPairCorrelationUnitTest_LDADD = ../libmolecuilder.a
 
 BondGraphUnitTest_SOURCES = bondgraphunittest.cpp bondgraphunittest.hpp
-BondGraphUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
-
-GSLMatrixSymmetricUnitTest_SOURCES = gslmatrixsymmetricunittest.cpp gslmatrixsymmetricunittest.hpp
-GSLMatrixSymmetricUnitTest_LDADD = ../libgslwrapper.a
-
-GSLMatrixUnitTest_SOURCES = gslmatrixunittest.cpp gslmatrixunittest.hpp
-GSLMatrixUnitTest_LDADD = ../libgslwrapper.a
-
-GSLVectorUnitTest_SOURCES = gslvectorunittest.cpp gslvectorunittest.hpp
-GSLVectorUnitTest_LDADD = ../libgslwrapper.a
-
-InfoUnitTest_SOURCES = infounittest.cpp infounittest.hpp
-InfoUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
-
-LinearSystemOfEquationsUnitTest_SOURCES = linearsystemofequationsunittest.cpp linearsystemofequationsunittest.hpp
-LinearSystemOfEquationsUnitTest_LDADD = ../libgslwrapper.a ../libmolecuilder.a
+BondGraphUnitTest_LDADD = ../libmolecuilder.a
 
 ListOfBondsUnitTest_SOURCES = listofbondsunittest.cpp listofbondsunittest.hpp
-ListOfBondsUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
+ListOfBondsUnitTest_LDADD = ../libmolecuilder.a
 
 LogUnitTest_SOURCES = logunittest.cpp logunittest.hpp 
-LogUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
+LogUnitTest_LDADD = ../libmolecuilder.a
 
 MemoryAllocatorUnitTest_SOURCES = memoryallocatorunittest.cpp memoryallocatorunittest.hpp 
-MemoryAllocatorUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
+MemoryAllocatorUnitTest_LDADD = ../libmolecuilder.a
 
 MemoryUsageObserverUnitTest_SOURCES = memoryusageobserverunittest.cpp memoryusageobserverunittest.hpp 
-MemoryUsageObserverUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
+MemoryUsageObserverUnitTest_LDADD = ../libmolecuilder.a
 
 StackClassUnitTest_SOURCES = stackclassunittest.cpp stackclassunittest.hpp
-StackClassUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
-
-TesselationUnitTest_SOURCES = tesselationunittest.cpp tesselationunittest.hpp
-TesselationUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
-
-Tesselation_BoundaryTriangleUnitTest_SOURCES = tesselation_boundarytriangleunittest.cpp tesselation_boundarytriangleunittest.hpp
-Tesselation_BoundaryTriangleUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
-
-Tesselation_InOutsideUnitTest_SOURCES = tesselation_insideoutsideunittest.cpp tesselation_insideoutsideunittest.hpp
-Tesselation_InOutsideUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
+StackClassUnitTest_LDADD = ../libmolecuilder.a
 
 VectorUnitTest_SOURCES = vectorunittest.cpp vectorunittest.hpp 
-VectorUnitTest_LDADD = ../libmolecuilder.a ../libgslwrapper.a
+VectorUnitTest_LDADD = ../libmolecuilder.a
 
 ActionSequenceTest_SOURCES = ActionSequenceTest.cpp ActionSequenceTest.hpp
-ActionSequenceTest_LDADD = ../libmolecuilder.a
+ActionSequenceTest_LDADD = ../libmolecuilder.a ../libmenu.a
 
 ObserverTest_SOURCES = ObserverTest.cpp ObserverTest.hpp