Changes in src/Makefile.am [255971:88b400]

File:

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

src/Makefile.am

@@ -4 +4 @@
 SUBDIRS = Actions Exceptions Helpers LinearAlgebra Parser UIElements
 
-                        
 ATOMSOURCE = \
   atom.cpp \
@@ -73 +72 @@
   Shapes/Shape.hpp \
   Shapes/ShapeOps.hpp
+
   
-
-QTUIMOC_HEADER = UIElements/QT4/QTDialog.hpp \
-        UIElements/QT4/QTMainWindow.hpp \
-        UIElements/Menu/QT4/QTMenu.hpp \
-        UIElements/Views/QT4/QTWorldView.hpp \
-        UIElements/Views/QT4/GLMoleculeView.hpp \
-        UIElements/Views/QT4/QTMoleculeView.hpp \
-        UIElements/Views/QT4/QTStatusBar.hpp
- 
-QTUIMOC_TARGETS = QTMainWindow.moc.cpp \
-        QTMenu.moc.cpp\
-        QTDialog.moc.cpp \
-        QTWorldView.moc.cpp \
-        GLMoleculeView.moc.cpp \
-        QTMoleculeView.moc.cpp \
-        QTStatusBar.moc.cpp
-
 DESCRIPTORSOURCE = Descriptors/AtomDescriptor.cpp \
   Descriptors/AtomIdDescriptor.cpp \
@@ -113 +96 @@
   Descriptors/MoleculePtrDescriptor.hpp \
   Descriptors/MoleculeSelectionDescriptor.cpp
+
+
+QTUIMOC_HEADER = UIElements/QT4/QTDialog.hpp \
+        UIElements/QT4/QTMainWindow.hpp \
+        UIElements/Menu/QT4/QTMenu.hpp \
+        UIElements/Views/QT4/QTWorldView.hpp \
+        UIElements/Views/QT4/GLMoleculeView.hpp \
+        UIElements/Views/QT4/QTMoleculeView.hpp \
+        UIElements/Views/QT4/QTStatusBar.hpp
                                   
-QTUISOURCE = ${QTUIMOC_TARGETS} \
+QTUISOURCE = allmocs.moc.cpp \
         UIElements/QT4/QTMainWindow.cpp \
         UIElements/QT4/QTDialog.cpp \
@@ -128 +120 @@
 QTUI_DEFS =
 
+TESSELATIONSOURCE = \
+  BoundaryLineSet.cpp \
+  BoundaryPointSet.cpp \
+  BoundaryPolygonSet.cpp \
+  BoundaryTriangleSet.cpp \
+  CandidateForTesselation.cpp \
+  PointCloud.cpp \
+  tesselation.cpp \
+  tesselationhelpers.cpp \
+  TesselPoint.cpp
+  
+TESSELATIONHEADER = \
+  BoundaryLineSet.hpp \
+  BoundaryPointSet.hpp \
+  BoundaryPolygonSet.hpp \
+  BoundaryTriangleSet.hpp \
+  CandidateForTesselation.hpp \
+  PointCloud.hpp \
+  tesselation.hpp \
+  tesselationhelpers.hpp \
+  TesselPoint.hpp
+
 MOLECUILDERSOURCE = \
   ${ANALYSISSOURCE} \
@@ -133 +147 @@
   ${ATOMSOURCE} \
   ${PATTERNSOURCE} \
-  ${PARSERSOURCE} \
   ${SHAPESOURCE} \
   ${DESCRIPTORSOURCE} \
-  ${HELPERSOURCE} \
+  ${TESSELATIONSOURCE} \
   bond.cpp \
   bondgraph.cpp \
@@ -144 +157 @@
   config.cpp \
   ConfigFileBuffer.cpp \
+  defs.cpp \
   element.cpp \
   elements_db.cpp \
@@ -160 +174 @@
   parser.cpp \
   periodentafel.cpp \
-  tesselation.cpp \
-  tesselationhelpers.cpp \
   ThermoStatContainer.cpp \
   triangleintersectionlist.cpp \
   UIElements/UIFactory.cpp \
-  vector_ops.cpp \
   World.cpp
 
@@ -172 +183 @@
   ${ACTIONSHEADER} \
   ${ATOMHEADER} \
-  ${PARSERHEADER} \
   ${PATTERNHEADER} \
   ${SHAPEHEADER} \
   ${DESCRIPTORHEADER} \
