Changeset dda246

Timestamp:

Mar 7, 2011, 11:40:27 AM (14 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:

2d4334

Parents:

d09093

git-author:

Frederik Heber <heber@…> (03/01/11 23:23:25)

git-committer:

Frederik Heber <heber@…> (03/07/11 11:40:27)

Message:

Made Helpers into commodity library to prevent double inclusion.

• This is also preparatory for Makefile refactoring.

Files:

• configure.ac (modified) (1 diff)
• src/Helpers/Makefile.am (added)
• src/LinearAlgebra/Makefile.am (modified) (3 diffs)
• src/LinearAlgebra/unittests/Makefile.am (modified) (1 diff)
• src/Makefile.am (modified) (10 diffs)
• src/Shapes/unittests/Makefile.am (modified) (1 diff)
• src/unittests/Makefile.am (modified) (1 diff)

configure.ac

@@ -222 +222 @@
         src/Exceptions/Makefile
   src/Graph/Makefile
+  src/Helpers/Makefile
         src/LinearAlgebra/Makefile
         src/Parser/Makefile

src/LinearAlgebra/Makefile.am

@@ -8 +8 @@
 
 LINALGSOURCE = \
-  ../Helpers/defs.cpp \
-  ../Helpers/helpers.cpp \
   BoxVector.cpp \
   Eigenspace.cpp \
@@ -29 +27 @@
                            
 LINALGHEADER = \
-  ../Helpers/defs.hpp \
-  ../Helpers/helpers.hpp \
   BoxVector.hpp \
   Eigenspace.hpp \
@@ -53 +49 @@
 libMolecuilderLinearAlgebra_la_includedir = $(includedir)/MoleCuilder/LinearAlgebra/
 libMolecuilderLinearAlgebra_la_LIBADD = \
+  ../Helpers/libMolecuilderHelpers.la \
         ../Exceptions/libMolecuilderExceptions.la \
         ../RandomNumbers/libMolecuilderRandomNumbers.la \

src/LinearAlgebra/unittests/Makefile.am

@@ -23 +23 @@
 BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
 GSLLIBS = \
+        ../../Helpers/libMolecuilderHelpers.la \
         ../../LinearAlgebra/libMolecuilderLinearAlgebra.la \
         ../../Exceptions/libMolecuilderExceptions.la \

src/Makefile.am

@@ -3 +3 @@
 
 SUBDIRS = \
+  Helpers \
         Exceptions \
         RandomNumbers \
@@ -12 +13 @@
         UIElements
 
+AM_LDFLAGS = -ldl
 AM_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
 
@@ -193 +195 @@
   ${THERMOSTATSOURCE} \
   ${TESSELATIONSOURCE} \
-  Helpers/defs.cpp \
-  Helpers/helpers.cpp \
   boundary.cpp \
   Box.cpp \
@@ -230 +230 @@
   ${THERMOSTATHEADER} \
   ${TESSELATIONHEADER} \
-  Helpers/defs.hpp \
-  Helpers/fast_functions.hpp \
-  Helpers/helpers.hpp \
   boundary.hpp \
   Box.hpp \
@@ -257 +254 @@
         LinearAlgebra/libMolecuilderLinearAlgebra.la \
         Graph/libMolecuilderGraph.la \
+        Helpers/libMolecuilderHelpers.la \
         ${CodePatterns_LIBS} \
         ${BOOST_PROGRAM_OPTIONS_LIB}
@@ -313 +311 @@
 
 SubspaceFactorizer_CXXFLAGS = $(BOOST_CPPFLAGS)
-SubspaceFactorizer_SOURCES = SubspaceFactorizer.cpp Helpers/defs.cpp Helpers/defs.hpp Helpers/helpers.cpp Helpers/helpers.hpp
+SubspaceFactorizer_SOURCES = SubspaceFactorizer.cpp
 SubspaceFactorizer_LDADD = \
         LinearAlgebra/libMolecuilderLinearAlgebra.la \
         Exceptions/libMolecuilderExceptions.la \
+        Helpers/libMolecuilderHelpers.la \
         ${CodePatterns_LIBS} \
         $(GSLLIB) \
@@ -335 +334 @@
         Exceptions/libMolecuilderExceptions.la \
         RandomNumbers/libMolecuilderRandomNumbers.la \
+        Helpers/libMolecuilderHelpers.la \
         ${CodePatterns_LIBS} \
         $(BOOST_LIB)
@@ -357 +357 @@
         Exceptions/libMolecuilderExceptions.la \
         RandomNumbers/libMolecuilderRandomNumbers.la \
+        Helpers/libMolecuilderHelpers.la \
         ${CodePatterns_LIBS} \
         $(BOOST_LIB) \
@@ -372 +373 @@
         Exceptions/libMolecuilderExceptions.la \
         RandomNumbers/libMolecuilderRandomNumbers.la \
+        Helpers/libMolecuilderHelpers.la \
         ${CodePatterns_LIBS} \
         $(BOOST_LIB)
@@ -386 +388 @@
         Exceptions/libMolecuilderExceptions.la \
         RandomNumbers/libMolecuilderRandomNumbers.la \
+        Helpers/libMolecuilderHelpers.la \
         ${CodePatterns_LIBS} \
         $(BOOST_LIB)

src/Shapes/unittests/Makefile.am

@@ -19 +19 @@
         ../../LinearAlgebra/libMolecuilderLinearAlgebra.la \
         ../../Exceptions/libMolecuilderExceptions.la \
+        ../../Helpers/libMolecuilderHelpers.la \
         ${CodePatterns_LIBS} \
         $(BOOST_LIB)

src/unittests/Makefile.am

@@ -45 +45 @@
         ../Exceptions/libMolecuilderExceptions.la \
         ../RandomNumbers/libMolecuilderRandomNumbers.la \
+        ../Helpers/libMolecuilderHelpers.la \
         $(BOOST_LIB)
 ALLLIBS = \