Changeset 79de12 for src

Timestamp:

Sep 30, 2011, 8:19:37 AM (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:

fec381

Parents:

5a8f38

git-author:

Frederik Heber <heber@…> (05/10/11 12:35:11)

git-committer:

Frederik Heber <heber@…> (09/30/11 08:19:37)

Message:

Replaced *_boost_*.m4 by boost.m4 from tsuna.

• ​https://github.com/tsuna/boost.m4/ has a very nice boost m4 macro to check for presence of boost headers and libraries, also setting the rpath correctly.
• required changes in all Makefile.ams as BOOST_... variable names have changed.
• added all .m4 files to EXTRA_DIST.
• added Boost's LDFLAGS to libMolecuilderUI and ..QtUI's LDFLAGS such that libs in usual paths are found, too.

Location:

src

Files:

• Descriptors/unittests/Makefile.am (modified) (1 diff)
• Makefile.am (modified) (6 diffs)
• Parser/unittests/Makefile.am (modified) (1 diff)
• RandomNumbers/unittests/Makefile.am (modified) (1 diff)
• Shapes/unittests/Makefile.am (modified) (1 diff)
• UIElements/CommandLineUI/unittests/Makefile.am (modified) (1 diff)
• UIElements/Makefile.am (modified) (3 diffs)
• UIElements/Menu/unittests/Makefile.am (modified) (2 diffs)
• unittests/Makefile.am (modified) (2 diffs)

src/Descriptors/unittests/Makefile.am

@@ -26 +26 @@
         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
         ../libMolecuilderRandomNumbers.la \
-        ${CodePatterns_LIBS} \
-        $(BOOST_LIB)
+        ${CodePatterns_LIBS}
 
 

src/Makefile.am

@@ -268 +268 @@
 
 
-BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
 INCLUDES = -I$(top_srcdir)/src/unittests -I$(top_srcdir)/src/Actions -I$(top_srcdir)/src/UIElements -I$(top_srcdir)/LinearAlgebra/src
 
@@ -283 +282 @@
 molecuilder_CXXFLAGS = $(BOOST_CPPFLAGS)
 #molecuilder_CXXFLAGS += -DNO_CACHING
-molecuilder_LDFLAGS = $(BOOST_LIB)
+molecuilder_LDFLAGS = $(AM_LDFLAGS) $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_RANDOM_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS)
 molecuilder_SOURCES = builder.cpp builder_init.cpp builder_init.hpp
 molecuilder_LDADD = \
@@ -289 +288 @@
         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
         ${CodePatterns_LIBS} \
-        $(BOOST_LIB)
+        $(BOOST_THREAD_LIBS) \
+        $(BOOST_PROGRAM_OPTIONS_LIBS) \
+        $(BOOST_RANDOM_LIBS) \
+        $(BOOST_SYSTEM_LIBS) \
+        $(BOOST_FILESYSTEM_LIBS)
 
 #Stuff for building the GUI using Qt
 molecuildergui_SOURCES = builder.cpp builder_init.cpp builder_init.hpp
-molecuildergui_CXXFLAGS = $(BOOST_CPPFLAGS) -DUSE_GUI_QT
-molecuildergui_LDFLAGS = $(BOOST_LIB)
+molecuildergui_CXXFLAGS = $(AM_CPPFLAGS) -DUSE_GUI_QT
+molecuildergui_LDFLAGS = $(AM_LDFLAGS) $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS)
 molecuildergui_LDADD = \
         libMolecuilderQtUI.la \
@@ -300 +303 @@
         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
         ${CodePatterns_LIBS} \
-        $(BOOST_LIB) \
+        $(BOOST_THREAD_LIBS) \
+        $(BOOST_PROGRAM_OPTIONS_LIBS) \
+        $(BOOST_RANDOM_LIBS) \
+        $(BOOST_SYSTEM_LIBS) \
+        $(BOOST_FILESYSTEM_LIBS) \
         $(GUI_LIBS)
 
@@ -311 +318 @@
         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
         ${CodePatterns_LIBS} \
-        $(BOOST_LIB)
+        $(BOOST_THREAD_LIBS)
 
 analyzer_SOURCES = analyzer.cpp datacreator.cpp periodentafel.hpp datacreator.hpp 
@@ -321 +328 @@
         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
         ${CodePatterns_LIBS} \
-        $(BOOST_LIB)
+        $(BOOST_THREAD_LIBS)
 
 unity_SOURCES = unity.cpp
