Changeset 6e12a6

Timestamp:

Mar 2, 2017, 12:26:24 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, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, Combining_Subpackages, 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, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, RotateToPrincipalAxisSystem_UndoRedo, StoppableMakroAction, Subpackage_levmar, Subpackage_vmg, ThirdParty_MPQC_rebuilt_buildsystem, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, Ubuntu_1604_changes, stable

Children:

22d431

Parents:

d192142

git-author:

Frederik Heber <heber@…> (01/31/17 14:15:35)

git-committer:

Frederik Heber <heber@…> (03/02/17 12:26:24)

Message:

MPQC is now "automade" via an additional Makefile.am.

• this is according to the last suggestion in "Third-Party Makefiles" part of the automake documentation: In order to have a "distdir" target, it is simplest to use the automake functionality. Hence, we have the required stash of targets.
• make dist is now working. (distcheck is next)

Files:

• Makefile.am (modified) (1 diff)
• ThirdParty/Makefile.am (added)
• configure.ac (modified) (1 diff)

Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS=
-if COND_COMPILE_CODEPATTERNS
-SUBDIRS += ThirdParty/CodePatterns
-endif
-if COND_COMPILE_JOBMARKET
-SUBDIRS += ThirdParty/JobMarket
-endif
-SUBDIRS += ThirdParty/LinearAlgebra data/icons src src/unittests src/Tesselation/TriangleMatcher src/Bond/AdjacencyMatcher ThirdParty/mpqc_open tests utils doc
+SUBDIRS = ThirdParty data/icons src src/unittests src/Tesselation/TriangleMatcher src/Bond/AdjacencyMatcher tests utils doc
 
 AUTOMAKE_OPTIONS = subdir-objects

configure.ac

@@ -578 +578 @@
         src/Bond/AdjacencyMatcher/Makefile
         src/Tesselation/TriangleMatcher/Makefile
+        ThirdParty/Makefile
         data/icons/Makefile
         utils/Makefile