Changeset 400170 for src/Makefile.am


Ignore:
Timestamp:
Jul 28, 2010, 9:35:44 AM (14 years ago)
Author:
Tillmann Crueger <crueger@…>
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:
f12805
Parents:
c6f395 (diff), 677e13 (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 Shapes

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/Makefile.am

    rc6f395 r400170  
    7979EXCEPTIONSOURCE = \
    8080  Exceptions/CustomException.cpp \
     81  Exceptions/IllegalTypeException.cpp \
    8182  Exceptions/LinearDependenceException.cpp \
    8283  Exceptions/MathException.cpp \
     84  Exceptions/MissingValueException.cpp \
    8385  Exceptions/NotInvertibleException.cpp \
    8486  Exceptions/NotOnSurfaceException.cpp \
    … …  
    9092EXCEPTIONHEADER = \
    9193  Exceptions/CustomException.hpp \
     94  Exceptions/IllegalTypeException.hpp \
    9295  Exceptions/LinearDependenceException.hpp \
    9396  Exceptions/MathException.hpp \
     97  Exceptions/MissingValueException.hpp \
    9498  Exceptions/NotInvertibleException.hpp \
    9599  Exceptions/NotOnSurfaceException.hpp \
    … …  
    135139
    136140QTUIMOC_HEADER = UIElements/QT4/QTDialog.hpp \
    137                                  UIElements/QT4/QTMainWindow.hpp \
    138                                  UIElements/Menu/QT4/QTMenu.hpp \
    139                                  UIElements/Views/QT4/QTWorldView.hpp \
    140                                  UIElements/Views/QT4/GLMoleculeView.hpp \
    141                                  UIElements/Views/QT4/QTMoleculeView.hpp \
    142                                  UIElements/Views/QT4/QTStatusBar.hpp
     141        UIElements/QT4/QTMainWindow.hpp \
     142        UIElements/Menu/QT4/QTMenu.hpp \
     143        UIElements/Views/QT4/QTWorldView.hpp \
     144        UIElements/Views/QT4/GLMoleculeView.hpp \
     145        UIElements/Views/QT4/QTMoleculeView.hpp \
     146        UIElements/Views/QT4/QTStatusBar.hpp
    143147 
    144148QTUIMOC_TARGETS = QTMainWindow.moc.cpp \
    145                       QTMenu.moc.cpp\
    146                       QTDialog.moc.cpp \
    147                       QTWorldView.moc.cpp \
    148                       GLMoleculeView.moc.cpp \
    149                       QTMoleculeView.moc.cpp \
    150                       QTStatusBar.moc.cpp
     149        QTMenu.moc.cpp\
     150        QTDialog.moc.cpp \
     151        QTWorldView.moc.cpp \
     152        GLMoleculeView.moc.cpp \
     153        QTMoleculeView.moc.cpp \
     154        QTStatusBar.moc.cpp
    151155
    152156DESCRIPTORSOURCE = Descriptors/AtomDescriptor.cpp \
    … …  
    176180                                 
    177181QTUISOURCE = ${QTUIMOC_TARGETS} \
    178                          UIElements/QT4/QTMainWindow.cpp \
    179                          UIElements/QT4/QTDialog.cpp \
    180                          UIElements/QT4/QTUIFactory.cpp \
    181                          UIElements/Menu/QT4/QTMenu.cpp \
    182                          UIElements/Views/QT4/QTWorldView.cpp \
    183                          UIElements/Views/QT4/GLMoleculeView.cpp \
    184                          UIElements/Views/QT4/QTMoleculeView.cpp \
    185                          UIElements/Views/QT4/QTStatusBar.cpp
     182        UIElements/QT4/QTMainWindow.cpp \
     183        UIElements/QT4/QTDialog.cpp \
     184        UIElements/QT4/QTUIFactory.cpp \
     185        UIElements/Menu/QT4/QTMenu.cpp \
     186        UIElements/Views/QT4/QTWorldView.cpp \
     187        UIElements/Views/QT4/GLMoleculeView.cpp \
     188        UIElements/Views/QT4/QTMoleculeView.cpp \
     189        UIElements/Views/QT4/QTStatusBar.cpp
    186190             
    187191QTUIHEADER = ${QTUIMOC_HEADER} UIElements/QT4/QTUIFactory.hpp
Note: See TracChangeset for help on using the changeset viewer.