Changeset 7672284

Timestamp:

Mar 9, 2017, 10:16:01 PM (8 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, AutomationFragmentation_failures, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_ChronosMutex, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, GeometryObjects, Gui_displays_atomic_force_velocity, IndependentFragmentGrids_IntegrationTest, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, PartialCharges_OrthogonalSummation, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, RotateToPrincipalAxisSystem_UndoRedo, StoppableMakroAction, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, Ubuntu_1604_changes, stable

Children:

0ee9cb3

Parents:

fbf005

git-author:

Frederik Heber <heber@…> (02/25/17 21:18:25)

git-committer:

Frederik Heber <heber@…> (03/09/17 22:16:01)

Message:

FIX: install target now works with multiple threads.

• the problem when using "make -j8 install" was that automake's dependency tracking for pyMoleCuilder did not work. It works when it is given under lib_LTLIBRARIES but not with pyexec_LTLIBRARIES, although the other libs are given under LIBADD. I never got an answer to my mail on the forum.
• therefore, I now circumvent the problem by building the pyMolecuilder module in a different folder that makes enters after it is down with compiling everything in src.
• Note that somehow I cannot use $(top_srcdir) for the paths of the source modules but must give the path explicitly.
• Also, this should now allow to use debuild with multiple threads.

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (1 diff)
• python/Makefile.am (added)
• src/Makefile.am (modified) (2 diffs)
• tests/Python/run.in (modified) (1 diff)
• tests/regression/runpython.in (modified) (1 diff)

Makefile.am ¶

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = ThirdParty data/icons src src/unittests src/Tesselation/TriangleMatcher src/Bond/AdjacencyMatcher tests utils doc
+SUBDIRS = ThirdParty data/icons src python src/unittests src/Tesselation/TriangleMatcher src/Bond/AdjacencyMatcher tests utils doc
 
 AUTOMAKE_OPTIONS = subdir-objects

configure.ac ¶

@@ -593 +593 @@
 AC_CONFIG_FILES([
         Makefile 
+        python/Makefile
         src/Makefile
         src/Bond/AdjacencyMatcher/Makefile

src/Makefile.am ¶

@@ -5 +5 @@
 lib_LTLIBRARIES =
 noinst_LTLIBRARIES =
-pyexec_LTLIBRARIES =
 BUILT_SOURCES =
 bin_PROGRAMS =
@@ -289 +288 @@
         ${top_srcdir}/data/molecules/*.pdb
 
-if CONDPYTHON
-pyexec_LTLIBRARIES += pyMoleCuilder.la
-pyMoleCuilder_la_SOURCES = \
-        cleanUp.cpp \
-        cleanUp.hpp \
-        Actions/Action_impl_python.hpp \
-        Actions/GlobalListOfActions.hpp \
-        Actions/ActionHistory.hpp
-pyMoleCuilder_la_CPPFLAGS = $(AM_CPPFLAGS) ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} $(JobMarket_CFLAGS) -I$(PYTHON_INCLUDE_DIR)
-pyMoleCuilder_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info $(MOLECUILDER_SO_VERSION) -shared $(BOOST_PYTHON_LDFLAGS) 
-pyMoleCuilder_la_LIBADD = \
-        libMolecuilderUI.la
-pyMoleCuilder_la_LIBADD += \
-        $(BOOST_PYTHON_LIBS) \
-        ${CodePatterns_LIBS} \
-        -l$(PYTHON_LIB)
-endif
-
-
 
 molecuilder_CPPFLAGS  = $(AM_CPPFLAGS)

tests/Python/run.in ¶

@@ -5 +5 @@
 # libraries are (on this platform libtool encodes the expected final
 # path of dependent libraries in each library).
-modpath='../.libs:@abs_top_builddir@/src/.libs'
+modpath='../.libs:@abs_top_builddir@/python/.libs'
 
 # .. is for the *.py files, and ../.libs for the *.so.  We used to

tests/regression/runpython.in ¶

@@ -5 +5 @@
 # libraries are (on this platform libtool encodes the expected final
 # path of dependent libraries in each library).
-modpath='../.libs:@abs_top_builddir@/src/.libs'
+modpath='../.libs:@abs_top_builddir@/python/.libs'
 
 # .. is for the *.py files, and ../.libs for the *.so.  We used to