Changeset 8a4b88

Timestamp:

Jul 11, 2012, 2:33:16 PM (12 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:

b5c39c

Parents:

bd81f9

git-author:

Frederik Heber <heber@…> (07/11/12 14:32:13)

git-committer:

Frederik Heber <heber@…> (07/11/12 14:33:16)

Message:

DISTFIX: Bracketed libMolecuilderJobs in CONDJOBMARKET for libMolecuilderUI.

File:

• src/UIElements/Makefile.am (modified) (3 diffs)

src/UIElements/Makefile.am

@@ -269 +269 @@
         $(BOOST_PROGRAM_OPTIONS_LDFLAGS) \
         $(BOOST_RANDOM_LDFLAGS) \
-        $(BOOST_SERIALIZATION_LDFLAGS) 
+        $(BOOST_SERIALIZATION_LDFLAGS) \
         $(BOOST_SYSTEM_LDFLAGS) \
         $(BOOST_THREAD_LDFLAGS)
@@ -276 +276 @@
 # this is to ensure that static Action prototypes are instantiated after
 # ActionRegistry is present.
-libMolecuilderUI_la_LIBADD = \
+libMolecuilderUI_la_LIBADD =
+
+if CONDJOBMARKET
+libMolecuilderUI_la_LIBADD += \
+        libMolecuilderJobs.la \
+        ${JobMarket_Controller_LIBS}
+endif
+libMolecuilderUI_la_LIBADD += \
         libMolecuilderActionPrototypes.la \
         libMolecuilderActions.la \
@@ -291 +298 @@
         libMolecuilderHelpers.la \
         libMolecuilderElement.la \
-        libMolecuilderJobs.la \
+        libMolecuilderRandomNumbers.la
+libMolecuilderUI_la_LIBADD += \
         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
-        libMolecuilderRandomNumbers.la
-if CONDJOBMARKET
-libMolecuilderUI_la_LIBADD += ${JobMarket_Controller_LIBS}
-endif
-libMolecuilderUI_la_LIBADD += \
         ${CodePatterns_LIBS} \
         $(BOOST_SERIALIZATION_LIBS) \