Changeset fd4d5e for src/Fragmentation

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.

File:

• src/Fragmentation/Automation/Makefile.am (modified) (4 diffs)

src/Fragmentation/Automation/Makefile.am

@@ -10 +10 @@
 noinst_PROGRAMS =
 noinst_LTLIBRARIES =
+lib_LTLIBRARIES =
 
 # PLEASE adhere to the alphabetical ordering in this Makefile!
@@ -41 +42 @@
   Operations/AsyncOperation.cpp \
   Operations/OperationQueue.cpp \
+  Operations/OperationRegistry.cpp \
   Operations/SyncOperation.cpp \
   Operations/Controllers/CheckResultsOperation.cpp \
@@ -60 +62 @@
   Operations/Operation.hpp \
   Operations/OperationQueue.hpp \
+  Operations/OperationRegistry.hpp \
   Operations/SyncOperation.hpp \
   Operations/Controllers/CheckResultsOperation.hpp \
@@ -100 +103 @@
 libMolecuilderFragmentationAutomationHelper_la_SOURCES = $(FRAGMENTATIONAUTOMATIONHELPERSOURCE)
 
+
+lib_LTLIBRARIES += libFragmentationAutomation.la
+# make libtool link with C++ linker
+nodist_EXTRA_libFragmentationAutomation_la_SOURCES = dummy.cpp
+libFragmentationAutomation_la_includedir = $(includedir)/MoleCuilder/FragmentationAutomation/
+libFragmentationAutomation_la_LIBADD = \
+        libMolecuilderFragmentJobs.la \
+        libMolecuilderFragmentationOperations.la \
+        libMolecuilderFragmentationAutomationHelper.la \
+        $(BOOST_ASIO_LDFLAGS) $(BOOST_ASIO_LIBS) \
+        $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LIBS) \
+        $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
+        $(BOOST_THREAD_LDFLAGS) $(BOOST_THREAD_LIBS) \
+        $(BOOST_IOSTREAMS_LDFLAGS) $(BOOST_IOSTREAMS_LIBS) \
+        $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_FILESYSTEM_LIBS) \
+        $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
+        ${CodePatterns_LIBS}
+nobase_libFragmentationAutomation_la_include_HEADERS = \
+        $(JOBSHEADER) \
+        $(OPERATIONSHEADER) \
+        $(HELPERHEADER) \
+        $(CONTROLLERHEADER) \
+        $(POOLWORKERHEADER) \
+        $(SERVERHEADER) \
+        $(WORKERHEADER)
+
+## Define the source file list for the "libexample-@MOLECUILDER_API_VERSION@.la"
+## target.  Note that @MOLECUILDER_API_VERSION@ is not interpreted by Automake and
+## will therefore be treated as if it were literally part of the target name,
+## and the variable name derived from that.
+## The file extension .cc is recognized by Automake, and makes it produce
+## rules which invoke the C++ compiler to produce a libtool object file (.lo)
+## from each source file.  Note that it is not necessary to list header files
+## which are already listed elsewhere in a _HEADERS variable assignment.
+libFragmentationAutomation_la_SOURCES = 
+
+## Instruct libtool to include ABI version information in the generated shared
+## library file (.so).  The library ABI version is defined in configure.ac, so
+## that all version information is kept in one place.
+libFragmentationAutomation_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
+
+## The generated configuration header is installed in its own subdirectory of
+## $(libdir).  The reason for this is that the configuration information put
+## into this header file describes the target platform the installed library
+## has been built for.  Thus the file must not be installed into a location
+## intended for architecture-independent files, as defined by the Filesystem
+## Hierarchy Standard (FHS).
+## The nodist_ prefix instructs Automake to not generate rules for including
+## the listed files in the distribution on 'make dist'.  Files that are listed
+## in _HEADERS variables are normally included in the distribution, but the
+## configuration header file is generated at configure time and should not be
+## shipped with the source tarball.
+libFragmentationAutomation_libincludedir = $(includedir)/Fragmentation/Automation
+nobase_libFragmentationAutomation_libinclude_HEADERS = \
+        $(JOBSHEADER) \
+        $(OPERATIONSHEADER) \
+        $(HELPERHEADER) \
+        $(CONTROLLERHEADER) \
+        $(POOLWORKERHEADER) \
+        $(SERVERHEADER) \
+        $(WORKERHEADER) \
+        $(top_builddir)/libmolecuilder_config.h
+
+## Install the generated pkg-config file (.pc) into the expected location for
+## architecture-dependent package configuration information.  Occasionally,
+## pkg-config files are also used for architecture-independent data packages,
+## in which case the correct install location would be $(datadir)/pkgconfig.
+#pkgconfigdir = $(libdir)/pkgconfig
+#pkgconfig_DATA = $(top_builddir)/molecuilder.pc $(top_builddir)/molecuilder-debug.pc
+
 include unittests/Makefile.am