Changeset a0064e for src/Makefile.am


Ignore:
Timestamp:
Dec 23, 2010, 5:40:04 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:
ad011c
Parents:
f28a26
git-author:
Frederik Heber <heber@…> (12/22/10 09:18:48)
git-committer:
Frederik Heber <heber@…> (12/23/10 17:40:04)
Message:

Moved stuff in src/Helpers and src/Patterns out to stand-alone project CodePatterns.

Makefile.am's:

  • CodePatterns added to AM_LDFLAGS and AM_CFLAGS
  • libMoleCuilderHelpers removed

Helpers/...

  • defs.hpp include prefixed with Helpers/
  • helpers.?pp removed lots of old, unused functions: bound, ask_value, ...
  • fast_functions.hpp has lots of functions removed as well.
  • all other files and unit tests moved to project CodePatterns.

Patterns/...

  • added ax_codepatterns.m4 containing AM_PATH_CODEPATTERNS to configure.ac
File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/Makefile.am

    rf28a26 ra0064e  
    22# Also indentation by a single tab
    33
    4 SUBDIRS = Actions Exceptions Helpers LinearAlgebra Parser UIElements
    5 
    6 AM_CPPFLAGS = ${BOOST_CPPFLAGS}
     4SUBDIRS = Actions Exceptions LinearAlgebra Parser UIElements
     5
     6AM_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
    77
    88ATOMSOURCE = \
    … …  
    6767
    6868
    69 PATTERNSOURCE = \
    70   Patterns/Observer.cpp
    71 PATTERNHEADER = \
    72   Patterns/Cacheable.hpp \
    73   Patterns/Observer.hpp \
    74   Patterns/Singleton.hpp
    75  
    7669SHAPESOURCE = \
    7770  Shapes/BaseShapes.cpp \
    … …  
    182175  ${THERMOSTATSOURCE} \
    183176  ${TESSELATIONSOURCE} \
     177  Helpers/defs.cpp \
     178  Helpers/helpers.cpp \
    184179  bond.cpp \
    185180  bondgraph.cpp \
    … …  
    218213  ${THERMOSTATHEADER} \
    219214  ${TESSELATIONHEADER} \
     215  Helpers/defs.hpp \
     216  Helpers/fast_functions.hpp \
     217  Helpers/helpers.hpp \
    220218  bond.hpp \
    221219  bondgraph.hpp \
    … …  
    243241libMolecuilder_LIBS = \
    244242        LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la \
     243        ${CodePatterns_LIBS} \
    245244        ${BOOST_PROGRAM_OPTIONS_LIB}
    246245
    … …  
    306305
    307306SubspaceFactorizer_CXXFLAGS = $(BOOST_CPPFLAGS)
    308 SubspaceFactorizer_SOURCES = SubspaceFactorizer.cpp
     307SubspaceFactorizer_SOURCES = SubspaceFactorizer.cpp Helpers/defs.cpp Helpers/defs.hpp Helpers/helpers.cpp Helpers/helpers.hpp
    309308SubspaceFactorizer_LDADD = \
    310309        LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la \
    311310        Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la \
    312         Helpers/libMolecuilderHelpers-@MOLECUILDER_API_VERSION@.la \
     311        ${CodePatterns_LIBS} \
    313312        $(GSLLIB) \
    314313        $(BOOST_LIB)
    … …  
    325324        LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la \
    326325        Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la \
    327         Helpers/libMolecuilderHelpers-@MOLECUILDER_API_VERSION@.la \
     326        ${CodePatterns_LIBS} \
    328327        $(BOOST_LIB)
    329328
    … …  
    344343        LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la \
    345344        Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la \
    346         Helpers/libMolecuilderHelpers-@MOLECUILDER_API_VERSION@.la \
     345        ${CodePatterns_LIBS} \
    347346        $(BOOST_LIB) \
    348347        ${GUI_LIBS}
    … …  
    356355        LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la \
    357356        Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la \
    358         Helpers/libMolecuilderHelpers-@MOLECUILDER_API_VERSION@.la \
     357        ${CodePatterns_LIBS} \
    359358        $(BOOST_LIB)
    360359
    … …  
    367366        LinearAlgebra/libMolecuilderLinearAlgebra-@MOLECUILDER_API_VERSION@.la \
    368367        Exceptions/libMolecuilderExceptions-@MOLECUILDER_API_VERSION@.la \
    369         Helpers/libMolecuilderHelpers-@MOLECUILDER_API_VERSION@.la \
     368        ${CodePatterns_LIBS} \
    370369        $(BOOST_LIB)
    371370
Note: See TracChangeset for help on using the changeset viewer.