Changeset 049d4a for src

Timestamp:

Aug 15, 2013, 8:40:56 AM (11 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:

e8e472b

Parents:

134f43

git-author:

Frederik Heber <heber@…> (08/15/13 08:24:45)

git-committer:

Frederik Heber <heber@…> (08/15/13 08:40:56)

Message:

FIX: libMolecuilderUI's dependencies are now completely satisfied.

• we checked all shared libs it depends on and brought them in correct order.
• molecuilder, molecuildergui, and controller's LDADDs changed accordingly.
• FIX: libMolecuilderJobs's Makefile.am lacked the usual comment stuff at the end which resulted in undefined refs to VMGJob. Missing version info seemed to be the culprit.

Location:

src

Files:

• Jobs/Makefile.am (modified) (2 diffs)
• Makefile.am (modified) (4 diffs)
• UIElements/Makefile.am (modified) (2 diffs)

src/Jobs/Makefile.am

@@ -39 +39 @@
   $(JobMarket_LDFLAGS) \
   $(CodePatterns_LDFLAGS)
-libMolecuilderJobs_la_SOURCES = $(JOBSSOURCE)
 libMolecuilderJobs_la_LIBADD = \
   libMolecuilderFragmentationSummation.la
@@ -57 +56 @@
 endif
   
+## 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.
+libMolecuilderJobs_la_SOURCES = $(JOBSSOURCE)
+
+## 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.
+libMolecuilderJobs_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.
+libMolecuilderJobs_libincludedir = $(libdir)/MoleCuilder/include
+nodist_libMolecuilderJobs_libinclude_HEADERS = $(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
+  

src/Makefile.am

@@ -312 +312 @@
 pyMoleCuilder_la_LIBADD = \
         libMolecuilderUI.la
-if CONDJOBMARKET
-pyMoleCuilder_la_LIBADD += \
-        libMolecuilderJobs.la
-endif
 pyMoleCuilder_la_LIBADD += \
         $(BOOST_PYTHON_LIBS) \
@@ -339 +335 @@
 molecuilder_LDADD = \
         libMolecuilderUI.la
-if CONDJOBMARKET
-molecuilder_LDADD += \
-        libMolecuilderJobs.la
-endif
 molecuilder_LDADD += \
         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
@@ -382 +374 @@
         libMolecuilderQtUI.la \
         libMolecuilderUI.la
-if CONDJOBMARKET
-molecuildergui_LDADD += \
-        libMolecuilderJobs.la
-endif
 molecuildergui_LDADD += \
         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
@@ -460 +448 @@
 Controller_LDADD = \
         libFragmentationAutomationController.la \
+        libMolecuilderFragmentation_getFromKeysetStub.la \
+        libMolecuilderFragmentation.la \
         libMolecuilderJobs.la \
         libMolecuilderFragmentationSummation.la \
-        libMolecuilderFragmentation_getFromKeysetStub.la \
-        libMolecuilderFragmentation.la \
         libMolecuilderFragmentation_KeysetsContainer.la \
         libMolecuilderHelpers.la \

src/UIElements/Makefile.am

@@ -246 +246 @@
         libMolecuilderFilling.la \
         libMolecuilder.la \
+        libMolecuilderFragmentationAutomation.la \
+        libMolecuilderFragmentation_getFromKeyset.la \
+        libMolecuilderFragmentation.la
+if CONDJOBMARKET
+libMolecuilderUI_la_LIBADD += \
+        libMolecuilderJobs.la \
+        ${JobMarket_Controller_LIBS}
+endif
+libMolecuilderUI_la_LIBADD += \
+        libMolecuilderFragmentationSummation.la \
         libMolecuilderFragmentation_KeysetsContainer.la \
-        libMolecuilderFragmentation_getFromKeyset.la \
-        libMolecuilderFragmentation.la \
         libMolecuilderParser.la \
         libMolecuilderParameters.la \
@@ -258 +266 @@
         libMolecuilderRandomNumbers.la \
         libMolecuilderPotentials.la \
-        libMolecuilderFunctionApproximation.la
-if CONDJOBMARKET
-libMolecuilderUI_la_LIBADD += \
-        libMolecuilderJobs.la \
-        ${JobMarket_Controller_LIBS} \
-        libMolecuilderFragmentationAutomation.la
-endif
-libMolecuilderUI_la_LIBADD += \
-        libMolecuilderFragmentationSummation.la \
+        libMolecuilderFunctionApproximation.la \
         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
         ${CodePatterns_LIBS} \