Changeset 353326


Ignore:
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
Location:
src
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • src/Atom/unittests/Makefile.am

    r474c62 r353326  
    2121
    2222ATOMTESTLIBS = \
    23         ../libMolecuilderUI.la \
    24         ../libMolecuilderActions.la \
    25         ../libMolecuilderParser.la \
    26         ../libMolecuilder.la \
    27         ../libMolecuilderShapes.la
    28 if CONDJOBMARKET
    29 ATOMTESTLIBS += \
    30         ../libMolecuilderJobs.la
    31 endif
     23        ../libMolecuilderUI.la
    3224ATOMTESTLIBS += \
    3325        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    34         ../libMolecuilderRandomNumbers.la \
    35         ${CodePatterns_LIBS}
    36 
     26        ${CodePatterns_LIBS} \
     27        $(BOOST_LIB)
    3728
    3829AtomObserverUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \

  • src/Descriptors/unittests/Makefile.am

    r474c62 r353326  
    1919
    2020DESCRIPTORLIBS = \
    21         ../libMolecuilderUI.la \
    22         ../libMolecuilderActions.la \
    23         ../libMolecuilderParser.la \
    24         ../libMolecuilder.la \
    25         ../libMolecuilderShapes.la
     21        ../libMolecuilderUI.la
    2622if CONDJOBMARKET
    2723DESCRIPTORLIBS += \
    … …  
    3026DESCRIPTORLIBS += \
    3127        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    32         ../libMolecuilderRandomNumbers.la \
    33         ${CodePatterns_LIBS}
     28        ${CodePatterns_LIBS} \
     29        $(BOOST_LIB)
    3430
    3531

  • src/Filling/unittests/Makefile.am

    r474c62 r353326  
    4444        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    4545        ${CodePatterns_LIBS} \
    46         $(BOOST_LIBS)
     46        $(BOOST_LIB)
    4747
    4848ClusterUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \

  • src/Fragmentation/Summation/unittests/Makefile.am

    r474c62 r353326  
    4949IndexSetContainerUnitTest_LDADD = \
    5050        ../libMolecuilderFragmentation.la \
     51        ../libMolecuilderFragmentation_KeysetsContainer.la \
    5152        ../libMolecuilderHelpers.la \
    5253        ${FRAGMENTATIONSUMMATIONLIBS}

  • src/Jobs/unittests/Makefile.am

    r474c62 r353326  
    1919        ../libMolecuilderJobs.la \
    2020        ../libMolecuilderFragmentationContainers.la \
     21        ../libMolecuilderFragmentationSummation.la \
    2122        $(JobMarket_LIBS) \
    2223        $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \

  • src/Makefile.am

    r474c62 r353326  
    222222noinst_LTLIBRARIES += libMolecuilder.la
    223223libMolecuilder_la_includedir = $(includedir)/MoleCuilder/
     224libMolecuilder_la_LDFLAGS = \
     225        $(AM_LDFLAGS) \
     226        $(CodePatterns_LDFLAGS) \
     227        $(BOOST_SYSTEM_LDFLAGS) \
     228        $(BOOST_THREAD_LDFLAGS)
     229libMolecuilder_la_LIBADD = \
     230        libMolecuilderShapes.la \
     231        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     232        ${CodePatterns_LIBS} \
     233        $(BOOST_SERIALIZATION_LIBS) \
     234        $(BOOST_PROGRAM_OPTIONS_LIBS) \
     235        $(BOOST_FILESYSTEM_LIBS) \
     236        $(BOOST_SYSTEM_LIBS) \
     237        $(BOOST_THREAD_LIBS)
    224238
    225239nobase_libMolecuilder_la_include_HEADERS = ${MOLECUILDERHEADER}
    … …  
    322336        builder_init.cpp \
    323337        builder_init.hpp \
    324         cleanUp.cpp \
    325         cleanUp.hpp \
    326338        PythonScripting.hpp
    327339molecuilder_LDADD = \
    … …  
    359371        builder_init.cpp \
    360372        builder_init.hpp \
    361         cleanUp.cpp \
    362         cleanUp.hpp \
    363373        PythonScripting.hpp
    364374molecuildergui_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_GUI_QT
    … …  
    404414joiner_LDFLAGS = $(AM_LDFLAGS) $(BOOST_THREAD_LDFLAGS)
    405415joiner_LDADD = \
    406         libMolecuilderFragmentation_getFromKeysetStub.la \
    407416        libMolecuilderFragmentation.la \
    408417        libMolecuilderFragmentation_KeysetsContainer.la \
    … …  
    417426analyzer_LDFLAGS = $(AM_LDFLAGS) $(BOOST_THREAD_LDFLAGS)
    418427analyzer_LDADD = \
    419         libMolecuilderFragmentation_getFromKeysetStub.la \
    420428        libMolecuilderFragmentation.la \
    421429        libMolecuilderFragmentation_KeysetsContainer.la \
    … …  
    456464        libMolecuilderFragmentation_getFromKeysetStub.la \
    457465        libMolecuilderFragmentation.la \
     466        libMolecuilderFragmentation_KeysetsContainer.la \
    458467        libMolecuilderHelpers.la \
    459468        $(JobMarket_Controller_LIBS) \

  • src/UIElements/CommandLineUI/unittests/Makefile.am

    r474c62 r353326  
    1919  ../UIElements/CommandLineUI/unittests/CommandLineParser_ActionRegistry_ConsistencyUnitTest.hpp
    2020CommandLineParser_ActionRegistry_ConsistencyUnitTest_LDADD = \
    21   ../libMolecuilderUI.la \
    22   ../libMolecuilderActions.la \
    23   ../libMolecuilderGraph.la \
    24   ../libMolecuilder.la \
    25   ../libMolecuilderParser.la \
    26   ../libMolecuilderShapes.la
     21  ../libMolecuilderUI.la
    2722if CONDJOBMARKET
    2823CommandLineParser_ActionRegistry_ConsistencyUnitTest_LDADD += \
    … …  
    3126CommandLineParser_ActionRegistry_ConsistencyUnitTest_LDADD += \
    3227  $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    33   ../libMolecuilderRandomNumbers.la \
    34   ${CodePatterns_LIBS}
    35 #  $(BOOST_LIB)
     28  ${CodePatterns_LIBS} \
     29  $(BOOST_LIB)
    3630
    3731#AUTOMAKE_OPTIONS = parallel-tests

  • src/UIElements/Makefile.am

    r474c62 r353326  
    295295## from each source file.  Note that it is not necessary to list header files
    296296## which are already listed elsewhere in a _HEADERS variable assignment.
    297 libMolecuilderUI_la_SOURCES = ${UISOURCE}
     297libMolecuilderUI_la_SOURCES = \
     298        ${UISOURCE} \
     299        cleanUp.cpp \
     300        cleanUp.hpp
    298301
    299302## Instruct libtool to include ABI version information in the generated shared

  • src/UIElements/Menu/unittests/Makefile.am

    r474c62 r353326  
    1818noinst_PROGRAMS += $(UIELEMENTSMENUTESTS)
    1919
    20 MENULIBS =
    21 #  $(BOOST_LIB)
    22 
     20MENULIBS = \
     21  ../libMolecuilderUI.la
     22if CONDJOBMARKET
     23MENULIBS += \
     24        ../libMolecuilderJobs.la
     25endif
     26MENULIBS += \
     27  $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     28  ${CodePatterns_LIBS} \
     29  $(BOOST_LIB)
    2330
    2431MenuDescriptionUnitTest_SOURCES =  $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    … …  
    3441  ../UIElements/Menu/unittests/MenuDescription_ActionRegistry_ConsistencyUnitTest.hpp
    3542MenuDescription_ActionRegistry_ConsistencyUnitTest_LDADD = \
    36   ../libMolecuilderUI.la \
    37   ../libMolecuilderActions.la \
    38   ../libMolecuilderGraph.la \
    39   ../libMolecuilder.la \
    40   ../libMolecuilderParser.la \
    41   ../libMolecuilderShapes.la
    42 if CONDJOBMARKET
    43 MenuDescription_ActionRegistry_ConsistencyUnitTest_LDADD += \
    44         ../libMolecuilderJobs.la
    45 endif
    46 MenuDescription_ActionRegistry_ConsistencyUnitTest_LDADD += \
    47   $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    48   ../libMolecuilderRandomNumbers.la \
    49   ${CodePatterns_LIBS}
    50 
    51 #  $(BOOST_LIB)
     43        $(MENULIBS)
    5244
    5345

  • src/unittests/Makefile.am

    r474c62 r353326  
    4141INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src
    4242
    43 AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
     43AM_LDFLAGS = \
     44        ${CodePatterns_LIBS} \
     45        $(CPPUNIT_LIBS) \
     46        -ldl
    4447AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
    4548
    … …  
    6972        $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_FILESYSTEM_LIBS) \
    7073        $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
    71         $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS)
     74        $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
     75        $(BOOST_THREAD_LDFLAGS) $(BOOST_THREAD_LIBS)
    7276
    7377GENERALLIBS = \
    7478        ../libMolecuilder.la \
    75         ../libMolecuilderHelpers.la \
    7679        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    7780        ${CodePatterns_LIBS} \
    … …  
    7982
    8083ALLLIBS = \
    81         ../libMolecuilderFilling.la \
    82         ../libMolecuilderUI.la \
    83         ../libMolecuilder.la
     84        ../libMolecuilderUI.la
    8485if CONDJOBMARKET
    8586ALLLIBS += \
    … …  
    156157        ../libMolecuilderHelpers.la \
    157158        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    158         ${CodePatterns_LIBS}
     159        ${CodePatterns_LIBS} \
     160        $(BOOST_LIB)
    159161
    160162AtomIdSetUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    … …  
    185187        MoleculeUnitTest.cpp \
    186188        MoleculeUnitTest.hpp
    187 MoleculeUnitTest_LDADD = $(ALLLIBS)
     189MoleculeUnitTest_LDADD = \
     190        $(ALLLIBS) \
     191        ../libMolecuilderShapes.la \
     192        ../libMolecuilderHelpers.la
    188193
    189194WorldTimeUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
Note: See TracChangeset for help on using the changeset viewer.