Changeset e4decc

Timestamp:

Oct 22, 2010, 4:12:42 PM (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:

6f5dfe

Parents:

94962c

Message:

Changed a bit the sequence of adding BOOST_LIBs.

Files:

• configure.ac (modified) (1 diff)
• src/Makefile.am (modified) (6 diffs)
• src/unittests/Makefile.am (modified) (2 diffs)

configure.ac

@@ -38 +38 @@
 AX_BOOST_BASE([1.40])
 AX_BOOST_PROGRAM_OPTIONS
-#AX_BOOST_FOREACH
 AX_BOOST_FILESYSTEM
 AX_BOOST_THREAD

src/Makefile.am

@@ -289 +289 @@
 
 
-BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB)
+BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_THREAD_LIB)
 GUI_LIBS = ${QT_LDADD} ${QT_LIB_GUI} -lQtOpenGL ${GLU_LIBS}
 INCLUDES = -I$(top_srcdir)/src/unittests -I$(top_srcdir)/src/Actions -I$(top_srcdir)/src/UIElements
@@ -315 +315 @@
         Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la \
         Helpers/libMolecuilderHelpers-@MOLECUILDER_API_VERSION@.la \
-        $(BOOST_LIB) \
-        ${BOOST_THREAD_LIB} \
-        ${BOOST_PROGRAM_OPTIONS_LIB}
-
+        $(BOOST_LIB)
 
 #Stuff for building the GUI using QT
@@ -326 +323 @@
 
 unity_SOURCES = unity.cpp
-unity_LDADD = $(BOOST_LIB) ${BOOST_THREAD_LIB} ${BOOST_PROGRAM_OPTIONS_LIB}
+unity_LDADD = $(BOOST_LIB)
 
 molecuildergui_LDADD = \
@@ -337 +334 @@
         Helpers/libMolecuilderHelpers-@MOLECUILDER_API_VERSION@.la \
         $(BOOST_LIB) \
-        ${BOOST_THREAD_LIB} \
-        ${BOOST_PROGRAM_OPTIONS_LIB} \
         ${GUI_LIBS}
 
@@ -350 +345 @@
         Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la \
         Helpers/libMolecuilderHelpers-@MOLECUILDER_API_VERSION@.la \
-        $(BOOST_LIB) \
-        ${BOOST_THREAD_LIB} \
-        ${BOOST_PROGRAM_OPTIONS_LIB}
+        $(BOOST_LIB)
 
 analyzer_SOURCES = analyzer.cpp datacreator.cpp periodentafel.hpp datacreator.hpp 
@@ -363 +356 @@
         Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la \
         Helpers/libMolecuilderHelpers-@MOLECUILDER_API_VERSION@.la \
-        $(BOOST_LIB) \
-        ${BOOST_THREAD_LIB} \
-        ${BOOST_PROGRAM_OPTIONS_LIB}
+        $(BOOST_LIB)
 
 #Rules needed for QT4

src/unittests/Makefile.am

@@ -49 +49 @@
 noinst_PROGRAMS = $(TESTS) TestRunner
 
+BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_THREAD_LIB)
 GSLLIBS = \
         ../LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la \
         ../Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la \
         ../Helpers/libMolecuilderHelpers-@MOLECUILDER_API_VERSION@.la \
-        $(BOOST_LIB) \
-        ${BOOST_THREAD_LIB}
+        $(BOOST_LIB)
 ALLLIBS = \
         ../UIElements/libMolecuilderUI-@MOLECUILDER_API_VERSION@.la \
@@ -60 +60 @@
         ${PARSERLIBS} \
         ../libMolecuilder-@MOLECUILDER_API_VERSION@.la \
-        ${GSLLIBS} \
-        ${BOOST_PROGRAM_OPTIONS_LIB}
+        ${GSLLIBS}
+
 PARSERLIBS = ../Parser/libMolecuilderParser-@MOLECUILDER_API_VERSION@.la
 UILIBS = ../UIElements/libMolecuilderUI-@MOLECUILDER_API_VERSION@.la