Changeset 1dc209 for src


Ignore:
Timestamp:
May 17, 2012, 3:21:14 PM (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:
73d6fc
Parents:
5adb84
git-author:
Frederik Heber <heber@…> (12/11/11 15:24:20)
git-committer:
Frederik Heber <heber@…> (05/17/12 15:21:14)
Message:

Enhanced libMolecuilderFragmentationAutomation in Fragmentation/Automation/Makefile.am.

  • libMolecuilderFragmentationAutomation needs to occur after (above) libMolecuilderFragmentJobs.
  • FragmentController sources now contained in ...Automation.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/Fragmentation/Automation/Makefile.am

    r5adb84 r1dc209  
    2626noinst_LTLIBRARIES += libMolecuilderFragmentJobs.la
    2727libMolecuilderFragmentJobs_la_includedir = $(includedir)/MoleCuilder/Fragmentation/Automation/
    28 nobase_libMolecuilderFragmentJobs_la_include_HEADERS = ${FRAGMENTJOBSHEADER}
    29 libMolecuilderFragmentJobs_la_SOURCES = ${FRAGMENTJOBSSOURCE}
     28nobase_libMolecuilderFragmentJobs_la_include_HEADERS = $(FRAGMENTJOBSHEADER)
     29libMolecuilderFragmentJobs_la_SOURCES = $(FRAGMENTJOBSSOURCE)
    3030
    3131FRAGMENTATIONAUTOMATIONSOURCE = \
    32   atexit.cpp
     32  atexit.cpp \
     33  FragmentController.cpp
    3334
    3435FRAGMENTATIONAUTOMATIONHEADER = \
    35   atexit.hpp
     36  atexit.hpp \
     37  Connection.hpp \
     38  ControllerChoices.hpp \
     39  FragmentController.hpp
    3640
    3741noinst_LTLIBRARIES += libMolecuilderFragmentationAutomation.la
    3842libMolecuilderFragmentationAutomation_la_includedir = $(includedir)/MoleCuilder/Fragmentation/Automation/
    39 nobase_libMolecuilderFragmentationAutomation_la_include_HEADERS = ${FRAGMENTATIONAUTOMATIONHEADER}
    40 libMolecuilderFragmentationAutomation_la_SOURCES = ${FRAGMENTATIONAUTOMATIONSOURCE}
     43nobase_libMolecuilderFragmentationAutomation_la_include_HEADERS = $(FRAGMENTATIONAUTOMATIONHEADER)
     44libMolecuilderFragmentationAutomation_la_SOURCES = $(FRAGMENTATIONAUTOMATIONSOURCE)
    4145
    4246include unittests/Makefile.am
    … …  
    4751bin_PROGRAMS += JobAdder ResultChecker ResultGetter Server Shutdowner Worker
    4852
    49 CONTROLLERSOURCE = \
    50   FragmentController.cpp
     53CONTROLLERSOURCE =
    5154
    5255CONTROLLERHEADER = \
    53   Connection.hpp \
    54   ControllerChoices.hpp \
    5556  FragmentController.hpp
    5657
    … …  
    7576JobAdder_CXXFLAGS = $(AM_CPPFLAGS)
    7677JobAdder_LDADD = \
     78  libMolecuilderFragmentationAutomation.la \
    7779  libMolecuilderFragmentJobs.la \
    78   libMolecuilderFragmentationAutomation.la \
    7980  $(BOOST_ASIO_LIBS) \
    8081  $(BOOST_SERIALIZATION_LIBS) \
    … …  
    8788ResultChecker_CXXFLAGS = $(AM_CPPFLAGS)
    8889ResultChecker_LDADD = \
     90  libMolecuilderFragmentationAutomation.la \
    8991  libMolecuilderFragmentJobs.la \
    90   libMolecuilderFragmentationAutomation.la \
    9192  $(BOOST_ASIO_LIBS) \
    9293  $(BOOST_SERIALIZATION_LIBS) \
    … …  
    99100ResultGetter_CXXFLAGS = $(AM_CPPFLAGS)
    100101ResultGetter_LDADD = \
     102  libMolecuilderFragmentationAutomation.la \
    101103  libMolecuilderFragmentJobs.la \
    102   libMolecuilderFragmentationAutomation.la \
    103104  $(BOOST_ASIO_LIBS) \
    104105  $(BOOST_SERIALIZATION_LIBS) \
    … …  
    111112Server_CXXFLAGS = $(AM_CPPFLAGS)
    112113Server_LDADD = \
     114  libMolecuilderFragmentationAutomation.la \
    113115  libMolecuilderFragmentJobs.la \
    114   libMolecuilderFragmentationAutomation.la \
    115116  $(BOOST_ASIO_LIBS) \
    116117  $(BOOST_SERIALIZATION_LIBS) \
    … …  
    123124Shutdowner_CXXFLAGS = $(AM_CPPFLAGS)
    124125Shutdowner_LDADD = \
     126  libMolecuilderFragmentationAutomation.la \
    125127  libMolecuilderFragmentJobs.la \
    126   libMolecuilderFragmentationAutomation.la \
    127128  $(BOOST_ASIO_LIBS) \
    128129  $(BOOST_SERIALIZATION_LIBS) \
    … …  
    135136Worker_CXXFLAGS = $(AM_CPPFLAGS)
    136137Worker_LDADD = \
     138  libMolecuilderFragmentationAutomation.la \
    137139  libMolecuilderFragmentJobs.la \
    138   libMolecuilderFragmentationAutomation.la \
    139140  $(BOOST_ASIO_LIBS) \
    140141  $(BOOST_SERIALIZATION_LIBS) \
Note: See TracChangeset for help on using the changeset viewer.