Changeset 9d4ff35

Timestamp:

Oct 17, 2011, 4:18:55 PM (13 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:

4ae823

Parents:

592be9

git-author:

Frederik Heber <heber@…> (09/20/11 09:40:55)

git-committer:

Frederik Heber <heber@…> (10/17/11 16:18:55)

Message:

Reduced library dependencies of RandomNumbers and BoxUnitTest.

Location:

src

Files:

• RandomNumbers/unittests/Makefile.am (modified) (1 diff)
• unittests/Makefile.am (modified) (2 diffs)

src/RandomNumbers/unittests/Makefile.am

@@ -30 +30 @@
 
 RANDOMNUMBERLIBS = \
-        ${CodePatterns_LIBS}
-#       $(BOOST_LIB)
+        ../libMolecuilderRandomNumbers.la \
+        ${CodePatterns_LIBS} \
+        $(BOOST_LIB)
 
 RandomNumberDistributionFactoryUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
         ../RandomNumbers/unittests/RandomNumberDistributionFactoryUnitTest.cpp \
         ../RandomNumbers/unittests/RandomNumberDistributionFactoryUnitTest.hpp
-RandomNumberDistributionFactoryUnitTest_LDADD = ${RANDOMNUMBERLIBS} \
-        ../libMolecuilderRandomNumbers.la
+RandomNumberDistributionFactoryUnitTest_LDADD = ${RANDOMNUMBERLIBS}
 
 RandomNumberEngineFactoryUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
         ../RandomNumbers/unittests/RandomNumberEngineFactoryUnitTest.cpp \
         ../RandomNumbers/unittests/RandomNumberEngineFactoryUnitTest.hpp
-RandomNumberEngineFactoryUnitTest_LDADD = ${RANDOMNUMBERLIBS} \
-        ../libMolecuilderRandomNumbers.la
+RandomNumberEngineFactoryUnitTest_LDADD = ${RANDOMNUMBERLIBS}
 
 RandomNumberGeneratorFactoryUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
         ../RandomNumbers/unittests/RandomNumberGeneratorFactoryUnitTest.cpp \
         ../RandomNumbers/unittests/RandomNumberGeneratorFactoryUnitTest.hpp
-RandomNumberGeneratorFactoryUnitTest_LDADD = ${RANDOMNUMBERLIBS} \
-        ../libMolecuilderRandomNumbers.la
+RandomNumberGeneratorFactoryUnitTest_LDADD = ${RANDOMNUMBERLIBS}
 
 RandomNumberGeneratorUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
         ../RandomNumbers/unittests/RandomNumberGeneratorUnitTest.cpp \
         ../RandomNumbers/unittests/RandomNumberGeneratorUnitTest.hpp
-RandomNumberGeneratorUnitTest_LDADD = ${RANDOMNUMBERLIBS} \
-        ../libMolecuilderRandomNumbers.la
+RandomNumberGeneratorUnitTest_LDADD = ${RANDOMNUMBERLIBS}
 
 

src/unittests/Makefile.am

@@ -42 +42 @@
         $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_FILESYSTEM_LIBS) \
         $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS)
+
+GENERALLIBS = \
+        ../libMolecuilder.la \
+        ../libMolecuilderHelpers.la \
+        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
+        ${CodePatterns_LIBS} \
+        $(BOOST_LIB)
 
 ALLLIBS = \
@@ -94 +101 @@
         BoxUnitTest.cpp \
         BoxUnitTest.hpp
-BoxUnitTest_LDADD = ${ALLLIBS}
+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}
+ListOfBondsUnitTest_LDADD = $(ALLLIBS)
 
 WorldTimeUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \