Changeset 4ecb2d for src/Makefile.am


Ignore:
Timestamp:
Mar 2, 2017, 7:14:22 AM (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_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, ThirdParty_MPQC_rebuilt_buildsystem, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, Ubuntu_1604_changes, stable
Children:
e7ff10
Parents:
f45a91
git-author:
Frederik Heber <heber@…> (11/10/16 15:22:24)
git-committer:
Frederik Heber <heber@…> (03/02/17 07:14:22)
Message:

Moved LinearAlgebra sub-package into ThirdParty folder.

  • needed to adapt location of libLinearAlgebra.la in all Makefile.am's.
  • relinked m4 subfolder, relinked am_doxygen_include.am. Both point to those present in molecuilder parent folder.
  • adapted configure.ac's:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/Makefile.am

    rf45a91 r4ecb2d  
    2323        -I$(top_srcdir)/src/Actions \
    2424        -I$(top_srcdir)/src/UIElements \
    25         -I$(top_srcdir)/LinearAlgebra/src \
     25        -I$(top_srcdir)/ThirdParty/LinearAlgebra/src \
    2626        ${BOOST_CPPFLAGS} \
    2727        ${CodePatterns_CFLAGS}
     
    198198        libMolecuilderShapes.la \
    199199        libMolecuilderHelpers.la \
    200         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     200        $(top_builddir)/ThirdParty/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    201201        ${CodePatterns_LIBS} \
    202202        $(BOOST_SERIALIZATION_LIBS) \
     
    423423        libMolecuilderHelpers.la \
    424424        $(JobMarket_Controller_LIBS) \
    425         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     425        $(top_builddir)/ThirdParty/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    426426        $(BOOST_SERIALIZATION_LIBS) \
    427427        $(BOOST_PROGRAM_OPTIONS_LIBS) \
     
    435435        libMolecuilderFragmentationSummation.la \
    436436        ${JobMarket_PoolWorker_LIBS} \
    437         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     437        $(top_builddir)/ThirdParty/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    438438        $(BOOST_SERIALIZATION_LIBS) \
    439439        $(BOOST_PROGRAM_OPTIONS_LIBS) \
     
    447447        libMolecuilderFragmentationSummation.la \
    448448        ${JobMarket_Server_LIBS} \
    449         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     449        $(top_builddir)/ThirdParty/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    450450        $(BOOST_SERIALIZATION_LIBS) \
    451451        $(BOOST_PROGRAM_OPTIONS_LIBS) \
Note: See TracChangeset for help on using the changeset viewer.