Changeset 9106c6 for src/Makefile.am


Ignore:
Timestamp:
Jul 28, 2010, 1:48:50 PM (15 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:
0bb05a
Parents:
b1a39b (diff), a7b777c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'StructureRefactoring' into stable

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/Makefile.am

    rb1a39b r9106c6  
    7777  Actions/Process.hpp
    7878
    79 EXCEPTIONSOURCE = Exceptions/CustomException.cpp \
    80         Exceptions/IllegalTypeException.cpp \
    81         Exceptions/LinearDependenceException.cpp \
    82         Exceptions/MathException.cpp \
    83         Exceptions/MissingValueException.cpp \
    84         Exceptions/NotInvertibleException.cpp \
    85         Exceptions/SkewException.cpp \
    86         Exceptions/ZeroVectorException.cpp
     79EXCEPTIONSOURCE = \
     80  Exceptions/CustomException.cpp \
     81  Exceptions/IllegalTypeException.cpp \
     82  Exceptions/LinearDependenceException.cpp \
     83  Exceptions/MathException.cpp \
     84  Exceptions/MissingValueException.cpp \
     85  Exceptions/NotInvertibleException.cpp \
     86  Exceptions/ParseError.cpp \
     87  Exceptions/SkewException.cpp \
     88  Exceptions/ZeroVectorException.cpp
    8789                                 
    88 EXCEPTIONHEADER = Exceptions/CustomException.hpp \
    89         Exceptions/IllegalTypeException.hpp \
    90         Exceptions/LinearDependenceException.hpp \
    91         Exceptions/MathException.hpp \
    92         Exceptions/MissingValueException.hpp \
    93         Exceptions/NotInvertibleException.hpp \
    94         Exceptions/SkewException.hpp \
    95         Exceptions/ZeroVectorException.hpp
     90EXCEPTIONHEADER = \
     91  Exceptions/CustomException.hpp \
     92  Exceptions/IllegalTypeException.hpp \
     93  Exceptions/LinearDependenceException.hpp \
     94  Exceptions/MathException.hpp \
     95  Exceptions/MissingValueException.hpp \
     96  Exceptions/NotInvertibleException.hpp \
     97  Exceptions/ParseError.hpp \
     98  Exceptions/SkewException.hpp \
     99  Exceptions/ZeroVectorException.hpp
    96100
    97101PARSERSOURCE = \
    … …  
    151155  Descriptors/AtomTypeDescriptor.cpp \
    152156  Descriptors/MoleculeDescriptor.cpp \
     157  Descriptors/MoleculeFormulaDescriptor.cpp \
    153158  Descriptors/MoleculeIdDescriptor.cpp \
    154159  Descriptors/MoleculeNameDescriptor.cpp \
    … …  
    162167  Descriptors/AtomTypeDescriptor.hpp \
    163168  Descriptors/MoleculeDescriptor.hpp \
     169  Descriptors/MoleculeFormulaDescriptor.hpp \
    164170  Descriptors/MoleculeIdDescriptor.hpp \
    165171  Descriptors/MoleculeNameDescriptor.hpp \
    … …  
    202208  ellipsoid.cpp \
    203209  errorlogger.cpp \
     210  Formula.cpp \
    204211  graph.cpp \
    205212  helpers.cpp \
    … …  
    252259  ellipsoid.hpp \
    253260  errorlogger.hpp \
     261  Formula.hpp \
    254262  graph.hpp \
    255263  helpers.hpp \
Note: See TracChangeset for help on using the changeset viewer.