Ignore:
Timestamp:
Apr 1, 2010, 12:16:29 PM (16 years ago)
Author:
Saskia Metzler <metzler@…>
Children:
d3513b
Parents:
2704e2 (diff), 770138 (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 Till's structure refactoring

Merge commit 'till/StructureRefactoring' into StateAndFormatParser

Conflicts:

molecuilder/src/Makefile.am
molecuilder/src/unittests/Makefile.am

File:
1 edited

Legend:

Unmodified
Added
Removed

  • molecuilder/src/Makefile.am

    r2704e2 r0f7883  
    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
    1337PARSERSOURCE = Parser/ChangeTracker.cpp Parser/FormatParser.cpp Parser/TremoloParser.cpp Parser/XyzParser.cpp
    … …  
    1539
    1640PATTERNSOURCE = Patterns/Observer.cpp
    17 PATTERNHEADER = Patterns/Observer.hpp Patterns/Cacheable.hpp
     41PATTERNHEADER = Patterns/Cacheable.hpp \
     42                                Patterns/Observer.hpp \
     43                Patterns/Singleton.hpp
    1844
    1945VIEWSOURCE = Views/View.cpp Views/StringView.cpp Views/MethodStringView.cpp Views/StreamStringView.cpp
    … …  
    3662                                   Descriptors/AtomTypeDescriptor.cpp \
    3763                                   Descriptors/MoleculeDescriptor.cpp \
    38                                    Descriptors/MoleculeIdDescriptor.cpp
     64                                   Descriptors/MoleculeIdDescriptor.cpp
     65                                   
    3966                                   
    4067DESCRIPTORHEADER = Descriptors/AtomDescriptor.hpp \
    … …  
    4370                                   Descriptors/MoleculeDescriptor.hpp \
    4471                                   Descriptors/MoleculeIdDescriptor.hpp
     72                                   
    4573
    46 SOURCE = ${ANALYSISSOURCE} ${ATOMSOURCE} ${PARSERSOURCE} ${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
    47 HEADER = ${ANALYSISHEADER} ${ATOMHEADER} ${PARSERHEADER} ${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
     74
     75SOURCE = ${ANALYSISSOURCE} \
     76                 ${ATOMSOURCE} \
     77                 ${PATTERNSOURCE} \
     78                 ${PARSERSOURCE} \
     79                 ${UISOURCE} \
     80                 ${DESCRIPTORSOURCE} \
     81                 ${LEGACYSOURCE} \
     82                 bond.cpp \
     83                 bondgraph.cpp \
     84                 boundary.cpp \
     85                 config.cpp \
     86                 element.cpp \
     87                 ellipsoid.cpp \
     88                 errorlogger.cpp \
     89                 graph.cpp \
     90                 helpers.cpp \
     91                 Helpers/Assert.cpp \
     92                 info.cpp \
     93                 leastsquaremin.cpp \
     94                 linkedcell.cpp \
     95                 lists.cpp \
     96                 log.cpp \
     97                 logger.cpp \
     98                 memoryusageobserver.cpp \
     99                 moleculelist.cpp \
     100                 molecule.cpp \
     101                 molecule_dynamics.cpp \
     102                 molecule_fragmentation.cpp \
     103                 molecule_geometry.cpp \
     104                 molecule_graph.cpp \
     105                 molecule_pointcloud.cpp \
     106                 parser.cpp \
     107                 periodentafel.cpp \
     108                 tesselation.cpp \
     109                 tesselationhelpers.cpp \
     110                 vector.cpp \
     111                 verbose.cpp \
     112                 World.cpp
     113HEADER = ${ANALYSISHEADER} ${ATOMHEADER} ${PATTERNHEADER} ${PARSERHEADER} ${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
    48114
    49115BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB)
Note: See TracChangeset for help on using the changeset viewer.