Changes in src/unittests/Makefile.am [d7d022:9d4ff35]

File:

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

src/unittests/Makefile.am

@@ -7 +7 @@
 
 include ../../src/Actions/unittests/Makefile.am
+include ../../src/Analysis/unittests/Makefile.am
 include ../../src/Descriptors/unittests/Makefile.am
+include ../../src/Element/unittests/Makefile.am
+include ../../src/Fragmentation/unittests/Makefile.am
+include ../../src/Graph/unittests/Makefile.am
 include ../../src/Parser/unittests/Makefile.am
 include ../../src/RandomNumbers/unittests/Makefile.am
 include ../../src/Shapes/unittests/Makefile.am
+include ../../src/Tesselation/unittests/Makefile.am
 include ../../src/UIElements/CommandLineUI/unittests/Makefile.am
 include ../../src/UIElements/Menu/unittests/Makefile.am
@@ -20 +25 @@
 
 GENERALTESTS = \
-  AnalysisBondsUnitTest \
-  AnalysisCorrelationToPointUnitTest \
-  AnalysisCorrelationToSurfaceUnitTest \
-  AnalysisPairCorrelationUnitTest \
-  BondGraphUnitTest \
   BoxUnitTest \
-  CountBondsUnitTest \
-  ElementUnitTest \
   FormulaUnittest \
   LinkedCellUnitTest \
   ListOfBondsUnitTest \
-  PeriodentafelUnitTest \
-  TesselationUnitTest \
-  Tesselation_BoundaryTriangleUnitTest \
-  Tesselation_InOutsideUnitTest \
   WorldTimeUnitTest
 
@@ -49 +43 @@
         $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS)
 
+GENERALLIBS = \
+        ../libMolecuilder.la \
+        ../libMolecuilderHelpers.la \
+        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
+        ${CodePatterns_LIBS} \
+        $(BOOST_LIB)
+
 ALLLIBS = \
         ../libMolecuilderUI.la \
@@ -58 +59 @@
 TESTSOURCES = \
         ${ACTIONTESTSSOURCES} \
+        ${ANALYSISTESTSSOURCES} \
         ${DESCRIPTORTESTSSOURCES} \
+        ${ELEMENTTESTSSOURCES} \
+        ${FRAGMENTATIONTESTSSOURCES} \
+        ${GRAPHTESTSSOURCES} \
         ${LINEARALGEBRATESTSSOURCES} \
         ${PARSERTESTSSOURCES} \
         ${RANDOMNUMBERTESTSSOURCES} \
         ${SHAPETESTSSOURCES} \
+        ${TESSELATIONTESTSSOURCES} \
         $(UIELEMENTSCOMMANDLINEPARSERTESTSSOURCES) \
         ${UIELEMENTSMENUTESTSSOURCES} \
-  AnalysisBondsUnitTest.cpp \
-  AnalysisCorrelationToPointUnitTest.cpp \
-  AnalysisCorrelationToSurfaceUnitTest.cpp  \
-  AnalysisPairCorrelationUnitTest.cpp \
-  BondGraphUnitTest.cpp \
   BoxUnitTest.cpp \
-  CountBondsUnitTest.cpp \
-  ElementUnitTest.cpp \
   FormulaUnitTest.cpp \
   LinkedCellUnitTest.cpp \
   ListOfBondsUnitTest.cpp \
-  PeriodentafelUnitTest.cpp \
-  TesselationUnitTest.cpp \
-  Tesselation_BoundaryTriangleUnitTest.cpp \
-  Tesselation_InsideOutsideUnitTest.cpp \
   WorldTimeUnitTest.cpp
 
 TESTHEADERS = \
         ${ACTIONTESTSHEADERS} \
+        ${ANALYSISTESTSHEADERS} \
         ${DESCRIPTORTESTSHEADERS} \
+        ${ELEMENTTESTSHEADERS} \
+        ${FRAGMENTATIONTESTSHEADERS} \
+        ${GRAPHTESTSHEADERS} \
         ${LINEARALGEBRATESTSHEADERS} \
         ${PARSERTESTSHEADERS} \
         ${RANDOMNUMBERTESTSHEADERS} \
         ${SHAPETESTSHEADERS} \
+        ${TESSELATIONTESTSHEADERS} \
         $(UIELEMENTSCOMMANDLINEPARSERTESTSHEADERS) \
         ${UIELEMENTSMENUTESTSHEADERS} \
