Changeset 353326 for src/unittests/Makefile.am

Timestamp:

Aug 12, 2013, 11:30:33 AM (11 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:

24e19e

Parents:

474c62

git-author:

Frederik Heber <heber@…> (08/05/13 13:36:27)

git-committer:

Frederik Heber <heber@…> (08/12/13 11:30:33)

Message:

FIX: Changed LIBADDs and LDADDs to get rid of libtool patching.

• with the new ubuntu version libtool is told not to pass through dependencies in a hierarchy of shared libraries. Thus, we have been using a small patch to tell libtool to pass nonetheless. However, this is not necessary if the structure is slightly changed:
  • cleanUp now resides with libMolecuilderUI.la instead of molecuilder and molecuildergui directly
  • added LIBADD to libMolecuilder.la with libMolecuilderShapes.la
  • fixed some unit tests LDADDs

File:

• src/unittests/Makefile.am (modified) (5 diffs)

src/unittests/Makefile.am

@@ -41 +41 @@
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src 
 
-AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
+AM_LDFLAGS = \
+        ${CodePatterns_LIBS} \
+        $(CPPUNIT_LIBS) \
+        -ldl
 AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
 
@@ -69 +72 @@
         $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_FILESYSTEM_LIBS) \
         $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
-        $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS)
+        $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
+        $(BOOST_THREAD_LDFLAGS) $(BOOST_THREAD_LIBS)
 
 GENERALLIBS = \
         ../libMolecuilder.la \
-        ../libMolecuilderHelpers.la \
         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
         ${CodePatterns_LIBS} \
@@ -79 +82 @@
 
 ALLLIBS = \
-        ../libMolecuilderFilling.la \
-        ../libMolecuilderUI.la \
-        ../libMolecuilder.la
+        ../libMolecuilderUI.la
 if CONDJOBMARKET
 ALLLIBS += \
@@ -156 +157 @@
         ../libMolecuilderHelpers.la \
         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
-        ${CodePatterns_LIBS}
+        ${CodePatterns_LIBS} \
+        $(BOOST_LIB)
 
 AtomIdSetUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
@@ -185 +187 @@
         MoleculeUnitTest.cpp \
         MoleculeUnitTest.hpp
-MoleculeUnitTest_LDADD = $(ALLLIBS)
+MoleculeUnitTest_LDADD = \
+        $(ALLLIBS) \
+        ../libMolecuilderShapes.la \
+        ../libMolecuilderHelpers.la
 
 WorldTimeUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \