Changeset bf4b9f for src


Ignore:
Timestamp:
Apr 8, 2011, 3:48:50 PM (14 years ago)
Author:
Frederik Heber <heber@…>
Branches:
Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable
Children:
ca2cfa
Parents:
3e2225f
git-author:
Frederik Heber <heber@…> (04/02/11 00:53:43)
git-committer:
Frederik Heber <heber@…> (04/08/11 15:48:50)
Message:

Moved LinearAlgebra from folder src/ into distinct sub-package.

  • src/LinearAlgebra folder is now LinearAlgebra/src/LinearAlgebra due to include consistency.
  • src/LinearAlgebra/unittests have been moved to LinearAlgebra/unittests.
  • All Makefile.am's had to be changed due to changed location of library.
  • renamed libMolecuilderLinearAlgebra to libLinearAlgebra.
  • CONFIG_AUX_DIR is build-aux 9for molecuilder and LinearAlgebra).
  • m4 is symlinked from below.
  • build-aux now contains small README such that it is created automatically.
Location:
src
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • src/Actions/Makefile.am

    r3e2225f rbf4b9f  
    22# Also indentation by a single tab
    33
    4 INCLUDES = -I$(top_srcdir)/src
     4INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src
    55
    66AM_LDFLAGS = -ldl

  • src/Actions/unittests/Makefile.am

    r3e2225f rbf4b9f  
    22# Also indentation by a single tab
    33
    4 INCLUDES = -I$(top_srcdir)/src
     4INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src
    55
    66AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
    … …  
    1919GSLLIBS = \
    2020        ../../Shapes/libMolecuilderShapes.la \
    21         ../../LinearAlgebra/libMolecuilderLinearAlgebra.la \
     21        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    2222        ../../RandomNumbers/libMolecuilderRandomNumbers.la \
    2323        ${CodePatterns_LIBS} \

  • src/Descriptors/unittests/Makefile.am

    r3e2225f rbf4b9f  
    22# Also indentation by a single tab
    33
    4 INCLUDES = -I$(top_srcdir)/src
     4INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src
    55
    66AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
    … …  
    1717GSLLIBS = \
    1818        ../../Shapes/libMolecuilderShapes.la \
    19         ../../LinearAlgebra/libMolecuilderLinearAlgebra.la \
     19        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    2020        ../../RandomNumbers/libMolecuilderRandomNumbers.la \
    2121        ${CodePatterns_LIBS} \

  • src/Graph/Makefile.am

    r3e2225f rbf4b9f  
    22# Also indentation by a single tab
    33
    4 INCLUDES = -I$(top_srcdir)/src
     4INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src
    55
    66AM_LDFLAGS = ${CodePatterns_LIBS} -ldl

  • src/Makefile.am

    r3e2225f rbf4b9f  
    55        RandomNumbers \
    66        Parser \
    7         LinearAlgebra \
    87        Shapes \
    98        Graph \
    … …  
    259258libMolecuilder_la_includedir = $(includedir)/MoleCuilder/
    260259libMolecuilder_la_LIBADD = \
    261         LinearAlgebra/libMolecuilderLinearAlgebra.la \
    262260        Graph/libMolecuilderGraph.la \
     261        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    263262        ${CodePatterns_LIBS} \
    264263        ${BOOST_PROGRAM_OPTIONS_LIB}
    … …  
    304303
    305304BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
    306 INCLUDES = -I$(top_srcdir)/src/unittests -I$(top_srcdir)/src/Actions -I$(top_srcdir)/src/UIElements
     305INCLUDES = -I$(top_srcdir)/LinearAlgebra/src -I$(top_srcdir)/src/unittests -I$(top_srcdir)/src/Actions -I$(top_srcdir)/src/UIElements
    307306
    308307noinst_LIBRARIES = libmenu.a
    … …  
    327326        Parser/libMolecuilderParser.la \
    328327        Shapes/libMolecuilderShapes.la \
    329         LinearAlgebra/libMolecuilderLinearAlgebra.la \
     328        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    330329        RandomNumbers/libMolecuilderRandomNumbers.la \
    331330        ${CodePatterns_LIBS} \
    … …  
    348347        Parser/libMolecuilderParser.la \
    349348        Shapes/libMolecuilderShapes.la \
    350         LinearAlgebra/libMolecuilderLinearAlgebra.la \
     349        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    351350        RandomNumbers/libMolecuilderRandomNumbers.la \
    352351        ${CodePatterns_LIBS} \
    … …  
    362361        Parser/libMolecuilderParser.la \
    363362        Shapes/libMolecuilderShapes.la \
    364         LinearAlgebra/libMolecuilderLinearAlgebra.la \
     363        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    365364        RandomNumbers/libMolecuilderRandomNumbers.la \
    366365        ${CodePatterns_LIBS} \
    … …  
    375374        Parser/libMolecuilderParser.la \
    376375        Shapes/libMolecuilderShapes.la \
    377         LinearAlgebra/libMolecuilderLinearAlgebra.la \
     376        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    378377        RandomNumbers/libMolecuilderRandomNumbers.la \
    379378        ${CodePatterns_LIBS} \

  • src/Parser/Makefile.am

    r3e2225f rbf4b9f  
    22# Also indentation by a single tab
    33
    4 INCLUDES = -I$(top_srcdir)/src
     4INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src
    55
    66AM_LDFLAGS = ${CodePatterns_LIBS} -ldl

  • src/Parser/unittests/Makefile.am

    r3e2225f rbf4b9f  
    22# Also indentation by a single tab
    33
    4 INCLUDES = -I$(top_srcdir)/src
     4INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src
    55
    66AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
    … …  
    2121GSLLIBS = \
    2222        ../../Shapes/libMolecuilderShapes.la \
    23         ../../LinearAlgebra/libMolecuilderLinearAlgebra.la \
     23        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    2424        ../../RandomNumbers/libMolecuilderRandomNumbers.la \
    2525        ${CodePatterns_LIBS} \

  • src/Shapes/Makefile.am

    r3e2225f rbf4b9f  
    22# Also indentation by a single tab
    33
    4 INCLUDES = -I$(top_srcdir)/src
     4INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src
    55
    66# Position-Independent Code necessary for shared library
    … …  
    2222libMolecuilderShapes_la_includedir = $(includedir)/MoleCuilder/Shapes/
    2323libMolecuilderShapes_la_LIBADD = \
    24   ../LinearAlgebra/libMolecuilderLinearAlgebra.la \
     24  $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    2525        $(GSL_LIBS)
    2626nobase_libMolecuilderShapes_la_include_HEADERS = ${SHAPEHEADER}

  • src/Shapes/unittests/Makefile.am

    r3e2225f rbf4b9f  
    22# Also indentation by a single tab
    33
    4 INCLUDES = -I$(top_srcdir)/src
     4INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src
    55
    66AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
    … …  
    1717SHAPELIBS = \
    1818        ../../Shapes/libMolecuilderShapes.la \
    19         ../../LinearAlgebra/libMolecuilderLinearAlgebra.la \
     19        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    2020        ${CodePatterns_LIBS} \
    2121        $(BOOST_LIB)

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

    r3e2225f rbf4b9f  
    22# Also indentation by a single tab
    33
    4 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/UIElements
     4INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src -I$(top_srcdir)/src/UIElements
    55
    66AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
    … …  
    2626        ../../../Parser/libMolecuilderParser.la \
    2727        ../../../Shapes/libMolecuilderShapes.la \
    28         ../../../LinearAlgebra/libMolecuilderLinearAlgebra.la \
     28        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    2929        ../../../RandomNumbers/libMolecuilderRandomNumbers.la \
    3030        ${CodePatterns_LIBS} \

  • src/UIElements/Makefile.am

    r3e2225f rbf4b9f  
    11# Below is all for the User Interface
    22
    3 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/UIElements
     3INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src -I$(top_srcdir)/src/UIElements
    44
    55AM_LDFLAGS = ${CodePatterns_LIBS} -ldl

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

    r3e2225f rbf4b9f  
    22# Also indentation by a single tab
    33
    4 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/UIElements
     4INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src -I$(top_srcdir)/src/UIElements
    55
    66AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
    … …  
    3737        ../../../Parser/libMolecuilderParser.la \
    3838        ../../../Shapes/libMolecuilderShapes.la \
    39         ../../../LinearAlgebra/libMolecuilderLinearAlgebra.la \
     39        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    4040        ../../../RandomNumbers/libMolecuilderRandomNumbers.la \
    4141        ${CodePatterns_LIBS} \

  • src/unittests/Makefile.am

    r3e2225f rbf4b9f  
    55        ../Actions/unittests \
    66        ../Descriptors/unittests \
    7         ../LinearAlgebra/unittests \
    87        ../Parser/unittests \
    98        ../RandomNumbers/unittests \
    … …  
    1211        ../UIElements/Menu/unittests
    1312
    14 INCLUDES = -I$(top_srcdir)/src
     13INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src
    1514
    1615AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
    … …  
    4140GSLLIBS = \
    4241        ../Shapes/libMolecuilderShapes.la \
    43         ../LinearAlgebra/libMolecuilderLinearAlgebra.la \
     42        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    4443        ../RandomNumbers/libMolecuilderRandomNumbers.la \
    4544        $(BOOST_LIB)
    … …  
    6766  CountBondsUnitTest.cpp \
    6867  FormulaUnitTest.cpp \
    69   ../LinearAlgebra/unittests/LinearSystemOfEquationsUnitTest.cpp \
    70   ../LinearAlgebra/unittests/LineUnitTest.cpp \
    7168  LinkedCellUnitTest.cpp \
    7269  ListOfBondsUnitTest.cpp \
    7370  ../Actions/unittests/ManipulateAtomsUnitTest.cpp \
    74   ../LinearAlgebra/unittests/MatrixContentSymmetricUnitTest.cpp \
    75   ../LinearAlgebra/unittests/MatrixContentUnitTest.cpp \
    76   ../LinearAlgebra/unittests/MatrixUnitTest.cpp \
    7771  ../UIElements/CommandLineUI/unittests/CommandLineParser_ActionRegistry_ConsistenyUnitTest.cpp \
    7872  ../UIElements/Menu/unittests/MenuDescriptionUnitTest.cpp \
    … …  
    8478  ../Parser/unittests/ParserXyzUnitTest.cpp \
    8579  PeriodentafelUnitTest.cpp \
    86   ../LinearAlgebra/unittests/PlaneUnitTest.cpp \
    8780  ../Shapes/unittests/ShapeUnitTest.cpp \
    8881  TesselationUnitTest.cpp \
    8982  Tesselation_BoundaryTriangleUnitTest.cpp \
    9083  Tesselation_InsideOutsideUnitTest.cpp \
    91   ../LinearAlgebra/unittests/VectorContentUnitTest.cpp \
    92   ../LinearAlgebra/unittests/VectorUnitTest.cpp \
    9384  WorldTimeUnitTest.cpp
    9485
    … …  
    10697  CountBondsUnitTest.hpp \
    10798  FormulaUnitTest.hpp \
    108   ../LinearAlgebra/unittests/LinearSystemOfEquationsUnitTest.hpp \
    109   ../LinearAlgebra/unittests/LineUnitTest.hpp \
    11099  LinkedCellUnitTest.hpp \
    111100  ListOfBondsUnitTest.hpp \
    112101  ../Actions/unittests/ManipulateAtomsUnitTest.hpp \
    113   ../LinearAlgebra/unittests/MatrixContentSymmetricUnitTest.hpp \
    114   ../LinearAlgebra/unittests/MatrixContentUnitTest.hpp \
    115   ../LinearAlgebra/unittests/MatrixUnitTest.hpp \
    116102  ../UIElements/CommandLineUI/unittests/CommandLineParser_ActionRegistry_ConsistenyUnitTest.hpp \
    117103  ../UIElements/Menu/unittests/MenuDescriptionUnitTest.hpp \
    … …  
    123109  ../Parser/unittests/ParserXyzUnitTest.hpp \
    124110  PeriodentafelUnitTest.hpp \
    125   ../LinearAlgebra/unittests/PlaneUnitTest.hpp \
    126111  ../Shapes/unittests/ShapeUnitTest.hpp \
    127112  TesselationUnitTest.hpp \
    128113  Tesselation_BoundaryTriangleUnitTest.hpp \
    129114  Tesselation_InsideOutsideUnitTest.hpp \
    130   ../LinearAlgebra/unittests/VectorContentUnitTest.hpp \
    131   ../LinearAlgebra/unittests/VectorUnitTest.hpp \
    132         WorldTimeUnitTest.hpp
     115  WorldTimeUnitTest.hpp
    133116 
    134117
Note: See TracChangeset for help on using the changeset viewer.