Changeset 748fc7 for src/Makefile.am

Timestamp:

Aug 21, 2014, 6:43:46 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:

07ecc5

Parents:

d93b4b3

git-author:

Frederik Heber <heber@…> (08/19/14 11:17:27)

git-committer:

Frederik Heber <heber@…> (08/21/14 06:43:46)

Message:

libMolecuilder is now a shared library.

• linking error Vector::IsZero(double) with molecuilder(gui), related to libMolecuilderShapes was the root cause for this change. Again, it was not deducible why this error occured:
• probably (me tired of these obfuscated linker errors ...) faulted because libMolecuilder is convenience lib while libMolecuilderUI and ..QtUI are shared and deps did not get passed along properly (by libtool) (e.g. ldd showed libMolecuilderShapes prior to libLinearAlgebra, containing said function Vector::IsZero(double), but I cannot influence this ordering and it should not even matter (dynamic linking).)
• some cleanup in builder_init.cpp (no more loading of BondGraph from file named "\n".
• TESTFIX: libMolecuilder.so added to all unittests, required for e.g. World::purgeInstance() ... and sometimes added libMolecuilderUI.so because libMolecuilder pulled them in due to static entities ... sigh.
• removed all src object files from unittest .._SOURCES. This caused distclean faults "thanks" to new subdir-objects (automake).

File:

• src/Makefile.am (modified) (8 diffs)

src/Makefile.am

@@ -10 +10 @@
 EXTRA_DIST =
 
-include Actions/Makefile.am
-include Analysis/Makefile.am
-include Atom/Makefile.am
-include Element/Makefile.am
-include Filling/Makefile.am
-include Fragmentation/Makefile.am
-include Fragmentation/Automation/Makefile.am
-include Fragmentation/Summation/Containers/Makefile.am
-include Fragmentation/Summation/Converter/Makefile.am
-include Fragmentation/Summation/Makefile.am
-include Fragmentation/Summation/SetValues/Makefile.am
-include FunctionApproximation/Makefile.am
-include Graph/Makefile.am
+# libMolecuilder.la requires the libraries listed below
+
 include Helpers/Makefile.am
-include Jobs/Makefile.am
-
-if CONDPYTHON
-include Python/Makefile.am
-endif
-
-include LinkedCell/Makefile.am
-include Parameters/Makefile.am
-include Parser/Makefile.am
-include Potentials/Makefile.am
-include RandomNumbers/Makefile.am
 include Shapes/Makefile.am
 include Tesselation/Makefile.am
-include UIElements/Makefile.am
+
+# then comes the library itself
 
 AM_LDFLAGS = -ldl ${BOOST_LDFLAGS} ${CodePatterns_LDFLAGS}
@@ -202 +181 @@
   WorldTime.hpp
 
-noinst_LTLIBRARIES += libMolecuilder.la
+lib_LTLIBRARIES += libMolecuilder.la
 libMolecuilder_la_includedir = $(includedir)/MoleCuilder/
 libMolecuilder_la_LDFLAGS = \
@@ -212 +191 @@
         libMolecuilderTesselation.la \
         libMolecuilderShapes.la \
+        libMolecuilderHelpers.la \
         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
         ${CodePatterns_LIBS} \
@@ -235 +215 @@
 ## library file (.so).  The library ABI version is defined in configure.ac, so
 ## that all version information is kept in one place.
-#libMolecuilder_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
+libMolecuilder_la_LDFLAGS += -version-info $(MOLECUILDER_SO_VERSION)
 
 ## The generated configuration header is installed in its own subdirectory of
@@ -258 +238 @@
 pkgconfig_DATA = $(top_builddir)/MoleCuilder.pc
 
+# then we compile the remainder of all other libraries, especially
+# libMolecuilderUI.la, which requires libMolecuilder.la on install
+
+include Actions/Makefile.am
+include Analysis/Makefile.am
+include Atom/Makefile.am
+include Element/Makefile.am
+include Filling/Makefile.am
+include Fragmentation/Makefile.am
+include Fragmentation/Automation/Makefile.am
+include Fragmentation/Summation/Containers/Makefile.am
+include Fragmentation/Summation/Converter/Makefile.am
+include Fragmentation/Summation/Makefile.am
+include Fragmentation/Summation/SetValues/Makefile.am
+include FunctionApproximation/Makefile.am
+include Graph/Makefile.am
+include Jobs/Makefile.am
+
+if CONDPYTHON
+include Python/Makefile.am
+endif
+
+include LinkedCell/Makefile.am
+include Parameters/Makefile.am
+include Parser/Makefile.am
+include Potentials/Makefile.am
+include RandomNumbers/Makefile.am
+include UIElements/Makefile.am
 
 bin_PROGRAMS += molecuilder 
@@ -300 +308 @@
 molecuilder_LDFLAGS = \
         $(AM_LDFLAGS) \
+        $(CodePatterns_LDFLAGS) \
         $(BOOST_FILESYSTEM_LDFLAGS) \
         $(BOOST_PROGRAM_OPTIONS_LDFLAGS) \
@@ -308 +317 @@
         builder.cpp \
         builder_init.cpp \
-        builder_init.hpp
+        builder_init.hpp \
+        Python/PythonScripting.hpp
 molecuilder_LDADD = \
+        libMolecuilder.la \
         libMolecuilderUI.la
 molecuilder_LDADD += \
-        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
         ${CodePatterns_LIBS} \
         $(BOOST_THREAD_LIBS) \
@@ -348 +358 @@
         $(BOOST_THREAD_LDFLAGS)
 molecuildergui_LDADD = \
+        libMolecuilder.la \
         libMolecuilderQtUI.la \
         libMolecuilderUI.la
 molecuildergui_LDADD += \
-        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
         ${CodePatterns_LIBS} \
         $(BOOST_THREAD_LIBS) \