Changeset 8cbb97 for src/Makefile.am


Ignore:
Timestamp:
Apr 29, 2010, 1:55:21 PM (16 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, Candidate_v1.7.0, Candidate_v1.7.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:
d79639
Parents:
632bc3 (diff), 753f02 (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 'VectorRefactoring' into StructureRefactoring

Conflicts:

molecuilder/src/Legacy/oldmenu.cpp
molecuilder/src/Makefile.am
molecuilder/src/analysis_correlation.cpp
molecuilder/src/boundary.cpp
molecuilder/src/builder.cpp
molecuilder/src/config.cpp
molecuilder/src/ellipsoid.cpp
molecuilder/src/linkedcell.cpp
molecuilder/src/molecule.cpp
molecuilder/src/molecule_fragmentation.cpp
molecuilder/src/molecule_geometry.cpp
molecuilder/src/molecule_graph.cpp
molecuilder/src/moleculelist.cpp
molecuilder/src/tesselation.cpp
molecuilder/src/tesselationhelpers.cpp
molecuilder/src/unittests/AnalysisCorrelationToSurfaceUnitTest.cpp
molecuilder/src/unittests/bondgraphunittest.cpp
molecuilder/src/vector.cpp
molecuilder/src/vector.hpp

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/Makefile.am

    r632bc3 r8cbb97  
     1# this includes source files that need to be present at multiple points
     2HELPERSOURCE =  Helpers/Assert.cpp \
     3                                Helpers/MemDebug.cpp
     4                       
    15ATOMSOURCE = 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
    26ATOMHEADER = 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
    37
    4 LINALGSOURCE = gslmatrix.cpp gslvector.cpp linearsystemofequations.cpp
    5 LINALGHEADER = gslmatrix.hpp gslvector.hpp linearsystemofequations.hpp
     8LINALGSOURCE = ${HELPERSOURCE} \
     9               gslmatrix.cpp \
     10                           gslvector.cpp \
     11                           linearsystemofequations.cpp \
     12                           vector.cpp
     13                           
     14LINALGHEADER = gslmatrix.hpp \
     15                           gslvector.hpp \
     16                           linearsystemofequations.hpp \
     17                           vector.hpp
     18                           
    619
    720ANALYSISSOURCE = analysis_bonds.cpp analysis_correlation.cpp
    … …  
    7083
    7184
     85EXCEPTIONSOURCE = Exceptions/CustomException.cpp \
     86                                  Exceptions/LinearDependenceException.cpp
     87                                 
     88EXCEPTIONHEADER = Exceptions/CustomException.hpp \
     89                                  Exceptions/LinearDependenceException.hpp
     90
    7291SOURCE = ${ANALYSISSOURCE} \
    7392                 ${ATOMSOURCE} \
    … …  
    7594                 ${UISOURCE} \
    7695                 ${DESCRIPTORSOURCE} \
     96                 ${HELPERSOURCE} \
    7797                 ${LEGACYSOURCE} \
     98                 ${EXCEPTIONSOURCE} \
    7899                 bond.cpp \
    79100                 bondgraph.cpp \
    … …  
    85106                 graph.cpp \
    86107                 helpers.cpp \
    87                  Helpers/Assert.cpp \
    88                  Helpers/MemDebug.cpp \
    89108                 info.cpp \
    90109                 leastsquaremin.cpp \
    … …  
    103122                 parser.cpp \
    104123                 periodentafel.cpp \
     124                 Plane.cpp \
    105125                 tesselation.cpp \
    106126                 tesselationhelpers.cpp \
    107127                 triangleintersectionlist.cpp \
    108                  vector.cpp \
    109128                 verbose.cpp \
     129                 vector_ops.cpp \
    110130                 World.cpp
    111131
    112132HEADER = \
    113   ${ANALYSISHEADER} \
    114   ${ATOMHEADER} \
    115   ${PATTERNHEADER} \
    116   ${UIHEADER} \
    117   ${DESCRIPTORHEADER} \
    118   ${LEGACYHEADER} \
    119   bond.hpp \
    120   bondgraph.hpp \
    121   boundary.hpp \
    122   config.hpp \
    123   defs.hpp \
    124   element.hpp \
    125   ellipsoid.hpp \
    126   errorlogger.hpp \
    127   graph.hpp \
    128   helpers.hpp \
    129   info.hpp \
    130   leastsquaremin.hpp \
    131   linkedcell.hpp \
    132   lists.hpp \
    133   log.hpp \
    134   logger.hpp \
    135   memoryallocator.hpp \
    136   memoryusageobserver.hpp \
    137   molecule.hpp \
    138   molecule_template.hpp \
    139   parser.hpp \
    140   periodentafel.hpp \
    141   stackclass.hpp \
    142   tesselation.hpp \
    143   tesselationhelpers.hpp \
    144   triangleintersectionlist.hpp \
    145   vector.hpp \
    146   verbose.hpp \
    147   World.hpp
     133          ${ANALYSISHEADER} \
     134          ${ATOMHEADER} \
     135          ${PATTERNHEADER} \
     136          ${UIHEADER} \
     137          ${DESCRIPTORHEADER} \
     138          ${EXCEPTIONHEADER} \
     139          ${LEGACYHEADER} \
     140          bond.hpp \
     141          bondgraph.hpp \
     142          boundary.hpp \
     143          config.hpp \
     144          defs.hpp \
     145          element.hpp \
     146          ellipsoid.hpp \
     147          errorlogger.hpp \
     148          graph.hpp \
     149          helpers.hpp \
     150          info.hpp \
     151          leastsquaremin.hpp \
     152          linkedcell.hpp \
     153          lists.hpp \
     154          log.hpp \
     155          logger.hpp \
     156          memoryallocator.hpp \
     157          memoryusageobserver.hpp \
     158          molecule.hpp \
     159          molecule_template.hpp \
     160          parser.hpp \
     161          periodentafel.hpp \
     162          Plane.hpp \
     163          stackclass.hpp \
     164          tesselation.hpp \
     165          tesselationhelpers.hpp \
     166          triangleintersectionlist.hpp \
     167          verbose.hpp \
     168          vector_ops.hpp \
     169          World.hpp
    148170
    149171BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB)
Note: See TracChangeset for help on using the changeset viewer.