Changeset 99689b for src/Makefile.am

Timestamp:

Mar 2, 2017, 7:25:41 AM (8 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_ChronosMutex, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, GeometryObjects, Gui_displays_atomic_force_velocity, IndependentFragmentGrids_IntegrationTest, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, RotateToPrincipalAxisSystem_UndoRedo, StoppableMakroAction, Subpackage_JobMarket, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, ThirdParty_MPQC_rebuilt_buildsystem, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, Ubuntu_1604_changes, stable

Children:

889d80

Parents:

2f5562

git-author:

Frederik Heber <heber@…> (11/16/16 09:03:27)

git-committer:

Frederik Heber <heber@…> (03/02/17 07:25:41)

Message:

FIX: Missing JobMarket_LDFLAGS in executables and unit tests.

File:

• src/Makefile.am (modified) (6 diffs)

src/Makefile.am

@@ -18 +18 @@
 # then comes the library itself
 
-AM_LDFLAGS = -ldl ${BOOST_LDFLAGS} ${CodePatterns_LDFLAGS}
+AM_LDFLAGS = -ldl ${BOOST_LDFLAGS} ${CodePatterns_LDFLAGS} ${JobMarket_LDFLAGS}
 AM_CPPFLAGS = \
         -I$(top_srcdir)/src/unittests \
@@ -191 +191 @@
 libMolecuilder_la_LDFLAGS = \
         $(AM_LDFLAGS) \
-        $(CodePatterns_LDFLAGS) \
         $(BOOST_SYSTEM_LDFLAGS) \
         $(BOOST_THREAD_LDFLAGS)
@@ -314 +313 @@
 molecuilder_LDFLAGS = \
         $(AM_LDFLAGS) \
-        $(CodePatterns_LDFLAGS) \
         $(BOOST_FILESYSTEM_LDFLAGS) \
         $(BOOST_PROGRAM_OPTIONS_LDFLAGS) \
@@ -412 +410 @@
 
 Controller_SOURCES = controller.cpp controller_AddOn_MPQCCommandJob.cpp
-Controller_LDFLAGS = $(AM_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) ${CodePatterns_LDFLAGS}
+Controller_LDFLAGS = $(AM_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
 Controller_CPPFLAGS = $(AM_CPPFLAGS) $(JobMarket_CFLAGS)
 Controller_LDADD = \
@@ -429 +427 @@
 
 PoolWorker_SOURCES = poolworker.cpp 
-PoolWorker_LDFLAGS = $(AM_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) ${CodePatterns_LDFLAGS}
+PoolWorker_LDFLAGS = $(AM_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
 PoolWorker_CPPFLAGS = $(AM_CPPFLAGS) $(JobMarket_CFLAGS)
 PoolWorker_LDADD = \
@@ -441 +439 @@
 
 Server_SOURCES = Server.cpp 
-Server_LDFLAGS = $(AM_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) ${CodePatterns_LDFLAGS}
+Server_LDFLAGS = $(AM_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
 Server_CPPFLAGS = $(AM_CPPFLAGS) $(JobMarket_CFLAGS)
 Server_LDADD = \