Changeset efc3cb for src


Ignore:
Timestamp:
May 8, 2010, 6:27:57 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:
a2ab15
Parents:
b9b604
Message:

minor change: put entries in molecuilder/src/Makefile.am into alphabetical ordering and also single-tab indenting

Signed-off-by: Frederik Heber <heber@…>

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/Makefile.am

    rb9b604 refc3cb  
     1# PLEASE adhere to the alphabetical ordering in this Makefile!
     2# Also indentation by a single tab
     3
    14# this includes source files that need to be present at multiple points
    2 HELPERSOURCE =  Helpers/Assert.cpp \
    3                                 Helpers/MemDebug.cpp
     5HELPERSOURCE =  \
     6  Helpers/Assert.cpp \
     7  Helpers/MemDebug.cpp
    48                       
    5 ATOMSOURCE = atom.cpp atom_atominfo.cpp atom_bondedparticle.cpp atom_bondedparticleinfo.cpp atom_graphnode.cpp atom_graphnodeinfo.cpp atom_particleinfo.cpp atom_trajectoryparticle.cpp atom_trajectoryparticleinfo.cpp
    6 ATOMHEADER = atom.hpp atom_atominfo.hpp atom_bondedparticle.hpp atom_bondedparticleinfo.hpp atom_graphnode.hpp atom_graphnodeinfo.hpp atom_particleinfo.hpp atom_trajectoryparticle.hpp atom_trajectoryparticleinfo.hpp
    7 
    8 LINALGSOURCE = ${HELPERSOURCE} \
    9                gslmatrix.cpp \
    10                            gslvector.cpp \
    11                            linearsystemofequations.cpp \
    12                            Space.cpp \
    13                            vector.cpp
     9ATOMSOURCE = \
     10  atom.cpp \
     11  atom_atominfo.cpp \
     12  atom_bondedparticle.cpp \
     13  atom_bondedparticleinfo.cpp \
     14  atom_graphnode.cpp \
     15  atom_graphnodeinfo.cpp \
     16  atom_particleinfo.cpp \
     17  atom_trajectoryparticle.cpp \
     18  atom_trajectoryparticleinfo.cpp
     19ATOMHEADER = \
     20  atom.hpp \
     21  atom_atominfo.hpp \
     22  atom_bondedparticle.hpp \
     23  atom_bondedparticleinfo.hpp \
     24  atom_graphnode.hpp \
     25  atom_graphnodeinfo.hpp \
     26  atom_particleinfo.hpp \
     27  atom_trajectoryparticle.hpp \
     28  atom_trajectoryparticleinfo.hpp
     29
     30LINALGSOURCE = \
     31  ${HELPERSOURCE} \
     32  gslmatrix.cpp \
     33  gslvector.cpp \
     34  linearsystemofequations.cpp \
     35  Space.cpp \
     36  vector.cpp
    1437                           
    1538LINALGHEADER = gslmatrix.hpp \
    16                            gslvector.hpp \
    17                            linearsystemofequations.hpp \
    18                            Space.hpp \
    19                            vector.hpp
     39  gslvector.hpp \
     40  linearsystemofequations.hpp \
     41  Space.hpp \
     42  vector.hpp
    2043                           
    21 
    22 ANALYSISSOURCE = analysis_bonds.cpp analysis_correlation.cpp
    23 ANALYSISHEADER = analysis_bonds.hpp analysis_correlation.hpp
     44ANALYSISSOURCE = \
     45  analysis_bonds.cpp \
     46  analysis_correlation.cpp
     47ANALYSISHEADER = \
     48  analysis_bonds.hpp \
     49  analysis_correlation.hpp
    2450
    2551ACTIONSSOURCE = Actions/Action.cpp \
    26                                 Actions/ActionHistory.cpp \
    27                                 Actions/ActionRegistry.cpp \
    28                                 Actions/ActionSequence.cpp \
    29                                 Actions/ErrorAction.cpp \
    30                                 Actions/MakroAction.cpp \
    31                                 Actions/ManipulateAtomsProcess.cpp \
    32                                 Actions/MethodAction.cpp \
    33                 Actions/Process.cpp \
    34                 Actions/small_actions.cpp
    35                
    36                  
     52  Actions/ActionHistory.cpp \
     53  Actions/ActionRegistry.cpp \
     54  Actions/ActionSequence.cpp \
     55  Actions/ErrorAction.cpp \
     56  Actions/MakroAction.cpp \
     57  Actions/ManipulateAtomsProcess.cpp \
     58  Actions/MethodAction.cpp \
     59  Actions/small_actions.cpp \
     60  Actions/Process.cpp
     61
    3762ACTIONSHEADER = Actions/Action.hpp \
    38                                 Actions/ActionHistory.hpp \
    39                                 Actions/ActionRegistry.hpp \
    40                                 Actions/ActionSequence.hpp \
    41                             Actions/Calculation.hpp \
    42                             Actions/Calculation_impl.hpp \
    43                             Actions/ErrorAction.hpp \
    44                             Actions/MakroAction.hpp \
    45                             Actions/ManipulateAtomsProcess.hpp \
    46                             Actions/MethodAction.hpp \
    47                             Actions/Process.hpp \
    48                             Actions/small_actions.hpp
    49                            
    50                            
    51 
    52 PARSERSOURCE = Parser/ChangeTracker.cpp Parser/FormatParser.cpp Parser/TremoloParser.cpp Parser/XyzParser.cpp
    53 PARSERHEADER = Parser/ChangeTracker.hpp Parser/FormatParser.hpp Parser/TremoloParser.hpp Parser/XyzParser.hpp
    54 
    55 PATTERNSOURCE = Patterns/Observer.cpp
    56 PATTERNHEADER = Patterns/Cacheable.hpp \
    57                                 Patterns/Observer.hpp \
    58                 Patterns/Singleton.hpp
    59 
    60 VIEWSOURCE = Views/View.cpp Views/StringView.cpp Views/MethodStringView.cpp Views/StreamStringView.cpp
    61 VIEWHEADER = Views/View.hpp Views/StringView.hpp Views/MethodStringView.hpp Views/StreamStringView.hpp
    62 
    63 MENUSOURCE = Menu/Menu.cpp Menu/TextMenu.cpp Menu/MenuItem.cpp Menu/SubMenuItem.cpp Menu/ActionMenuItem.cpp Menu/SeperatorItem.cpp Menu/DisplayMenuItem.cpp
    64 MENUHEADER = Menu/Menu.hpp Menu/TextMenu.hpp Menu/MenuItem.hpp Menu/SubMenuItem.hpp Menu/ActionMenuItem.hpp Menu/SeperatorItem.hpp Menu/DisplayMenuItem.hpp
    65 
    66 UISOURCE = ${ACTIONSSOURCE} ${VIEWSOURCE} ${MENUSOURCE} UIElements/UIFactory.cpp UIElements/TextUIFactory.cpp UIElements/MainWindow.cpp UIElements/TextWindow.cpp UIElements/TextStatusIndicator.cpp UIElements/Dialog.cpp UIElements/TextDialog.cpp
    67 UIHEADER = ${ACTIONSHEADER} ${VIEWHEADER} ${MENUHEADER} UIElements/UIFactory.hpp UIElements/TextUIFactory.hpp UIElements/MainWindow.hpp UIElements/TextWindow.hpp UIElements/TextStatusIndicator.hpp UIElements/Dialog.hpp UIElements/TextDialog.hpp
     63  Actions/ActionHistory.hpp \
     64  Actions/ActionRegistry.hpp \
     65  Actions/ActionSequence.hpp \
     66  Actions/Calculation.hpp \
     67  Actions/Calculation_impl.hpp \
     68  Actions/ErrorAction.hpp \
     69  Actions/MakroAction.hpp \
     70  Actions/ManipulateAtomsProcess.hpp \
     71  Actions/MethodAction.hpp \
     72  Actions/small_actions.hpp \
     73  Actions/Process.hpp
     74 
     75PARSERSOURCE = \
     76  Parser/ChangeTracker.cpp \
     77  Parser/FormatParser.cpp \
     78  Parser/TremoloParser.cpp \
     79  Parser/XyzParser.cpp
     80PARSERHEADER = \
     81  Parser/ChangeTracker.hpp \
     82  Parser/FormatParser.hpp \
     83  Parser/TremoloParser.hpp \
     84  Parser/XyzParser.hpp
     85
     86PATTERNSOURCE = \
     87  Patterns/Observer.cpp
     88PATTERNHEADER = \
     89  Patterns/Cacheable.hpp \
     90  Patterns/Observer.hpp \
     91  Patterns/Singleton.hpp
     92
     93# Below is all for the User Interface
     94
     95VIEWSOURCE = \
     96  Views/View.cpp \
     97  Views/StringView.cpp \
     98  Views/MethodStringView.cpp \
     99  Views/StreamStringView.cpp
     100VIEWHEADER = \
     101  Views/View.hpp \
     102  Views/StringView.hpp \
     103  Views/MethodStringView.hpp \
     104  Views/StreamStringView.hpp
     105
     106MENUSOURCE = \
     107  Menu/Menu.cpp \
     108  Menu/TextMenu.cpp \
     109  Menu/MenuItem.cpp \
     110  Menu/SubMenuItem.cpp \
     111  Menu/ActionMenuItem.cpp \
     112  Menu/SeperatorItem.cpp \
     113  Menu/DisplayMenuItem.cpp
     114 
     115MENUHEADER = \
     116  Menu/Menu.hpp \
     117  Menu/TextMenu.hpp \
     118  Menu/MenuItem.hpp \
     119  Menu/SubMenuItem.hpp \
     120  Menu/ActionMenuItem.hpp \
     121  Menu/SeperatorItem.hpp \
     122  Menu/DisplayMenuItem.hpp
     123
     124UISOURCE = \
     125  ${ACTIONSSOURCE} \
     126  ${MENUSOURCE} \
     127  ${TEXTUISOURCE} \
     128  ${VIEWSOURCE} \
     129  UIElements/Dialog.cpp \
     130  UIElements/MainWindow.cpp \
     131  UIElements/UIFactory.cpp
     132 
     133UIHEADER = \
     134  ${ACTIONSHEADER} \
     135  ${MENUHEADER} \
     136  ${TEXTUIHEADER} \
     137  ${VIEWHEADER} \
     138  UIElements/Dialog.hpp \
     139  UIElements/MainWindow.hpp \
     140  UIElements/UIFactory.hpp
     141
     142TEXTUISOURCE = \
     143  UIElements/TextDialog.cpp \
     144  UIElements/TextStatusIndicator.cpp \
     145  UIElements/TextUIFactory.cpp \
     146  UIElements/TextWindow.cpp
     147TEXTUIHEADER = \
     148  UIElements/TextDialog.hpp \
     149  UIElements/TextStatusIndicator.hpp \
     150  UIElements/TextUIFactory.hpp \
     151  UIElements/TextWindow.hpp
    68152
    69153# all these files are only used for legacy reasons while the transition is in progress
    … …  
    74158
    75159DESCRIPTORSOURCE = Descriptors/AtomDescriptor.cpp \
    76                                    Descriptors/AtomIdDescriptor.cpp \
    77                                    Descriptors/AtomTypeDescriptor.cpp \
    78                                    Descriptors/MoleculeDescriptor.cpp \
    79                                    Descriptors/MoleculeIdDescriptor.cpp
     160  Descriptors/AtomIdDescriptor.cpp \
     161  Descriptors/AtomTypeDescriptor.cpp \
     162  Descriptors/MoleculeDescriptor.cpp \
     163  Descriptors/MoleculeIdDescriptor.cpp
    80164                                   
    81165                                   
    82166DESCRIPTORHEADER = Descriptors/AtomDescriptor.hpp \
    83                                    Descriptors/AtomIdDescriptor.hpp \
    84                                    Descriptors/AtomTypeDescriptor.hpp \
    85                                    Descriptors/MoleculeDescriptor.hpp \
    86                                    Descriptors/MoleculeIdDescriptor.hpp
     167  Descriptors/AtomIdDescriptor.hpp \
     168  Descriptors/AtomTypeDescriptor.hpp \
     169  Descriptors/MoleculeDescriptor.hpp \
     170  Descriptors/MoleculeIdDescriptor.hpp
    87171                                   
    88 
    89 
    90172EXCEPTIONSOURCE = Exceptions/CustomException.cpp \
    91                                   Exceptions/LinearDependenceException.cpp \
    92                                   Exceptions/MathException.cpp \
    93                                   Exceptions/ZeroVectorException.cpp
     173  Exceptions/LinearDependenceException.cpp \
     174  Exceptions/MathException.cpp \
     175  Exceptions/ZeroVectorException.cpp
    94176                                 
    95177EXCEPTIONHEADER = Exceptions/CustomException.hpp \
    96                                   Exceptions/LinearDependenceException.hpp \
    97                                   Exceptions/MathException.hpp \
    98                                   Exceptions/ZeroVectorException.hpp
    99 
    100 SOURCE = ${ANALYSISSOURCE} \
    101                  ${ATOMSOURCE} \
    102                  ${PATTERNSOURCE} \
    103                  ${PARSERSOURCE} \
    104                  ${UISOURCE} \
    105                  ${DESCRIPTORSOURCE} \
    106                  ${HELPERSOURCE} \
    107                  ${LEGACYSOURCE} \
    108                  ${EXCEPTIONSOURCE} \
    109                  bond.cpp \
    110                  bondgraph.cpp \
    111                  boundary.cpp \
    112                  config.cpp \
    113                  element.cpp \
    114                  ellipsoid.cpp \
    115                  errorlogger.cpp \
    116                  graph.cpp \
    117                  helpers.cpp \
    118                  info.cpp \
    119                  leastsquaremin.cpp \
    120                  Line.cpp \
    121                  linkedcell.cpp \
    122                  lists.cpp \
    123                  log.cpp \
    124                  logger.cpp \
    125                  memoryusageobserver.cpp \
    126                  moleculelist.cpp \
    127                  molecule.cpp \
    128                  molecule_dynamics.cpp \
    129                  molecule_fragmentation.cpp \
    130                  molecule_geometry.cpp \
    131                  molecule_graph.cpp \
    132                  molecule_pointcloud.cpp \
    133                  parser.cpp \
    134                  periodentafel.cpp \
    135                  Plane.cpp \
    136                  tesselation.cpp \
    137                  tesselationhelpers.cpp \
    138                  triangleintersectionlist.cpp \
    139                  verbose.cpp \
    140                  vector_ops.cpp \
    141                  World.cpp
     178  Exceptions/LinearDependenceException.hpp \
     179  Exceptions/MathException.hpp \
     180  Exceptions/ZeroVectorException.hpp
     181
     182SOURCE = \
     183  ${ANALYSISSOURCE} \
     184  ${ATOMSOURCE} \
     185  ${PATTERNSOURCE} \
     186  ${PARSERSOURCE} \
     187  ${UISOURCE} \
     188  ${DESCRIPTORSOURCE} \
     189  ${HELPERSOURCE} \
     190  ${LEGACYSOURCE} \
     191  ${EXCEPTIONSOURCE} \
     192  bond.cpp \
     193  bondgraph.cpp \
     194  boundary.cpp \
     195  config.cpp \
     196  element.cpp \
     197  ellipsoid.cpp \
     198  errorlogger.cpp \
     199  graph.cpp \
     200  helpers.cpp \
     201  info.cpp \
     202  leastsquaremin.cpp \
     203  Line.cpp \
     204  linkedcell.cpp \
     205  lists.cpp \
     206  log.cpp \
     207  logger.cpp \
     208  memoryusageobserver.cpp \
     209  moleculelist.cpp \
     210  molecule.cpp \
     211  molecule_dynamics.cpp \
     212  molecule_fragmentation.cpp \
     213  molecule_geometry.cpp \
     214  molecule_graph.cpp \
     215  molecule_pointcloud.cpp \
     216  parser.cpp \
     217  periodentafel.cpp \
     218  Plane.cpp \
     219  tesselation.cpp \
     220  tesselationhelpers.cpp \
     221  triangleintersectionlist.cpp \
     222  verbose.cpp \
     223  vector_ops.cpp \
     224  World.cpp
    142225
    143226HEADER = \
    144           ${ANALYSISHEADER} \
    145           ${ATOMHEADER} \
    146           ${PARSERHEADER} \
    147           ${PATTERNHEADER} \
    148           ${UIHEADER} \
    149           ${DESCRIPTORHEADER} \
    150           ${EXCEPTIONHEADER} \
    151           ${LEGACYHEADER} \
    152           bond.hpp \
    153           bondgraph.hpp \
    154           boundary.hpp \
    155           config.hpp \
    156           defs.hpp \
    157           element.hpp \
    158           ellipsoid.hpp \
    159           errorlogger.hpp \
    160           graph.hpp \
    161           helpers.hpp \
    162           info.hpp \
    163           leastsquaremin.hpp \
    164           Line.hpp \
    165           linkedcell.hpp \
    166           lists.hpp \
    167           log.hpp \
    168           logger.hpp \
    169           memoryallocator.hpp \
    170           memoryusageobserver.hpp \
    171           molecule.hpp \
    172           molecule_template.hpp \
    173           parser.hpp \
    174           periodentafel.hpp \
    175           Plane.hpp \
    176           stackclass.hpp \
    177           tesselation.hpp \
    178           tesselationhelpers.hpp \
    179           triangleintersectionlist.hpp \
    180           verbose.hpp \
    181           vector_ops.hpp \
    182           World.hpp
     227  ${ANALYSISHEADER} \
     228  ${ATOMHEADER} \
     229  ${PARSERHEADER} \
     230  ${PATTERNHEADER} \
     231  ${UIHEADER} \
     232  ${DESCRIPTORHEADER} \
     233  ${EXCEPTIONHEADER} \
     234  ${LEGACYHEADER} \
     235  bond.hpp \
     236  bondgraph.hpp \
     237  boundary.hpp \
     238  config.hpp \
     239  defs.hpp \
     240  element.hpp \
     241  ellipsoid.hpp \
     242  errorlogger.hpp \
     243  graph.hpp \
     244  helpers.hpp \
     245  info.hpp \
     246  leastsquaremin.hpp \
     247  Line.hpp \
     248  linkedcell.hpp \
     249  lists.hpp \
     250  log.hpp \
     251  logger.hpp \
     252  memoryallocator.hpp \
     253  memoryusageobserver.hpp \
     254  molecule.hpp \
     255  molecule_template.hpp \
     256  parser.hpp \
     257  periodentafel.hpp \
     258  Plane.hpp \
     259  stackclass.hpp \
     260  tesselation.hpp \
     261  tesselationhelpers.hpp \
     262  triangleintersectionlist.hpp \
     263  verbose.hpp \
     264  vector_ops.hpp \
     265  World.hpp
    183266
    184267BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB)
    … …  
    199282analyzer_LDADD = libmolecuilder.a $(BOOST_LIB) ${BOOST_THREAD_LIB}
    200283
    201 #EXTRA_DIST = ${molecuilder_DATA}
    202 
    203284FORCE:
    204285$(srcdir)/.git-version: FORCE
Note: See TracChangeset for help on using the changeset viewer.