+  ${TESSELATIONHEADER} \
   bond.hpp \
   bondgraph.hpp \
@@ -197 +208 @@
   periodentafel.hpp \
   stackclass.hpp \
-  tesselation.hpp \
-  tesselationhelpers.hpp \
   ThermoStatContainer.hpp \
   triangleintersectionlist.hpp \
   UIElements/UIFactory.hpp \
-  vector_ops.hpp \
   World.hpp 
 
@@ -229 +237 @@
 ## from each source file.  Note that it is not necessary to list header files
 ## which are already listed elsewhere in a _HEADERS variable assignment.
-libMolecuilder_@MOLECUILDER_API_VERSION@_la_SOURCES = ${MOLECUILDERSOURCE}  $(srcdir)/version.c
+libMolecuilder_@MOLECUILDER_API_VERSION@_la_SOURCES = ${MOLECUILDERSOURCE} $(srcdir)/version.c
 
 ## Instruct libtool to include ABI version information in the generated shared
@@ -264 +272 @@
 noinst_LIBRARIES = libmenu.a
 bin_PROGRAMS = molecuilder molecuildergui joiner analyzer
+EXTRA_PROGRAMS = unity
 
 molecuilderdir = ${bindir}
@@ -292 +301 @@
 molecuildergui_CXXFLAGS = ${QT_CXXFLAGS} ${GLU_CXXFLAGS} -DUSE_GUI_QT
 molecuildergui_LDFLAGS = $(BOOST_LIB) ${QT_LDFLAGS} ${GLU_LDFLAGS}
+
+unity_SOURCES = unity.cpp
+unity_LDADD = $(BOOST_LIB) ${BOOST_THREAD_LIB} ${BOOST_PROGRAM_OPTIONS_LIB}
+
 molecuildergui_LDADD = \
         UIElements/libMolecuilderUI-@MOLECUILDER_API_VERSION@.la \
@@ -307 +320 @@
 joiner_SOURCES = joiner.cpp datacreator.cpp datacreator.hpp periodentafel.hpp
 joiner_LDADD = \
+        Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la \
         libMolecuilder-@MOLECUILDER_API_VERSION@.la \
+        Parser/libMolecuilderParser-@MOLECUILDER_API_VERSION@.la \
         LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la \
         Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la \
@@ -317 +332 @@
 analyzer_SOURCES = analyzer.cpp datacreator.cpp periodentafel.hpp datacreator.hpp 
 analyzer_LDADD = \
+        Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la \
         libMolecuilder-@MOLECUILDER_API_VERSION@.la \
+        Parser/libMolecuilderParser-@MOLECUILDER_API_VERSION@.la \
         LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la \
         Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la \
@@ -329 +346 @@
 # Therfore `%'-rules do not seem to work
 #Quick fix to get it done otherwise
-${QTUIMOC_TARGETS}: ${QTUIMOC_HEADER}
+allmocs.moc.cpp: ${QTUIMOC_HEADER}
+        echo "" > allmocs.moc.cpp;\
         list='$(QTUIMOC_HEADER)'; for header in $$list; do \
         echo "Making mocfile for $$header"; \
@@ -335 +353 @@
         $(MOC) $(srcdir)/$$header -o $$target \
         || eval $$failcom; \
+        echo "#include \"$$target\"" >> allmocs.moc.cpp; \
         done;
 
-MOSTLYCLEANFILES = ${QTUIMOC_TARGETS}
-        
 #EXTRA_DIST = ${molecuilder_DATA}
 
@@ -357 +374 @@
 
 
+unity.cpp: ${MOLECUILDERSOURCE} ${MOLECUILDERHEADER}
+        echo "" >  unity.cpp; \
+        list='$(MOLECUILDERSOURCE)'; for file in $$list; do \
+          echo "#include \"$(srcdir)/$$file\"" >> unity.cpp; \
+        done; \
+        subdirs='$(SUBDIRS)';for directory in $$subdirs; do\
+                olddir=$$PWD;\
+                cd $$directory && make unity.cpp;\
+                cd $$olddir;\
+                echo "#include \"$$directory/unity.cpp\"" >> unity.cpp;\
+        done;\
+        echo "#include \"$(srcdir)/builder.cpp\"" >> unity.cpp;
+        echo "#include \"$(srcdir)/version.c\"" >> unity.cpp;
+
+MOSTLYCLEANFILES = allmocs.moc.cpp unity.cpp 
+