Changeset 455573 for src/Makefile.am


Ignore:
Timestamp:
Apr 18, 2011, 12:45:06 PM (14 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:
4217e7
Parents:
ca2cfa
git-author:
Frederik Heber <heber@…> (03/02/11 16:25:13)
git-committer:
Frederik Heber <heber@…> (04/18/11 12:45:06)
Message:

Large Commit: SUBDIRS in src/Makefile.am replaced by include.

  • This should let make decide on the dependencies automatically.
  • We had to change each Makefile.am due to different relative location now.
  • FIX: convenience libs were not created due to lib_LT... instead of noinst_LT... (thanks, Ralf!)
  • FIX: convenience libs cannot pass on dependencies on real libs, these (seemingly: libLinearAlgebra) have to be re-specified.
  • FIX: RANDOMSOURCE/HEADER were still present to include in libMolecuilder although RandomNumbers have been outsourced for some time already.
  • this should make it a lot easier for unit tests to get away with the massive dependencies because we may now include single libs and can construct stubs in replacement.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/Makefile.am

    rca2cfa r455573  
    22# Also indentation by a single tab
    33
    4 SUBDIRS = \
    5         RandomNumbers \
    6         Parser \
    7         Shapes \
    8         Graph \
    9         Actions \
    10         UIElements
     4MOSTLYCLEANFILES =
     5lib_LTLIBRARIES =
     6noinst_LTLIBRARIES =
     7
     8include Actions/Makefile.am
     9include Graph/Makefile.am
     10include Parser/Makefile.am
     11include RandomNumbers/Makefile.am
     12include Shapes/Makefile.am
     13include UIElements/Makefile.am
    1114
    1215AM_LDFLAGS = -ldl
    … …  
    3841  analysis_bonds.hpp \
    3942  analysis_correlation.hpp
    40 
    41 ACTIONSSOURCE = \
    42   Actions/Action.cpp \
    43   Actions/ActionHistory.cpp \
    44   Actions/ActionRegistry.cpp \
    45   Actions/ActionSequence.cpp \
    46   Actions/ActionTraits.cpp \
    47   Actions/ErrorAction.cpp \
    48   Actions/MakroAction.cpp \
    49   Actions/ManipulateAtomsProcess.cpp \
    50   Actions/MethodAction.cpp \
    51         Actions/OptionRegistry.cpp \
    52         Actions/OptionTrait.cpp \
    53   Actions/Process.cpp
    54 
    55 ACTIONSHEADER = \
    56   Actions/Action.hpp \
    57   Actions/ActionHistory.hpp \
    58   Actions/ActionRegistry.hpp \
    59   Actions/ActionSequence.hpp \
    60   Actions/ActionTraits.hpp \
    61   Actions/Calculation.hpp \
    62   Actions/Calculation_impl.hpp \
    63   Actions/ErrorAction.hpp \
    64   Actions/MakroAction.hpp \
    65   Actions/ManipulateAtomsProcess.hpp \
    66   Actions/MethodAction.hpp \
    67         Actions/OptionRegistry.hpp \
    68         Actions/OptionTrait.hpp \
    69   Actions/Process.hpp
    7043
    7144BONDSOURCE = \
    … …  
    135108        Dynamics/VerletForceIntegration.hpp
    136109
    137 GRAPHSOURCE = \
    138   Graph/BondGraph.cpp
    139 
    140 GRAPHHEADER = \
    141   Graph/BondGraph.hpp
    142 
    143110HELPERSSOURCE = \
    144111        Helpers/defs.cpp
    … …  
    190157MOLECUILDERSOURCE = \
    191158  ${ANALYSISSOURCE} \
    192   ${ACTIONSSOURCE} \
    193159  ${ATOMSOURCE} \
    194160  ${BONDSOURCE} \
    195161  ${DESCRIPTORSOURCE} \
    196162  ${DYNAMICSSOURCE} \
    197   ${GRAPHSOURCE} \
    198163  ${HELPERSSOURCE} \
    199   ${RANDOMSOURCE} \
    200164  ${THERMOSTATSOURCE} \
    201165  ${TESSELATIONSOURCE} \
    … …  
    225189MOLECUILDERHEADER = \
    226190  ${ANALYSISHEADER} \
    227   ${ACTIONSHEADER} \
    228191  ${ATOMHEADER} \
    229192  ${BONDHEADER} \
    … …  
    231194  ${DESCRIPTORIMPLHEADER} \
    232195  ${DYNAMICSHEADER} \
    233   ${GRAPHHEADER} \
    234196  ${HELPERSHEADER} \
    235   ${RANDOMSOURCE} \
    236197  ${THERMOSTATHEADER} \
    237198  ${TESSELATIONHEADER} \
    … …  
    255216  WorldTime.hpp
    256217
    257 lib_LTLIBRARIES = libMolecuilder.la
     218noinst_LTLIBRARIES += libMolecuilder.la
    258219libMolecuilder_la_includedir = $(includedir)/MoleCuilder/
    259 libMolecuilder_la_LIBADD = \
    260         Graph/libMolecuilderGraph.la \
    261         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    262         ${CodePatterns_LIBS} \
    263         ${BOOST_PROGRAM_OPTIONS_LIB}
    264220
    265221nobase_libMolecuilder_la_include_HEADERS = ${MOLECUILDERHEADER}
    … …  
    278234## library file (.so).  The library ABI version is defined in configure.ac, so
    279235## that all version information is kept in one place.
    280 libMolecuilder_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
     236#libMolecuilder_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
    281237
    282238## The generated configuration header is installed in its own subdirectory of
    … …  
    303259
    304260BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
    305 INCLUDES = -I$(top_srcdir)/LinearAlgebra/src -I$(top_srcdir)/src/unittests -I$(top_srcdir)/src/Actions -I$(top_srcdir)/src/UIElements
     261INCLUDES = -I$(top_srcdir)/src/unittests -I$(top_srcdir)/src/Actions -I$(top_srcdir)/src/UIElements -I$(top_srcdir)/LinearAlgebra/src
    306262
    307263noinst_LIBRARIES = libmenu.a
    … …  
    320276molecuilder_SOURCES = builder.cpp builder_init.cpp builder_init.hpp
    321277molecuilder_LDADD = \
    322         UIElements/libMolecuilderUI.la \
    323         Actions/libMolecuilderActions.la \
    324         Graph/libMolecuilderGraph.la \
    325         libMolecuilder.la \
    326         Parser/libMolecuilderParser.la \
    327         Shapes/libMolecuilderShapes.la \
     278        libMolecuilderUI.la \
    328279        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    329         RandomNumbers/libMolecuilderRandomNumbers.la \
    330280        ${CodePatterns_LIBS} \
    331281        $(BOOST_LIB)
    … …  
    335285molecuildergui_CXXFLAGS = $(BOOST_CPPFLAGS) -DUSE_GUI_QT
    336286molecuildergui_LDFLAGS = $(BOOST_LIB)
     287molecuildergui_LDADD = \
     288        libMolecuilderQtUI.la \
     289        libMolecuilderUI.la \
     290        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     291        ${CodePatterns_LIBS} \
     292        $(BOOST_LIB) \
     293        $(GUI_LIBS)
     294
     295joiner_SOURCES = joiner.cpp datacreator.cpp datacreator.hpp periodentafel.hpp
     296joiner_LDADD = \
     297        libMolecuilder.la \
     298        libMolecuilderParser.la \
     299        libMolecuilderShapes.la \
     300        libMolecuilderRandomNumbers.la \
     301        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     302        ${CodePatterns_LIBS} \
     303        $(BOOST_LIB)
     304
     305analyzer_SOURCES = analyzer.cpp datacreator.cpp periodentafel.hpp datacreator.hpp
     306analyzer_LDADD = \
     307        libMolecuilder.la \
     308        libMolecuilderParser.la \
     309        libMolecuilderShapes.la \
     310        libMolecuilderRandomNumbers.la \
     311        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     312        ${CodePatterns_LIBS} \
     313        $(BOOST_LIB)
    337314
    338315unity_SOURCES = unity.cpp
    339316unity_LDADD = $(BOOST_LIB)
    340317
    341 molecuildergui_LDADD = \
    342         UIElements/libMolecuilderUI.la \
    343         UIElements/libMolecuilderQtUI.la \
    344         Actions/libMolecuilderActions.la \
    345         Graph/libMolecuilderGraph.la \
    346         libMolecuilder.la \
    347         Parser/libMolecuilderParser.la \
    348         Shapes/libMolecuilderShapes.la \
    349         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    350         RandomNumbers/libMolecuilderRandomNumbers.la \
    351         ${CodePatterns_LIBS} \
    352         $(BOOST_LIB) \
    353         ${GUI_LIBS}
    354 
    355 joiner_SOURCES = joiner.cpp datacreator.cpp datacreator.hpp periodentafel.hpp
    356 joiner_LDADD = \
    357         UIElements/libMolecuilderUI.la \
    358         Actions/libMolecuilderActions.la \
    359         Graph/libMolecuilderGraph.la \
    360         libMolecuilder.la \
    361         Parser/libMolecuilderParser.la \
    362         Shapes/libMolecuilderShapes.la \
    363         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    364         RandomNumbers/libMolecuilderRandomNumbers.la \
    365         ${CodePatterns_LIBS} \
    366         $(BOOST_LIB)
    367 
    368 analyzer_SOURCES = analyzer.cpp datacreator.cpp periodentafel.hpp datacreator.hpp
    369 analyzer_LDADD = \
    370         UIElements/libMolecuilderUI.la \
    371         Actions/libMolecuilderActions.la \
    372         Graph/libMolecuilderGraph.la \
    373         libMolecuilder.la \
    374         Parser/libMolecuilderParser.la \
    375         Shapes/libMolecuilderShapes.la \
    376         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    377         RandomNumbers/libMolecuilderRandomNumbers.la \
    378         ${CodePatterns_LIBS} \
    379         $(BOOST_LIB)
    380 
    381 #EXTRA_DIST = ${molecuilder_DATA}
    382318
    383319FORCE:
    … …  
    411347        echo "#include \"$(srcdir)/version.c\"" >> unity.cpp;
    412348
    413 MOSTLYCLEANFILES = unity.cpp
    414 
     349MOSTLYCLEANFILES += unity.cpp
     350
Note: See TracChangeset for help on using the changeset viewer.