Changes in src/Makefile.am [a8b10a:a9b86d]

File:

• src/Makefile.am (modified) (9 diffs)

src/Makefile.am

@@ -8 +8 @@
 
 include Actions/Makefile.am
+include Analysis/Makefile.am
+include Element/Makefile.am
 include Graph/Makefile.am
+include Helpers/Makefile.am
+include Fragmentation/Makefile.am
 include Parser/Makefile.am
 include RandomNumbers/Makefile.am
@@ -16 +20 @@
 AM_LDFLAGS = -ldl ${BOOST_LDFLAGS}
 AM_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
-
-ANALYSISSOURCE = \
-  analysis_bonds.cpp \
-  analysis_correlation.cpp
-ANALYSISHEADER = \
-  analysis_bonds.hpp \
-  analysis_correlation.hpp
 
 ATOMSOURCE = \
@@ -116 +113 @@
         Dynamics/VerletForceIntegration.hpp
 
-HELPERSSOURCE = \
-        Helpers/defs.cpp
-
-HELPERSHEADER = \
-        Helpers/defs.hpp \
-        Helpers/helpers.hpp
-
 THERMOSTATSOURCE = \
   Thermostats/Berendsen.cpp \
@@ -142 +132 @@
 
 TESSELATIONSOURCE = \
-  BoundaryLineSet.cpp \
-  BoundaryPointSet.cpp \
-  BoundaryPolygonSet.cpp \
-  BoundaryTriangleSet.cpp \
-  CandidateForTesselation.cpp \
-  tesselation.cpp \
-  tesselationhelpers.cpp \
-  TesselPoint.cpp
+  Tesselation/boundary.cpp \
+  Tesselation/BoundaryLineSet.cpp \
+  Tesselation/BoundaryPointSet.cpp \
+  Tesselation/BoundaryPolygonSet.cpp \
+  Tesselation/BoundaryTriangleSet.cpp \
+  Tesselation/CandidateForTesselation.cpp \
+  Tesselation/ellipsoid.cpp \
+  Tesselation/tesselation.cpp \
+  Tesselation/tesselationhelpers.cpp \
+  Tesselation/TesselPoint.cpp \
+  Tesselation/triangleintersectionlist.cpp
   
 TESSELATIONHEADER = \
-  BoundaryLineSet.hpp \
-  BoundaryMaps.hpp \
-  BoundaryPointSet.hpp \
-  BoundaryPolygonSet.hpp \
-  BoundaryTriangleSet.hpp \
-  CandidateForTesselation.hpp \
+  Tesselation/boundary.hpp \
+  Tesselation/BoundaryLineSet.hpp \
+  Tesselation/BoundaryMaps.hpp \
+  Tesselation/BoundaryPointSet.hpp \
+  Tesselation/BoundaryPolygonSet.hpp \
+  Tesselation/BoundaryTriangleSet.hpp \
+  Tesselation/CandidateForTesselation.hpp \
+  Tesselation/ellipsoid.hpp \
   IPointCloud.hpp \
   PointCloudAdaptor.hpp \
-  tesselation.hpp \
-  tesselationhelpers.hpp \
-  TesselPoint.hpp
+  Tesselation/tesselation.hpp \
+  Tesselation/tesselationhelpers.hpp \
+  Tesselation/TesselPoint.hpp \
+  Tesselation/triangleintersectionlist.hpp
 
 MOLECUILDERSOURCE = \
-  ${ANALYSISSOURCE} \
   ${ATOMSOURCE} \
   ${BONDSOURCE} \
   ${DESCRIPTORSOURCE} \
   ${DYNAMICSSOURCE} \
-  ${HELPERSSOURCE} \
   ${THERMOSTATSOURCE} \
   ${TESSELATIONSOURCE} \
-  boundary.cpp \
   Box.cpp \
   config.cpp \
   ConfigFileBuffer.cpp \
-  element.cpp \
-  elements_db.cpp \
-  ellipsoid.cpp \
   Formula.cpp \
   graph.cpp \
@@ -188 +178 @@
   molecule_geometry.cpp \
   molecule_graph.cpp \
-  parser.cpp \
-  periodentafel.cpp \
   ThermoStatContainer.cpp \
-  triangleintersectionlist.cpp \
   UIElements/UIFactory.cpp \
   version.c \
@@ -198 +185 @@
 
 MOLECUILDERHEADER = \
-  ${ANALYSISHEADER} \
   ${ATOMHEADER} \
   ${BONDHEADER} \
@@ -204 +190 @@
   ${DESCRIPTORIMPLHEADER} \
   ${DYNAMICSHEADER} \
-  ${HELPERSHEADER} \
   ${THERMOSTATHEADER} \
   ${TESSELATIONHEADER} \
-  boundary.hpp \
   Box.hpp \
   config.hpp \
   ConfigFileBuffer.hpp \
-  element.hpp \
-  elements_db.hpp \
-  ellipsoid.hpp \
   Formula.hpp \
   graph.hpp \
   linkedcell.hpp \
   molecule.hpp \
-  parser.hpp \
-  periodentafel.hpp \
   ThermoStatContainer.hpp \
-  triangleintersectionlist.hpp \
   types.hpp \
   UIElements/UIFactory.hpp \
@@ -281 +259 @@
 libmenu_a_SOURCES = ${UISOURCE} ${UIHEADER} 
 
-molecuilder_DATA = elements.db valence.db orbitals.db Hbonddistance.db Hbondangle.db
+molecuilder_DATA = Element/elements.db Element/valence.db Element/orbitals.db Element/Hbonddistance.db Element/Hbondangle.db
 
 molecuilder_CXXFLAGS = $(AM_CPPFLAGS) 
@@ -313 +291 @@
         $(GUI_LIBS)
 
-joiner_SOURCES = joiner.cpp datacreator.cpp datacreator.hpp periodentafel.hpp
+joiner_SOURCES = Fragmentation/joiner.cpp Fragmentation/datacreator.cpp Fragmentation/datacreator.hpp
 joiner_LDADD = \
-        libMolecuilder.la \
-        libMolecuilderParser.la \
-        libMolecuilderShapes.la \
-        libMolecuilderRandomNumbers.la \
+        libMolecuilderFragmentation.la \
+        libMolecuilderHelpers.la \
+        libMolecuilderElement.la \
         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
         ${CodePatterns_LIBS} \
         $(BOOST_THREAD_LIBS)
 
-analyzer_SOURCES = analyzer.cpp datacreator.cpp periodentafel.hpp datacreator.hpp 
+analyzer_SOURCES = Fragmentation/analyzer.cpp Fragmentation/datacreator.cpp Fragmentation/datacreator.hpp
 analyzer_LDADD = \
-        libMolecuilder.la \
-        libMolecuilderParser.la \
-        libMolecuilderShapes.la \
-        libMolecuilderRandomNumbers.la \
+        libMolecuilderFragmentation.la \
+        libMolecuilderHelpers.la \
+        libMolecuilderElement.la \
         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
         ${CodePatterns_LIBS} \