Changeset bf4b9f for src/unittests/Makefile.am

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.

File:

• src/unittests/Makefile.am (modified) (7 diffs)

src/unittests/Makefile.am

@@ -5 +5 @@
         ../Actions/unittests \
         ../Descriptors/unittests \
-        ../LinearAlgebra/unittests \
         ../Parser/unittests \
         ../RandomNumbers/unittests \
@@ -12 +11 @@
         ../UIElements/Menu/unittests
 
-INCLUDES = -I$(top_srcdir)/src
+INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src
 
 AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
@@ -41 +40 @@
 GSLLIBS = \
         ../Shapes/libMolecuilderShapes.la \
-        ../LinearAlgebra/libMolecuilderLinearAlgebra.la \
+        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
         ../RandomNumbers/libMolecuilderRandomNumbers.la \
         $(BOOST_LIB)
@@ -67 +66 @@
   CountBondsUnitTest.cpp \
   FormulaUnitTest.cpp \
-  ../LinearAlgebra/unittests/LinearSystemOfEquationsUnitTest.cpp \
-  ../LinearAlgebra/unittests/LineUnitTest.cpp \
   LinkedCellUnitTest.cpp \
   ListOfBondsUnitTest.cpp \
   ../Actions/unittests/ManipulateAtomsUnitTest.cpp \
-  ../LinearAlgebra/unittests/MatrixContentSymmetricUnitTest.cpp \
-  ../LinearAlgebra/unittests/MatrixContentUnitTest.cpp \
-  ../LinearAlgebra/unittests/MatrixUnitTest.cpp \
   ../UIElements/CommandLineUI/unittests/CommandLineParser_ActionRegistry_ConsistenyUnitTest.cpp \
   ../UIElements/Menu/unittests/MenuDescriptionUnitTest.cpp \
@@ -84 +78 @@
   ../Parser/unittests/ParserXyzUnitTest.cpp \
   PeriodentafelUnitTest.cpp \
-  ../LinearAlgebra/unittests/PlaneUnitTest.cpp \
   ../Shapes/unittests/ShapeUnitTest.cpp \
   TesselationUnitTest.cpp \
   Tesselation_BoundaryTriangleUnitTest.cpp \
   Tesselation_InsideOutsideUnitTest.cpp \
-  ../LinearAlgebra/unittests/VectorContentUnitTest.cpp \
-  ../LinearAlgebra/unittests/VectorUnitTest.cpp \
   WorldTimeUnitTest.cpp
 
@@ -106 +97 @@
   CountBondsUnitTest.hpp \
   FormulaUnitTest.hpp \
-  ../LinearAlgebra/unittests/LinearSystemOfEquationsUnitTest.hpp \
-  ../LinearAlgebra/unittests/LineUnitTest.hpp \
   LinkedCellUnitTest.hpp \
   ListOfBondsUnitTest.hpp \
   ../Actions/unittests/ManipulateAtomsUnitTest.hpp \
-  ../LinearAlgebra/unittests/MatrixContentSymmetricUnitTest.hpp \
-  ../LinearAlgebra/unittests/MatrixContentUnitTest.hpp \
-  ../LinearAlgebra/unittests/MatrixUnitTest.hpp \
   ../UIElements/CommandLineUI/unittests/CommandLineParser_ActionRegistry_ConsistenyUnitTest.hpp \
   ../UIElements/Menu/unittests/MenuDescriptionUnitTest.hpp \
@@ -123 +109 @@
   ../Parser/unittests/ParserXyzUnitTest.hpp \
   PeriodentafelUnitTest.hpp \
-  ../LinearAlgebra/unittests/PlaneUnitTest.hpp \
   ../Shapes/unittests/ShapeUnitTest.hpp \
   TesselationUnitTest.hpp \
   Tesselation_BoundaryTriangleUnitTest.hpp \
   Tesselation_InsideOutsideUnitTest.hpp \
-  ../LinearAlgebra/unittests/VectorContentUnitTest.hpp \
-  ../LinearAlgebra/unittests/VectorUnitTest.hpp \
-        WorldTimeUnitTest.hpp
+  WorldTimeUnitTest.hpp