Changeset 455573 for src/RandomNumbers


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.
Location:
src/RandomNumbers
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • src/RandomNumbers/Makefile.am

    rca2cfa r455573  
    22# Also indentation by a single tab
    33
    4 INCLUDES = -I$(top_srcdir)/src
     4#INCLUDES = -I$(top_srcdir)/src
    55
    66# Position-Independent Code necessary for shared library
    7 AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
    8 AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
     7#AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
     8#AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
    99
    1010RANDOMSOURCE = \
    11         RandomNumberDistribution_Encapsulation.cpp \
    12         RandomNumberDistribution_Parameters.cpp \
    13         RandomNumberDistributionFactory.cpp \
    14         RandomNumberEngine_Encapsulation.cpp \
    15         RandomNumberEngine_Parameters.cpp \
    16         RandomNumberEngineFactory.cpp \
    17         RandomNumberGenerator.cpp \
    18         RandomNumberGeneratorFactory.cpp \
    19         TemplatePowerSetGenerator.hpp \
    20         EmptyPrototypeTable.hpp
     11        RandomNumbers/RandomNumberDistribution_Encapsulation.cpp \
     12        RandomNumbers/RandomNumberDistribution_Parameters.cpp \
     13        RandomNumbers/RandomNumberDistributionFactory.cpp \
     14        RandomNumbers/RandomNumberEngine_Encapsulation.cpp \
     15        RandomNumbers/RandomNumberEngine_Parameters.cpp \
     16        RandomNumbers/RandomNumberEngineFactory.cpp \
     17        RandomNumbers/RandomNumberGenerator.cpp \
     18        RandomNumbers/RandomNumberGeneratorFactory.cpp \
     19        RandomNumbers/TemplatePowerSetGenerator.hpp \
     20        RandomNumbers/EmptyPrototypeTable.hpp
    2121
    2222RANDOMHEADER = \
    23         RandomNumberDistribution.hpp \
    24         RandomNumberDistribution_Parameters.hpp \
    25         RandomNumberDistribution_Encapsulation.hpp \
    26         RandomNumberDistributionFactory.hpp \
    27         RandomNumberEngine.hpp \
    28         RandomNumberEngine_Encapsulation.hpp \
    29         RandomNumberEngine_Parameters.hpp \
    30         RandomNumberEngineFactory.hpp \
    31         RandomNumberGenerator.hpp \
    32         RandomNumberGenerator_Encapsulation.hpp \
    33         RandomNumberGeneratorFactory.hpp
     23        RandomNumbers/RandomNumberDistribution.hpp \
     24        RandomNumbers/RandomNumberDistribution_Parameters.hpp \
     25        RandomNumbers/RandomNumberDistribution_Encapsulation.hpp \
     26        RandomNumbers/RandomNumberDistributionFactory.hpp \
     27        RandomNumbers/RandomNumberEngine.hpp \
     28        RandomNumbers/RandomNumberEngine_Encapsulation.hpp \
     29        RandomNumbers/RandomNumberEngine_Parameters.hpp \
     30        RandomNumbers/RandomNumberEngineFactory.hpp \
     31        RandomNumbers/RandomNumberGenerator.hpp \
     32        RandomNumbers/RandomNumberGenerator_Encapsulation.hpp \
     33        RandomNumbers/RandomNumberGeneratorFactory.hpp
    3434
    35 lib_LTLIBRARIES = libMolecuilderRandomNumbers.la
     35noinst_LTLIBRARIES += libMolecuilderRandomNumbers.la
    3636libMolecuilderRandomNumbers_includedir = $(includedir)/MoleCuilder/RandomNumbers/
    37 #libMolecuilderRandomNumbers_libs =
    38 #       $(GSL_LIBS)
    3937nobase_libMolecuilderRandomNumbers_include_HEADERS = ${RANDOMHEADER}
    4038
    … …  
    5250## library file (.so).  The library ABI version is defined in configure.ac, so
    5351## that all version information is kept in one place.
    54 libMolecuilderRandomNumbers_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
     52#libMolecuilderRandomNumbers_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
    5553
    5654## The generated configuration header is installed in its own subdirectory of
    … …  
    7573#pkgconfig_DATA = $(top_builddir)/MoleCuilder.pc
    7674
    77 unity.cpp:
    78         echo "" >  unity.cpp; \
    79         list='$(LINALGSOURCE)'; for file in $$list; do \
    80           echo "#include \"$(srcdir)/$$file\"" >> unity.cpp; \
    81         done;
    82        
    83 MOSTLYCLEANFILES = unity.cpp

  • src/RandomNumbers/unittests/Makefile.am

    rca2cfa r455573  
    22# Also indentation by a single tab
    33
    4 INCLUDES = -I$(top_srcdir)/src
     4#INCLUDES = -I$(top_srcdir)/src
    55
    6 AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
    7 AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
     6#AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
     7#AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
    88
    9 TESTS = \
     9RANDOMNUMBERTESTSSOURCES = \
     10        ../RandomNumbers/unittests/RandomNumberDistributionFactoryUnitTest.cpp \
     11        ../RandomNumbers/unittests/RandomNumberEngineFactoryUnitTest.cpp \
     12        ../RandomNumbers/unittests/RandomNumberGeneratorFactoryUnitTest.cpp \
     13        ../RandomNumbers/unittests/RandomNumberGeneratorUnitTest.cpp
     14
     15RANDOMNUMBERTESTSHEADERS = \
     16        ../RandomNumbers/unittests/RandomNumberDistributionFactoryUnitTest.hpp \
     17        ../RandomNumbers/unittests/RandomNumberEngineFactoryUnitTest.hpp \
     18        ../RandomNumbers/unittests/RandomNumberGeneratorFactoryUnitTest.hpp \
     19        ../RandomNumbers/unittests/RandomNumberGeneratorUnitTest.hpp
     20
     21RANDOMNUMBERTESTS = \
    1022  RandomNumberDistributionFactoryUnitTest \
    1123  RandomNumberEngineFactoryUnitTest \
    … …  
    1325  RandomNumberGeneratorUnitTest
    1426
     27TESTS += $(RANDOMNUMBERTESTS)
     28check_PROGRAMS += $(RANDOMNUMBERTESTS)
     29noinst_PROGRAMS += $(RANDOMNUMBERTESTS)
    1530
    16 check_PROGRAMS = $(TESTS)
    17 noinst_PROGRAMS = $(TESTS)
    18 
    19 BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
    20 GSLLIBS = \
     31RANDOMNUMBERLIBS = \
    2132        ${CodePatterns_LIBS} \
    2233        $(BOOST_LIB)
    2334
    2435RandomNumberDistributionFactoryUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    25         RandomNumberDistributionFactoryUnitTest.cpp \
    26         RandomNumberDistributionFactoryUnitTest.hpp
    27 RandomNumberDistributionFactoryUnitTest_LDADD = ${GSLLIBS} \
    28         ../../RandomNumbers/libMolecuilderRandomNumbers.la
     36        ../RandomNumbers/unittests/RandomNumberDistributionFactoryUnitTest.cpp \
     37        ../RandomNumbers/unittests/RandomNumberDistributionFactoryUnitTest.hpp
     38RandomNumberDistributionFactoryUnitTest_LDADD = ${RANDOMNUMBERLIBS} \
     39        ../libMolecuilderRandomNumbers.la
    2940
    3041RandomNumberEngineFactoryUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    31         RandomNumberEngineFactoryUnitTest.cpp \
    32         RandomNumberEngineFactoryUnitTest.hpp
    33 RandomNumberEngineFactoryUnitTest_LDADD = ${GSLLIBS} \
    34         ../../RandomNumbers/libMolecuilderRandomNumbers.la
     42        ../RandomNumbers/unittests/RandomNumberEngineFactoryUnitTest.cpp \
     43        ../RandomNumbers/unittests/RandomNumberEngineFactoryUnitTest.hpp
     44RandomNumberEngineFactoryUnitTest_LDADD = ${RANDOMNUMBERLIBS} \
     45        ../libMolecuilderRandomNumbers.la
    3546
    3647RandomNumberGeneratorFactoryUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    37         RandomNumberGeneratorFactoryUnitTest.cpp \
    38         RandomNumberGeneratorFactoryUnitTest.hpp
    39 RandomNumberGeneratorFactoryUnitTest_LDADD = ${GSLLIBS} \
    40         ../../RandomNumbers/libMolecuilderRandomNumbers.la
     48        ../RandomNumbers/unittests/RandomNumberGeneratorFactoryUnitTest.cpp \
     49        ../RandomNumbers/unittests/RandomNumberGeneratorFactoryUnitTest.hpp
     50RandomNumberGeneratorFactoryUnitTest_LDADD = ${RANDOMNUMBERLIBS} \
     51        ../libMolecuilderRandomNumbers.la
    4152
    4253RandomNumberGeneratorUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    43         RandomNumberGeneratorUnitTest.cpp \
    44         RandomNumberGeneratorUnitTest.hpp
    45 RandomNumberGeneratorUnitTest_LDADD = ${GSLLIBS} \
    46         ../../RandomNumbers/libMolecuilderRandomNumbers.la
     54        ../RandomNumbers/unittests/RandomNumberGeneratorUnitTest.cpp \
     55        ../RandomNumbers/unittests/RandomNumberGeneratorUnitTest.hpp
     56RandomNumberGeneratorUnitTest_LDADD = ${RANDOMNUMBERLIBS} \
     57        ../libMolecuilderRandomNumbers.la
    4758
    4859
Note: See TracChangeset for help on using the changeset viewer.