Changeset 4ecb2d for src


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:
Location:
src
Files:
23 edited

Legend:

Unmodified
Added
Removed

  • src/Analysis/unittests/Makefile.am

    rf45a91 r4ecb2d  
    3737endif
    3838ANALYSISLIBS += \
    39         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     39        $(top_builddir)/ThirdParty/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    4040        ${CodePatterns_LIBS} \
    4141        $(BOOST_LIB)

  • src/Atom/unittests/Makefile.am

    rf45a91 r4ecb2d  
    2525        ../libMolecuilderUI.la
    2626ATOMTESTLIBS += \
    27         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     27        $(top_builddir)/ThirdParty/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    2828        ${CodePatterns_LIBS} \
    2929        $(BOOST_LIB)

  • src/Descriptors/unittests/Makefile.am

    rf45a91 r4ecb2d  
    2727endif
    2828DESCRIPTORLIBS += \
    29         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     29        $(top_builddir)/ThirdParty/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    3030        ${CodePatterns_LIBS} \
    3131        $(BOOST_LIB)

  • src/Filling/unittests/Makefile.am

    rf45a91 r4ecb2d  
    4444endif
    4545FILLINGLIBS += \
    46         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     46        $(top_builddir)/ThirdParty/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    4747        ${CodePatterns_LIBS} \
    4848        $(BOOST_LIB)

  • src/Fragmentation/Exporters/unittests/Makefile.am

    rf45a91 r4ecb2d  
    5555SaturatedFragmentUnitTest_LDADD = \
    5656        ../libMolecuilderUI.la  \
    57         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     57        $(top_builddir)/ThirdParty/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    5858        ${FRAGMENTATIONEXPORTERSLIBS}
    5959
    … …  
    6464SaturationDistanceMaximizerUnitTest_LDADD = \
    6565        ../libMolecuilderUI.la  \
    66         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     66        $(top_builddir)/ThirdParty/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    6767        ${FRAGMENTATIONEXPORTERSLIBS}
    6868       
    … …  
    7373SphericalPointDistributionUnitTest_LDADD = \
    7474        ../libMolecuilderUI.la  \
    75         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     75        $(top_builddir)/ThirdParty/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    7676        ${FRAGMENTATIONEXPORTERSLIBS}
    7777

  • src/Fragmentation/Summation/SetValues/Makefile.am

    rf45a91 r4ecb2d  
    2727libMolecuilderFragmentationSetValues_la_LDFLAGS = -ldl ${BOOST_LDFLAGS}
    2828libMolecuilderFragmentationSetValues_la_LIBADD = \
    29         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     29        $(top_builddir)/ThirdParty/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    3030        ${CodePatterns_LIBS}
    3131

  • src/FunctionApproximation/unittests/Makefile.am

    rf45a91 r4ecb2d  
    2323        ../libMolecuilderFragmentation.la \
    2424        ../libMolecuilderFragmentation_getFromKeysetStub.la \
    25         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     25        $(top_builddir)/ThirdParty/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    2626        ${CodePatterns_LIBS} \
    2727        $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \

  • src/Graph/unittests/Makefile.am

    rf45a91 r4ecb2d  
    2929endif
    3030GRAPHLIBS += \
    31         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     31        $(top_builddir)/ThirdParty/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    3232        ${CodePatterns_LIBS} \
    3333        $(BOOST_LIB)

  • src/Jobs/Makefile.am

    rf45a91 r4ecb2d  
    8787  $(BOOST_SERIALIZATION_LIBS) \
    8888  $(BOOST_SYSTEM_LIBS) \
    89   $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     89  $(top_builddir)/ThirdParty/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    9090  $(CodePatterns_LIBS)
    9191if CONDVMGMPI

  • src/LinkedCell/unittests/Makefile.am

    rf45a91 r4ecb2d  
    3131        libUnitTest.la \
    3232        ../libMolecuilder.la \
    33         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     33        $(top_builddir)/ThirdParty/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    3434        ${CodePatterns_LIBS} \
    3535        $(BOOST_LIB)

  • 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) \

  • src/Parameters/unittests/Makefile.am

    rf45a91 r4ecb2d  
    3131        libUnitTest.la \
    3232        ../libMolecuilder.la \
    33         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     33        $(top_builddir)/ThirdParty/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    3434        ${CodePatterns_LIBS} \
    3535        $(BOOST_THREAD_LDFLAGS) $(BOOST_THREAD_LIBS)

  • src/Parser/Parameters/unittests/Makefile.am

    rf45a91 r4ecb2d  
    2222        libUnitTest.la \
    2323        ../libMolecuilder.la \
    24         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     24        $(top_builddir)/ThirdParty/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    2525        ${CodePatterns_LIBS} \
    2626        $(BOOST_THREAD_LDFLAGS) $(BOOST_THREAD_LIBS)

  • src/Parser/unittests/Makefile.am

    rf45a91 r4ecb2d  
    4444endif
    4545PARSERLIBS += \
    46         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     46        $(top_builddir)/ThirdParty/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    4747        ${CodePatterns_LIBS}
    4848#       $(BOOST_LIB)

  • src/Potentials/Specifics/unittests/Makefile.am

    rf45a91 r4ecb2d  
    4545        ../libMolecuilderFragmentationSummation.la \
    4646        ../libMolecuilderFragmentation_getFromKeysetStub.la \
    47         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     47        $(top_builddir)/ThirdParty/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    4848        ${CodePatterns_LIBS} \
    4949        $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \

  • src/Potentials/unittests/Makefile.am

    rf45a91 r4ecb2d  
    2525        ../libMolecuilder.la \
    2626        ../libMolecuilderPotentials.la \
    27         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     27        $(top_builddir)/ThirdParty/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    2828        ${CodePatterns_LIBS} \
    2929        $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
    … …  
    4141        ../libMolecuilderFragmentation_getFromKeysetStub.la \
    4242        ../libMolecuilderRandomNumbers.la \
    43         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     43        $(top_builddir)/ThirdParty/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    4444        ${CodePatterns_LIBS} \
    4545        $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \

  • src/Shapes/Makefile.am

    rf45a91 r4ecb2d  
    2222libMolecuilderShapes_la_includedir = $(includedir)/MoleCuilder/
    2323libMolecuilderShapes_la_LIBADD = \
    24         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     24        $(top_builddir)/ThirdParty/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    2525        ${CodePatterns_LIBS}
    2626nobase_libMolecuilderShapes_la_include_HEADERS = ${SHAPEHEADER}

  • src/Shapes/unittests/Makefile.am

    rf45a91 r4ecb2d  
    3232        ../libMolecuilder.la \
    3333        ../libMolecuilderUI.la \
    34         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     34        $(top_builddir)/ThirdParty/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    3535        ${CodePatterns_LIBS}
    3636#       $(BOOST_LIB)

  • src/Tesselation/unittests/Makefile.am

    rf45a91 r4ecb2d  
    3131endif
    3232TESSELATIONLIBS += \
    33         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     33        $(top_builddir)/ThirdParty/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    3434        ${CodePatterns_LIBS} \
    3535        $(BOOST_LIB)

  • src/UIElements/CommandLineUI/unittests/Makefile.am

    rf45a91 r4ecb2d  
    2727endif
    2828CommandLineParser_ActionRegistry_ConsistencyUnitTest_LDADD += \
    29   $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     29  $(top_builddir)/ThirdParty/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    3030  ${CodePatterns_LIBS} \
    3131  $(BOOST_LIB)

  • src/UIElements/Makefile.am

    rf45a91 r4ecb2d  
    322322
    323323libMolecuilderUI_la_LIBADD += \
    324         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     324        $(top_builddir)/ThirdParty/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    325325        ${CodePatterns_LIBS} \
    326326        $(BOOST_SERIALIZATION_LIBS) \

  • src/UIElements/Menu/unittests/Makefile.am

    rf45a91 r4ecb2d  
    2727endif
    2828MENULIBS += \
    29   $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     29  $(top_builddir)/ThirdParty/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    3030  ${CodePatterns_LIBS} \
    3131  $(BOOST_LIB)

  • src/unittests/Makefile.am

    rf45a91 r4ecb2d  
    4747        $(CPPUNIT_LIBS) \
    4848        -ldl
    49 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
     49AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/ThirdParty/LinearAlgebra/src ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
    5050
    5151GENERALTESTS = \
    … …  
    122122GENERALLIBS = \
    123123        ../libMolecuilder.la \
    124         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     124        $(top_builddir)/ThirdParty/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    125125        ${CodePatterns_LIBS} \
    126126        $(BOOST_LIB)
    … …  
    135135endif
    136136ALLLIBS += \
    137         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     137        $(top_builddir)/ThirdParty/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    138138        ${CodePatterns_LIBS} \
    139139        $(BOOST_LIB)
Note: See TracChangeset for help on using the changeset viewer.