Changeset 3bdb6d for src/Makefile.am

Timestamp:

Oct 17, 2011, 4:18:54 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, Candidate_v1.7.0, Candidate_v1.7.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:

592be9

Parents:

2fadb6f

git-author:

Frederik Heber <heber@…> (09/16/11 10:07:33)

git-committer:

Frederik Heber <heber@…> (10/17/11 16:18:54)

Message:

Moved all stuff related to elements into own subfolder and has its own convenience library.

• this induced massive changes in includes in other files.
• we adapted PeriodentafelUnitTest to not get instance from world, but we create it ourselves.
• also moved all .db files related to elements into subfolder Element/.

File:

• src/Makefile.am (modified) (8 diffs)

src/Makefile.am

@@ -9 +9 @@
 include Actions/Makefile.am
 include Analysis/Makefile.am
+include Element/Makefile.am
 include Graph/Makefile.am
 include Helpers/Makefile.am
@@ -175 +176 @@
   config.cpp \
   ConfigFileBuffer.cpp \
-  element.cpp \
-  elements_db.cpp \
   Formula.cpp \
   graph.cpp \
@@ -185 +184 @@
   molecule_geometry.cpp \
   molecule_graph.cpp \
-  periodentafel.cpp \
   ThermoStatContainer.cpp \
   UIElements/UIFactory.cpp \
@@ -204 +202 @@
   config.hpp \
   ConfigFileBuffer.hpp \
-  element.hpp \
-  elements_db.hpp \
   Formula.hpp \
   graph.hpp \
   linkedcell.hpp \
   molecule.hpp \
-  periodentafel.hpp \
   ThermoStatContainer.hpp \
   types.hpp \
@@ -271 +266 @@
 libmenu_a_SOURCES = ${UISOURCE} ${UIHEADER} 
 
-molecuilder_DATA = elements.db valence.db orbitals.db Hbonddistance.db Hbondangle.db
+molecuilder_DATA = Element/elements.db Element/valence.db Element/orbitals.db Element/Hbonddistance.db Element/Hbondangle.db
 
 molecuilder_CXXFLAGS = $(AM_CPPFLAGS) 
@@ -303 +298 @@
         $(GUI_LIBS)
 
-joiner_SOURCES = Fragmentation/joiner.cpp Fragmentation/datacreator.cpp datacreator.hpp Fragmentation/periodentafel.hpp
+joiner_SOURCES = Fragmentation/joiner.cpp Fragmentation/datacreator.cpp Fragmentation/datacreator.hpp
 joiner_LDADD = \
         libMolecuilder.la \
@@ -309 +304 @@
         libMolecuilderShapes.la \
         libMolecuilderHelpers.la \
+        libMolecuilderElement.la \
         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
         ${CodePatterns_LIBS} \
         $(BOOST_THREAD_LIBS)
 
-analyzer_SOURCES = Fragmentation/analyzer.cpp Fragmentation/datacreator.cpp periodentafel.hpp Fragmentation/datacreator.hpp 
+analyzer_SOURCES = Fragmentation/analyzer.cpp Fragmentation/datacreator.cpp Fragmentation/datacreator.hpp
 analyzer_LDADD = \
         libMolecuilder.la \
@@ -319 +315 @@
         libMolecuilderShapes.la \
         libMolecuilderHelpers.la \
+        libMolecuilderElement.la \
         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
         ${CodePatterns_LIBS} \