Changeset fd4d5e


Ignore:
Timestamp:
Jul 6, 2012, 10:18:46 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:
7546b0
Parents:
014bc4
git-author:
Frederik Heber <heber@…> (06/04/12 09:59:33)
git-committer:
Frederik Heber <heber@…> (07/06/12 10:18:46)
Message:

Added convenience libraries for Controller, Server, Pool, and PoolWorker.

  • added shared library libFragmentationAutomation.la.
  • Controller, Server, and PoolWorker now also depend on libCodePatterns and libboost_programoptions.
Location:
src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified src/Fragmentation/Automation/Makefile.am

    r014bc4 rfd4d5e  
    1010noinst_PROGRAMS =
    1111noinst_LTLIBRARIES =
     12lib_LTLIBRARIES =
    1213
    1314# PLEASE adhere to the alphabetical ordering in this Makefile!
    … …  
    4142  Operations/AsyncOperation.cpp \
    4243  Operations/OperationQueue.cpp \
     44  Operations/OperationRegistry.cpp \
    4345  Operations/SyncOperation.cpp \
    4446  Operations/Controllers/CheckResultsOperation.cpp \
    … …  
    6062  Operations/Operation.hpp \
    6163  Operations/OperationQueue.hpp \
     64  Operations/OperationRegistry.hpp \
    6265  Operations/SyncOperation.hpp \
    6366  Operations/Controllers/CheckResultsOperation.hpp \
    … …  
    100103libMolecuilderFragmentationAutomationHelper_la_SOURCES = $(FRAGMENTATIONAUTOMATIONHELPERSOURCE)
    101104
     105
     106lib_LTLIBRARIES += libFragmentationAutomation.la
     107# make libtool link with C++ linker
     108nodist_EXTRA_libFragmentationAutomation_la_SOURCES = dummy.cpp
     109libFragmentationAutomation_la_includedir = $(includedir)/MoleCuilder/FragmentationAutomation/
     110libFragmentationAutomation_la_LIBADD = \
     111        libMolecuilderFragmentJobs.la \
     112        libMolecuilderFragmentationOperations.la \
     113        libMolecuilderFragmentationAutomationHelper.la \
     114        $(BOOST_ASIO_LDFLAGS) $(BOOST_ASIO_LIBS) \
     115        $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LIBS) \
     116        $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
     117        $(BOOST_THREAD_LDFLAGS) $(BOOST_THREAD_LIBS) \
     118        $(BOOST_IOSTREAMS_LDFLAGS) $(BOOST_IOSTREAMS_LIBS) \
     119        $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_FILESYSTEM_LIBS) \
     120        $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
     121        ${CodePatterns_LIBS}
     122nobase_libFragmentationAutomation_la_include_HEADERS = \
     123        $(JOBSHEADER) \
     124        $(OPERATIONSHEADER) \
     125        $(HELPERHEADER) \
     126        $(CONTROLLERHEADER) \
     127        $(POOLWORKERHEADER) \
     128        $(SERVERHEADER) \
     129        $(WORKERHEADER)
     130
     131## Define the source file list for the "libexample-@MOLECUILDER_API_VERSION@.la"
     132## target.  Note that @MOLECUILDER_API_VERSION@ is not interpreted by Automake and
     133## will therefore be treated as if it were literally part of the target name,
     134## and the variable name derived from that.
     135## The file extension .cc is recognized by Automake, and makes it produce
     136## rules which invoke the C++ compiler to produce a libtool object file (.lo)
     137## from each source file.  Note that it is not necessary to list header files
     138## which are already listed elsewhere in a _HEADERS variable assignment.
     139libFragmentationAutomation_la_SOURCES =
     140
     141## Instruct libtool to include ABI version information in the generated shared
     142## library file (.so).  The library ABI version is defined in configure.ac, so
     143## that all version information is kept in one place.
     144libFragmentationAutomation_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
     145
     146## The generated configuration header is installed in its own subdirectory of
     147## $(libdir).  The reason for this is that the configuration information put
     148## into this header file describes the target platform the installed library
     149## has been built for.  Thus the file must not be installed into a location
     150## intended for architecture-independent files, as defined by the Filesystem
     151## Hierarchy Standard (FHS).
     152## The nodist_ prefix instructs Automake to not generate rules for including
     153## the listed files in the distribution on 'make dist'.  Files that are listed
     154## in _HEADERS variables are normally included in the distribution, but the
     155## configuration header file is generated at configure time and should not be
     156## shipped with the source tarball.
     157libFragmentationAutomation_libincludedir = $(includedir)/Fragmentation/Automation
     158nobase_libFragmentationAutomation_libinclude_HEADERS = \
     159        $(JOBSHEADER) \
     160        $(OPERATIONSHEADER) \
     161        $(HELPERHEADER) \
     162        $(CONTROLLERHEADER) \
     163        $(POOLWORKERHEADER) \
     164        $(SERVERHEADER) \
     165        $(WORKERHEADER) \
     166        $(top_builddir)/libmolecuilder_config.h
     167
     168## Install the generated pkg-config file (.pc) into the expected location for
     169## architecture-dependent package configuration information.  Occasionally,
     170## pkg-config files are also used for architecture-independent data packages,
     171## in which case the correct install location would be $(datadir)/pkgconfig.
     172#pkgconfigdir = $(libdir)/pkgconfig
     173#pkgconfig_DATA = $(top_builddir)/molecuilder.pc $(top_builddir)/molecuilder-debug.pc
     174
    102175include unittests/Makefile.am
    103176

  • TabularUnified src/Makefile.am

    r014bc4 rfd4d5e  
    88BUILT_SOURCES =
    99bin_PROGRAMS =
     10EXTRA_DIST =
    1011
    1112include Actions/Makefile.am
    … …  
    352353        $(BOOST_THREAD_LIBS)
    353354
     355CONTROLLERSOURCE = \
     356        controller_MPQCCommandJob.cpp \
     357        ControllerCommandRegistry.cpp \
     358        ControllerOptions.cpp \
     359        ControllerOptions_MPQCCommandJob.cpp \
     360        DefaultOptions.cpp \
     361                                Fragmentation/Automation/FragmentController.cpp
     362
     363CONTROLLERHEADER = \
     364        Fragmentation/Automation/Connection.hpp \
     365        controller_AddOn.hpp \
     366        controller_MPQCCommandJob.hpp \
     367        ControllerCommand.hpp \
     368        ControllerCommandRegistry.hpp \
     369        ControllerOptions.hpp \
     370        ControllerOptions_MPQCCommandJob.hpp \
     371        DefaultOptions.hpp \
     372                                Fragmentation/Automation/FragmentController.hpp
     373
     374EXTRA_DIST += \
     375        controller_AddOn_SystemCommandJob.cpp \
     376        controller_SystemCommandJob.cpp \
     377        controller_SystemCommandJob.hpp \
     378        ControllerOptions_SystemCommandJob.cpp \
     379        ControllerOptions_SystemCommandJob.hpp
     380       
     381
     382noinst_LTLIBRARIES += libFragmentationAutomationController.la
     383libFragmentationAutomationController_la_includedir = $(includedir)/MoleCuilder/JobMarket
     384nobase_libFragmentationAutomationController_la_include_HEADERS = $(CONTROLLERHEADER)
     385libFragmentationAutomationController_la_SOURCES = $(CONTROLLERSOURCE)
     386libFragmentationAutomationController_la_LIBADD = \
     387        $(top_builddir)/src/Fragmentation/Automation/libFragmentationAutomation.la
     388
     389POOLWORKERSOURCE = \
     390        DefaultOptions.cpp \
     391        Fragmentation/Automation/Pool/PoolWorker.cpp \
     392        SignalHandler.cpp \
     393        SignalOptions.cpp \
     394        WorkerOptions.cpp
     395
     396POOLWORKERHEADER = \
     397        DefaultOptions.hpp \
     398        Fragmentation/Automation/Connection.hpp \
     399        Fragmentation/Automation/Pool/PoolWorker.hpp \
     400        SignalHandler.hpp \
     401        SignalOptions.hpp \
     402        Fragmentation/Automation/WorkerChoices.hpp \
     403        WorkerOptions.hpp
     404
     405lib_LTLIBRARIES += libFragmentationAutomationPoolWorker.la
     406libFragmentationAutomationPoolWorker_la_includedir = $(includedir)/MoleCuilder/JobMarket
     407nobase_libFragmentationAutomationPoolWorker_la_include_HEADERS = $(POOLWORKERHEADER)
     408libFragmentationAutomationPoolWorker_la_SOURCES = $(POOLWORKERSOURCE)
     409libFragmentationAutomationPoolWorker_la_LIBADD = \
     410        $(top_builddir)/src/Fragmentation/Automation/libFragmentationAutomation.la
     411
     412POOLSOURCE = \
     413        Fragmentation/Automation/Pool/WorkerPool.cpp
     414
     415POOLHEADER = \
     416        Fragmentation/Automation/Pool/WorkerPool.hpp
     417
     418lib_LTLIBRARIES += libFragmentationAutomationPool.la
     419libFragmentationAutomationPool_la_includedir = $(includedir)/MoleCuilder/JobMarket
     420nobase_libFragmentationAutomationPool_la_include_HEADERS = $(POOLHEADER)
     421libFragmentationAutomationPool_la_SOURCES = $(POOLSOURCE)
     422
     423SERVERSOURCE = \
     424        DefaultOptions.cpp \
     425        Fragmentation/Automation/FragmentScheduler.cpp \
     426        ServerOptions.cpp \
     427        SignalHandler.cpp \
     428        SignalOptions.cpp
     429
     430SERVERHEADER = \
     431        DefaultOptions.hpp \
     432        Fragmentation/Automation/Connection.hpp \
     433        Fragmentation/Automation/ControllerChoices.hpp \
     434        Fragmentation/Automation/FragmentScheduler.hpp \
     435        ServerOptions.hpp \
     436        SignalHandler.hpp \
     437        SignalOptions.hpp
     438
     439noinst_LTLIBRARIES += libFragmentationAutomationServer.la
     440libFragmentationAutomationServer_la_includedir = $(includedir)/MoleCuilder/JobMarket
     441nobase_libFragmentationAutomationServer_la_include_HEADERS = $(SERVERHEADER)
     442libFragmentationAutomationServer_la_SOURCES = $(SERVERSOURCE)
     443libFragmentationAutomationServer_la_LIBADD = \
     444        $(top_builddir)/src/Fragmentation/Automation/libFragmentationAutomation.la
    354445
    355446bin_PROGRAMS += Controller PoolWorker Server
    356447
    357 CONTROLLERSOURCE = \
    358   Fragmentation/Automation/FragmentController.cpp \
    359   Fragmentation/Automation/Operations/OperationRegistry.cpp
    360 
    361 CONTROLLERHEADER = \
    362   Fragmentation/Automation/Connection.hpp \
    363   Fragmentation/Automation/FragmentController.hpp \
    364   Fragmentation/Automation/Operations/OperationRegistry.hpp
    365 
    366 POOLWORKERSOURCE = \
    367   Fragmentation/Automation/Pool/PoolWorker.cpp
    368 
    369 POOLWORKERHEADER = \
    370   Fragmentation/Automation/Connection.hpp \
    371   Fragmentation/Automation/Pool/PoolWorker.hpp
    372 
    373 SERVERSOURCE = \
    374   Fragmentation/Automation/FragmentScheduler.cpp \
    375   Fragmentation/Automation/Pool/WorkerPool.cpp
    376 
    377 SERVERHEADER = \
    378   Fragmentation/Automation/Connection.hpp \
    379   Fragmentation/Automation/ControllerChoices.hpp \
    380   Fragmentation/Automation/FragmentScheduler.hpp \
    381   Fragmentation/Automation/Pool/WorkerPool.hpp
    382 
    383 Controller_SOURCES = $(CONTROLLERSOURCE) $(CONTROLLERHEADER) controller.cpp controller_AddOn.hpp controller_AddOn_MPQCCommandJob.cpp controller_MPQCCommandJob.cpp controller_MPQCCommandJob.hpp ControllerCommand.hpp ControllerCommandRegistry.cpp ControllerCommandRegistry.hpp DefaultOptions.cpp DefaultOptions.hpp ControllerOptions.cpp ControllerOptions.hpp ControllerOptions_MPQCCommandJob.cpp ControllerOptions_MPQCCommandJob.hpp
    384 #controller_AddOn_SystemCommandJob.cpp controller_SystemCommandJob.cpp controller_SystemCommandJob.hpp ControllerOptions_SystemCommandJob.cpp ControllerOptions_SystemCommandJob.hpp
    385 Controller_LDFLAGS = $(AM_LDFLAGS) $(BOOST_PROGRAM__OPTIONS_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
     448Controller_SOURCES = controller.cpp controller_main.hpp controller_AddOn_MPQCCommandJob.cpp
     449Controller_LDFLAGS = $(AM_LDFLAGS)
    386450Controller_CXXFLAGS = $(AM_CPPFLAGS)
    387451Controller_LDADD = \
    388   libMolecuilderJobs.la \
    389   $(top_builddir)/src/Fragmentation/Automation/libMolecuilderFragmentationAutomationHelper.la \
    390   $(top_builddir)/src/Fragmentation/Automation/libMolecuilderFragmentationOperations.la \
    391   $(top_builddir)/src/Fragmentation/Automation/libMolecuilderFragmentJobs.la \
    392   libMolecuilderFragmentation.la \
    393   libMolecuilderHelpers.la \
    394   $(BOOST_ASIO_LIBS) \
    395   $(BOOST_SERIALIZATION_LIBS) \
    396   $(BOOST_PROGRAM_OPTIONS_LIBS) \
    397   $(BOOST_THREAD_LIBS) \
    398   $(BOOST_SYSTEM_LIBS) \
    399   ${CodePatterns_LIBS}
    400 
    401 PoolWorker_SOURCES = $(POOLWORKERSOURCE) $(POOLWORKERHEADER) poolworker.cpp DefaultOptions.cpp DefaultOptions.hpp SignalHandler.cpp SignalHandler.hpp SignalOptions.cpp SignalOptions.hpp WorkerOptions.cpp WorkerOptions.hpp
    402 PoolWorker_LDFLAGS = $(AM_LDFLAGS) $(BOOST_PROGRAM__OPTIONS_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS)
     452        libMolecuilderJobs.la \
     453        libFragmentationAutomationController.la \
     454        libMolecuilderFragmentation.la \
     455        libMolecuilderHelpers.la \
     456        $(top_builddir)/src/Fragmentation/Automation/libFragmentationAutomation.la \
     457        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     458        ${CodePatterns_LIBS} \
     459        $(BOOST_PROGRAM_OPTIONS_LIBS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
     460
     461PoolWorker_SOURCES = poolworker.cpp
     462PoolWorker_LDFLAGS = $(AM_LDFLAGS)
    403463PoolWorker_CXXFLAGS = $(AM_CPPFLAGS)
    404464PoolWorker_LDADD = \
    405   libMolecuilderJobs.la \
    406   $(top_builddir)/src/Fragmentation/Automation/libMolecuilderFragmentationAutomationHelper.la \
    407   $(top_builddir)/src/Fragmentation/Automation/libMolecuilderFragmentationOperations.la \
    408   $(top_builddir)/src/Fragmentation/Automation/libMolecuilderFragmentJobs.la \
    409   $(BOOST_ASIO_LIBS) \
    410   $(BOOST_SERIALIZATION_LIBS) \
    411   $(BOOST_PROGRAM_OPTIONS_LIBS) \
    412   $(BOOST_THREAD_LIBS) \
    413   $(BOOST_SYSTEM_LIBS) \
    414   ${CodePatterns_LIBS}
    415 
    416 Server_SOURCES = $(SERVERSOURCE) $(SERVERHEADER) Server.cpp DefaultOptions.cpp DefaultOptions.hpp SignalHandler.cpp SignalHandler.hpp SignalOptions.cpp SignalOptions.hpp ServerOptions.cpp ServerOptions.hpp
    417 Server_LDFLAGS = $(AM_LDFLAGS) $(BOOST_PROGRAM__OPTIONS_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS)
     465        libMolecuilderJobs.la \
     466        libFragmentationAutomationPoolWorker.la \
     467        $(top_builddir)/src/Fragmentation/Automation/libFragmentationAutomation.la \
     468        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     469        ${CodePatterns_LIBS} \
     470        $(BOOST_PROGRAM_OPTIONS_LIBS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
     471
     472Server_SOURCES = Server.cpp
     473Server_LDFLAGS = $(AM_LDFLAGS)
    418474Server_CXXFLAGS = $(AM_CPPFLAGS)
    419475Server_LDADD = \
    420   libMolecuilderJobs.la \
    421   $(top_builddir)/src/Fragmentation/Automation/libMolecuilderFragmentationAutomationHelper.la \
    422   $(top_builddir)/src/Fragmentation/Automation/libMolecuilderFragmentationOperations.la \
    423   $(top_builddir)/src/Fragmentation/Automation/libMolecuilderFragmentJobs.la \
    424   $(BOOST_ASIO_LIBS) \
    425   $(BOOST_SERIALIZATION_LIBS) \
    426   $(BOOST_PROGRAM_OPTIONS_LIBS) \
    427   $(BOOST_THREAD_LIBS) \
    428   $(BOOST_SYSTEM_LIBS) \
    429   ${CodePatterns_LIBS}
     476        libMolecuilderJobs.la \
     477        libFragmentationAutomationServer.la \
     478        libFragmentationAutomationPool.la \
     479        $(top_builddir)/src/Fragmentation/Automation/libFragmentationAutomation.la \
     480        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     481        ${CodePatterns_LIBS} \
     482        $(BOOST_PROGRAM_OPTIONS_LIBS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
    430483
    431484
    … …  
    452505        fi
    453506
    454 EXTRA_DIST = \
     507EXTRA_DIST += \
    455508        $(srcdir)/.git-version \
    456509        $(bondtable_DATA) \
Note: See TracChangeset for help on using the changeset viewer.