Changeset f761c4 for src/Makefile.am

Timestamp:

Aug 5, 2010, 7:56:22 PM (15 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

a881f5

Parents:

ec149d (diff), 7baf4a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'StructureRefactoring' of jupiter:molecuilder into StructureRefactoring

File:

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

src/Makefile.am

@@ -8 +8 @@
   Helpers/Assert.cpp \
   Helpers/MemDebug.cpp
+  
+BASESOURCE = \
+  ${HELPERSOURCE} \
+  Space.cpp \
+  vector.cpp
+  
+BASEHEADER = \
+  ${HELPERHEADER} \
+  Space.hpp \
+  vector.hpp
                         
 ATOMSOURCE = \
@@ -31 +41 @@
 
 LINALGSOURCE = \
-  ${HELPERSOURCE} \
   gslmatrix.cpp \
   gslvector.cpp \
-  linearsystemofequations.cpp \
-  Space.cpp \
-  vector.cpp
+  linearsystemofequations.cpp
                            
 LINALGHEADER = \
   gslmatrix.hpp \
   gslvector.hpp \
-  linearsystemofequations.hpp \
-  Space.hpp \
-  vector.hpp
+  linearsystemofequations.hpp
                            
 ANALYSISSOURCE = \
@@ -132 +137 @@
   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 \
@@ -172 +161 @@
   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 \
@@ -196 +194 @@
   ${SHAPESOURCE} \
   ${DESCRIPTORSOURCE} \
-  ${HELPERSOURCE} \
   bond.cpp \
   bondgraph.cpp \
@@ -228 +225 @@
   periodentafel.cpp \
   Plane.cpp \
-  Space.cpp \
   tesselation.cpp \
   tesselationhelpers.cpp \
@@ -234 +230 @@
   triangleintersectionlist.cpp \
   UIElements/UIFactory.cpp \
-  vector.cpp \
   vector_ops.cpp \
   verbose.cpp \
@@ -296 +291 @@
 INCLUDES = -I$(top_srcdir)/src/unittests -I$(top_srcdir)/src/Actions -I$(top_srcdir)/src/UIElements
 
-noinst_LIBRARIES = libmolecuilder.a libgslwrapper.a libmenu.a libparser.a
+noinst_LIBRARIES = libmolecuilderbase.a libmolecuilder.a libgslwrapper.a libmenu.a libparser.a
 bin_PROGRAMS = molecuilder molecuildergui joiner analyzer
+EXTRA_PROGRAMS = unity
 
 molecuilderdir = ${bindir}
 
+libmolecuilderbase_a_SOURCES = ${BASESOURCE} ${BASEHEADER}
 libmolecuilder_a_SOURCES = ${SOURCE} ${HEADER}
-
 libmenu_a_SOURCES = ${UISOURCE} ${UIHEADER} 
 libparser_a_SOURCES = ${PARSERSOURCE} ${PARSERHEADER}
@@ -314 +310 @@
 molecuilder_SOURCES = ${LEGACYSOURCE} builder.cpp
 molecuilder_SOURCES += $(srcdir)/version.c
-molecuilder_LDADD = UIElements/libMolecuilderUI.a Actions/libMolecuilderActions.a libmolecuilder.a libparser.a libgslwrapper.a $(BOOST_LIB) ${BOOST_THREAD_LIB} ${BOOST_PROGRAM_OPTIONS_LIB}
+molecuilder_LDADD = UIElements/libMolecuilderUI.a Actions/libMolecuilderActions.a libmolecuilderbase.a libmolecuilder.a libparser.a libgslwrapper.a $(BOOST_LIB) ${BOOST_THREAD_LIB} ${BOOST_PROGRAM_OPTIONS_LIB}
 
 #Stuff for building the GUI using QT
@@ -321 +317 @@
 molecuildergui_CXXFLAGS = ${QT_CXXFLAGS} ${GLU_CXXFLAGS} -DUSE_GUI_QT
 molecuildergui_LDFLAGS = $(BOOST_LIB) ${QT_LDFLAGS} ${GLU_LDFLAGS}
-molecuildergui_LDADD = UIElements/libMolecuilderUI.a Actions/libMolecuilderActions.a libmolecuilder.a libparser.a libgslwrapper.a $(BOOST_LIB) ${BOOST_THREAD_LIB} ${BOOST_PROGRAM_OPTIONS_LIB}  ${GUI_LIBS}
+molecuildergui_LDADD = UIElements/libMolecuilderUI.a Actions/libMolecuilderActions.a libmolecuilderbase.a libmolecuilder.a libparser.a libgslwrapper.a $(BOOST_LIB) ${BOOST_THREAD_LIB} ${BOOST_PROGRAM_OPTIONS_LIB}  ${GUI_LIBS}
 
 joiner_SOURCES = joiner.cpp datacreator.cpp parser.cpp datacreator.hpp helpers.hpp parser.hpp periodentafel.hpp
-joiner_LDADD = libmolecuilder.a $(BOOST_LIB) ${BOOST_THREAD_LIB}
+joiner_LDADD = libmolecuilder.a libmolecuilderbase.a $(BOOST_LIB) ${BOOST_THREAD_LIB}
 
 analyzer_SOURCES = analyzer.cpp datacreator.cpp parser.cpp helpers.hpp periodentafel.hpp parser.hpp datacreator.hpp 
-analyzer_LDADD = libmolecuilder.a $(BOOST_LIB) ${BOOST_THREAD_LIB}
+analyzer_LDADD = libmolecuilder.a libmolecuilderbase.a $(BOOST_LIB) ${BOOST_THREAD_LIB}
+
+unity_SOURCES = unity.cpp $(srcdir)/version.c
+unity_LDADD = $(BOOST_LIB) ${BOOST_THREAD_LIB} ${BOOST_PROGRAM_OPTIONS_LIB}
 
 #Rules needed for QT4
@@ -333 +332 @@
 # 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"; \
@@ -339 +339 @@
         $(MOC) $(srcdir)/$$header -o $$target \
         || eval $$failcom; \
+        echo "#include \"$$target\"" >> allmocs.moc.cpp; \
         done;
 
-MOSTLYCLEANFILES = ${QTUIMOC_TARGETS}
+unity.cpp: ${LINALGSOURCE} ${LINALGHEADER} ${SOURCE} ${HEADER}
+        echo "" >  unity.cpp; \
+        list='$(BASESOURCE)'; for file in $$list; do \
+          echo "#include \"$(srcdir)/$$file\"" >> unity.cpp; \
+        done; \
+        list='$(LINALGSOURCE)'; for file in $$list; do \
+          echo "#include \"$(srcdir)/$$file\"" >> unity.cpp; \
+        done; \
+        list='$(SOURCE)'; 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;
+
+MOSTLYCLEANFILES = allmocs.moc.cpp unity.cpp 
         
 #EXTRA_DIST = ${molecuilder_DATA}