Changeset ce9681

Timestamp:

Mar 2, 2017, 12:28:36 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, 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:

2e2505

Parents:

12add2

git-author:

Frederik Heber <heber@…> (02/09/17 15:08:59)

git-committer:

Frederik Heber <heber@…> (03/02/17 12:28:36)

Message:

mpqc is now compiled after MoleCuilder.

Files:

• Makefile.am (modified) (1 diff)
• ThirdParty/Makefile.am (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 ThirdParty/mpqc_open src/unittests src/Tesselation/TriangleMatcher src/Bond/AdjacencyMatcher tests utils doc
 
 AUTOMAKE_OPTIONS = subdir-objects

ThirdParty/Makefile.am

@@ -10 +10 @@
 SUBDIRS += LinearAlgebra
 
-all-local:
-        cd mpqc_open && $(MAKE) $(AM_MAKEFLAGS) all
-check-local:
-        cd mpqc_open && $(MAKE) $(AM_MAKEFLAGS) check
-clean-local:
-        cd mpqc_open && $(MAKE) $(AM_MAKEFLAGS) clean check_clean
-
-# Assuming the package knows how to install itself
-install-data-local:
-        cd mpqc_open && $(MAKE) $(AM_MAKEFLAGS) install-data
-install-exec-local:
-        cd mpqc_open && $(MAKE) $(AM_MAKEFLAGS) install-exec
-uninstall-local:
-        cd mpqc_open && $(MAKE) $(AM_MAKEFLAGS) uninstall
-
-# Distribute files from here.
-EXTRA_DIST = \
-        mpqc_open/bin \
-        mpqc_open/doc \
-        mpqc_open/include \
-        mpqc_open/lib \
-        mpqc_open/m4 \
-        mpqc_open/src \
-        mpqc_open/aclocal.m4 \
-        mpqc_open/cca.m4 \
-        mpqc_open/CHANGES \
-        mpqc_open/CITATION \
-        mpqc_open/configure \
-        mpqc_open/configure.ac \
-        mpqc_open/COPYING \
-        mpqc_open/COPYING.LIB \
-        mpqc_open/LICENSE \
-        mpqc_open/Makefile \
-        mpqc_open/README
-
-