-unity_LDADD = $(BOOST_LIB)
+unity_LDADD = \
+        ${CodePatterns_LIBS} \
+        $(BOOST_THREAD_LIBS) \
+        $(BOOST_PROGRAM_OPTIONS_LIBS) \
+        $(BOOST_RANDOM_LIBS) \
+        $(BOOST_SYSTEM_LIBS) \
+        $(BOOST_FILESYSTEM_LIBS)
 
 

src/Parser/unittests/Makefile.am

@@ -31 +31 @@
         ../libMolecuilderUI.la \
         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
-        ${CodePatterns_LIBS} \
-        $(BOOST_LIB)
+        ${CodePatterns_LIBS}
+#       $(BOOST_LIB)
 
 

src/RandomNumbers/unittests/Makefile.am

@@ -30 +30 @@
 
 RANDOMNUMBERLIBS = \
-        ${CodePatterns_LIBS} \
-        $(BOOST_LIB)
+        ${CodePatterns_LIBS}
+#       $(BOOST_LIB)
 
 RandomNumberDistributionFactoryUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \

src/Shapes/unittests/Makefile.am

@@ -19 +19 @@
         ../libMolecuilderShapes.la \
         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
-        ${CodePatterns_LIBS} \
-        $(BOOST_LIB)
+        ${CodePatterns_LIBS}
+#       $(BOOST_LIB)
 
 ShapeUnittest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \

src/UIElements/CommandLineUI/unittests/Makefile.am

@@ -27 +27 @@
   $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
   ../libMolecuilderRandomNumbers.la \
-  ${CodePatterns_LIBS} \
-  $(BOOST_LIB)
+  ${CodePatterns_LIBS}
+#  $(BOOST_LIB)
 
 #AUTOMAKE_OPTIONS = parallel-tests

src/UIElements/Makefile.am

@@ -232 +232 @@
 libMolecuilderUI_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} ${QT_CXXFLAGS}
 libMolecuilderQtUI_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} ${QT_CXXFLAGS}
+libMolecuilderUI_la_LDFLAGS = $(AM_LDFLAGS) $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_RANDOM_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS)
+libMolecuilderQtUI_la_LDFLAGS = $(AM_LDFLAGS) $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_RANDOM_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS)
 # NOTE: ActionPrototypes BEFORE Actions!
 # this is to ensure that static Action prototypes are instantiated after
@@ -244 +246 @@
         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
         libMolecuilderRandomNumbers.la \
-        ${CodePatterns_LIBS} \
-        $(BOOST_LIB)
+        $(CodePatterns_LIBS) \
+        $(BOOST_FILESYSTEM_LIBS) \
+        $(BOOST_PROGRAM_OPTIONS_LIBS) \
+        $(BOOST_SYSTEM_LIBS)
+
 libMolecuilderQtUI_la_LIBADD = \
        ${QT_LIB_GUI} \
@@ -271 +276 @@
 ## library file (.so).  The library ABI version is defined in configure.ac, so
 ## that all version information is kept in one place.
-libMolecuilderUI_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
-#libMolecuilderQtUI_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
+libMolecuilderUI_la_LDFLAGS += -version-info $(MOLECUILDER_SO_VERSION)
+libMolecuilderQtUI_la_LDFLAGS += -version-info $(MOLECUILDER_SO_VERSION)
 
 ## The generated configuration header is installed in its own subdirectory of

src/UIElements/Menu/unittests/Makefile.am

@@ -18 +18 @@
 noinst_PROGRAMS += $(UIELEMENTSMENUTESTS)
 
-MENULIBS = \
-  $(BOOST_LIB)
+MENULIBS = 
+#  $(BOOST_LIB)
 
 
@@ -42 +42 @@
   $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
   ../libMolecuilderRandomNumbers.la \
-  ${CodePatterns_LIBS} \
-  $(BOOST_LIB)
+  ${CodePatterns_LIBS}
+
+#  $(BOOST_LIB)
 
 

src/unittests/Makefile.am

@@ -16 +16 @@
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src
 
-AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
+AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS)
 AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
 
@@ -43 +43 @@
 noinst_PROGRAMS += $(GENERALTESTS) TestRunner
 
-BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
+BOOST_LIB = $(BOOST_PROGRAM_OPTIONS_LIBS) $(BOOST_FILESYSTEM_LIBS) $(BOOST_SYSTEM_LIBS) $(BOOST_THREAD_LIBS)
 
 ALLLIBS = \