-  AnalysisBondsUnitTest.hpp \
-  AnalysisCorrelationToPointUnitTest.hpp \
-  AnalysisCorrelationToSurfaceUnitTest.hpp  \
-  AnalysisPairCorrelationUnitTest.hpp \
-  BondGraphUnitTest.hpp \
   BoxUnitTest.hpp \
-  CountBondsUnitTest.hpp \
-  ElementUnitTest.hpp \
   FormulaUnitTest.hpp \
   LinkedCellUnitTest.hpp \
   ListOfBondsUnitTest.hpp \
-  PeriodentafelUnitTest.hpp \
-  TesselationUnitTest.hpp \
-  Tesselation_BoundaryTriangleUnitTest.hpp \
-  Tesselation_InsideOutsideUnitTest.hpp \
   WorldTimeUnitTest.hpp
   
-
-AnalysisBondsUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        AnalysisBondsUnitTest.cpp \
-        AnalysisBondsUnitTest.hpp
-AnalysisBondsUnitTest_LDADD = ${ALLLIBS}
-
-AnalysisCorrelationToPointUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        AnalysisCorrelationToPointUnitTest.cpp \
-        AnalysisCorrelationToPointUnitTest.hpp
-AnalysisCorrelationToPointUnitTest_LDADD = ${ALLLIBS}
-
-AnalysisCorrelationToSurfaceUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        AnalysisCorrelationToSurfaceUnitTest.cpp \
-        AnalysisCorrelationToSurfaceUnitTest.hpp
-AnalysisCorrelationToSurfaceUnitTest_LDADD = ${ALLLIBS}
-
-AnalysisPairCorrelationUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        AnalysisPairCorrelationUnitTest.cpp \
-        AnalysisPairCorrelationUnitTest.hpp
-AnalysisPairCorrelationUnitTest_LDADD = ${ALLLIBS}
-
-BondGraphUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        BondGraphUnitTest.cpp \
-        BondGraphUnitTest.hpp
-BondGraphUnitTest_LDADD = ${ALLLIBS}
 
 BoxUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
         BoxUnitTest.cpp \
         BoxUnitTest.hpp
-BoxUnitTest_LDADD = ${ALLLIBS}
-
-CountBondsUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        CountBondsUnitTest.cpp \
-        CountBondsUnitTest.hpp
-CountBondsUnitTest_LDADD = ${ALLLIBS}
-
-ElementUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        ElementUnitTest.cpp \
-        ../element.cpp \
-        ElementUnitTest.hpp \
-        ../element.hpp
-ElementUnitTest_LDADD = \
-        $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS)
+BoxUnitTest_LDADD = \
+        ../libMolecuilder.la \
+        ../libMolecuilderShapes.la \
+        ../libMolecuilderHelpers.la \
+        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la
 
 FormulaUnittest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
         FormulaUnitTest.cpp \
         FormulaUnitTest.hpp
-FormulaUnittest_LDADD = ${ALLLIBS}
+FormulaUnittest_LDADD = $(ALLLIBS)
 
 LinkedCellUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
         LinkedCellUnitTest.cpp \
         LinkedCellUnitTest.hpp
-LinkedCellUnitTest_LDADD = ${ALLLIBS}
+LinkedCellUnitTest_LDADD = $(ALLLIBS)
 
 ListOfBondsUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
         ListOfBondsUnitTest.cpp \
         ListOfBondsUnitTest.hpp 
-ListOfBondsUnitTest_LDADD = ${ALLLIBS}
-
-PeriodentafelUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        PeriodentafelUnitTest.cpp \
-        PeriodentafelUnitTest.hpp
-PeriodentafelUnitTest_LDADD = ${ALLLIBS}
-
-TesselationUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        TesselationUnitTest.cpp \
-        TesselationUnitTest.hpp
-TesselationUnitTest_LDADD = ${ALLLIBS}
-
-Tesselation_BoundaryTriangleUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        Tesselation_BoundaryTriangleUnitTest.cpp \
-        Tesselation_BoundaryTriangleUnitTest.hpp 
-Tesselation_BoundaryTriangleUnitTest_LDADD = ${ALLLIBS}
-
-Tesselation_InOutsideUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-        Tesselation_InsideOutsideUnitTest.cpp \
-        Tesselation_InsideOutsideUnitTest.hpp
-Tesselation_InOutsideUnitTest_LDADD = ${ALLLIBS}
+ListOfBondsUnitTest_LDADD = $(ALLLIBS)
 
 WorldTimeUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \