Ignore:
Timestamp:
Mar 25, 2010, 12:01:58 PM (16 years ago)
Author:
Tillmann Crueger <crueger@…>
Children:
eb129c
Parents:
db6b872 (diff), 8d9984 (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 MenuRefactoring

File:
1 edited

Legend:

Unmodified
Added
Removed

  • molecuilder/src/Makefile.am

    rdb6b872 rfe3540  
    88ANALYSISHEADER = analysis_bonds.hpp analysis_correlation.hpp
    99
    10 ACTIONSSOURCE = Actions/Action.cpp Actions/Process.cpp Actions/MethodAction.cpp Actions/ActionSequence.cpp Actions/MakroAction.cpp Actions/ErrorAction.cpp Actions/small_actions.cpp Actions/ManipulateAtomsProcess.cpp Actions/ActionRegistry.cpp
    11 ACTIONSHEADER = Actions/Action.hpp Actions/Process.hpp Actions/Calculation.hpp Actions/Calculation_impl.hpp Actions/MethodAction.hpp Actions/ActionSequence.hpp Actions/MakroAction.hpp Actions/ErrorAction.hpp Actions/small_actions.hpp Actions/ManipulateAtomsProcess.hpp Actions/ActionRegistry.hpp
     10ACTIONSSOURCE = Actions/Action.cpp \
     11                                Actions/ActionHistory.cpp \
     12                                Actions/ActionRegistry.cpp \
     13                                Actions/ActionSequence.cpp \
     14                                Actions/ErrorAction.cpp \
     15                                Actions/MakroAction.cpp \
     16                                Actions/ManipulateAtomsProcess.cpp \
     17                                Actions/MethodAction.cpp \
     18                Actions/Process.cpp \
     19                Actions/small_actions.cpp
     20               
     21                 
     22ACTIONSHEADER = Actions/Action.hpp \
     23                                Actions/ActionHistory.hpp \
     24                                Actions/ActionRegistry.hpp \
     25                                Actions/ActionSequence.hpp \
     26                            Actions/Calculation.hpp \
     27                            Actions/Calculation_impl.hpp \
     28                            Actions/ErrorAction.hpp \
     29                            Actions/MakroAction.hpp \
     30                            Actions/ManipulateAtomsProcess.hpp \
     31                            Actions/MethodAction.hpp \
     32                            Actions/Process.hpp \
     33                            Actions/small_actions.hpp
     34                           
     35                           
    1236
    1337PATTERNSOURCE = Patterns/Observer.cpp
    14 PATTERNHEADER = Patterns/Observer.hpp Patterns/Cacheable.hpp
     38PATTERNHEADER = Patterns/Cacheable.hpp \
     39                                Patterns/Observer.hpp \
     40                Patterns/Singleton.hpp
    1541
    1642VIEWSOURCE = Views/View.cpp Views/StringView.cpp Views/MethodStringView.cpp Views/StreamStringView.cpp
    … …  
    3359                                   Descriptors/AtomTypeDescriptor.cpp \
    3460                                   Descriptors/MoleculeDescriptor.cpp \
    35                                    Descriptors/MoleculeIdDescriptor.cpp
     61                                   Descriptors/MoleculeIdDescriptor.cpp
     62                                   
    3663                                   
    3764DESCRIPTORHEADER = Descriptors/AtomDescriptor.hpp \
    … …  
    4067                                   Descriptors/MoleculeDescriptor.hpp \
    4168                                   Descriptors/MoleculeIdDescriptor.hpp
     69                                   
    4270
    43 SOURCE = ${ANALYSISSOURCE} ${ATOMSOURCE} ${PATTERNSOURCE} ${UISOURCE} ${DESCRIPTORSOURCE} ${LEGACYSOURCE} bond.cpp bondgraph.cpp boundary.cpp config.cpp element.cpp ellipsoid.cpp errorlogger.cpp graph.cpp helpers.cpp info.cpp leastsquaremin.cpp linkedcell.cpp lists.cpp log.cpp logger.cpp memoryusageobserver.cpp moleculelist.cpp molecule.cpp molecule_dynamics.cpp molecule_fragmentation.cpp molecule_geometry.cpp molecule_graph.cpp molecule_pointcloud.cpp parser.cpp periodentafel.cpp tesselation.cpp tesselationhelpers.cpp vector.cpp verbose.cpp World.cpp WorldIterators.cpp
     71
     72SOURCE = ${ANALYSISSOURCE} \
     73                 ${ATOMSOURCE} \
     74                 ${PATTERNSOURCE} \
     75                 ${UISOURCE} \
     76                 ${DESCRIPTORSOURCE} \
     77                 ${LEGACYSOURCE} \
     78                 bond.cpp \
     79                 bondgraph.cpp \
     80                 boundary.cpp \
     81                 config.cpp \
     82                 element.cpp \
     83                 ellipsoid.cpp \
     84                 errorlogger.cpp \
     85                 graph.cpp \
     86                 helpers.cpp \
     87                 Helpers/Assert.cpp \
     88                 info.cpp \
     89                 leastsquaremin.cpp \
     90                 linkedcell.cpp \
     91                 lists.cpp \
     92                 log.cpp \
     93                 logger.cpp \
     94                 memoryusageobserver.cpp \
     95                 moleculelist.cpp \
     96                 molecule.cpp \
     97                 molecule_dynamics.cpp \
     98                 molecule_fragmentation.cpp \
     99                 molecule_geometry.cpp \
     100                 molecule_graph.cpp \
     101                 molecule_pointcloud.cpp \
     102                 parser.cpp \
     103                 periodentafel.cpp \
     104                 tesselation.cpp \
     105                 tesselationhelpers.cpp \
     106                 vector.cpp \
     107                 verbose.cpp \
     108                 World.cpp
    44109HEADER = ${ANALYSISHEADER} ${ATOMHEADER} ${PATTERNHEADER} ${UIHEADER} ${DESCRIPTORHEADER} ${LEGACYHEADER} bond.hpp bondgraph.hpp boundary.hpp config.hpp defs.hpp element.hpp ellipsoid.hpp errorlogger.hpp graph.hpp helpers.hpp info.hpp leastsquaremin.hpp linkedcell.hpp lists.hpp log.hpp logger.hpp memoryallocator.hpp memoryusageobserver.hpp molecule.hpp molecule_template.hpp parser.hpp periodentafel.hpp stackclass.hpp tesselation.hpp tesselationhelpers.hpp vector.hpp verbose.hpp World.hpp
    45110
Note: See TracChangeset for help on using the changeset viewer.