Changeset 455573 for src


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
Files:
16 edited

Legend:

Unmodified
Added
Removed
  • src/Actions/Makefile.am

    rca2cfa r455573  
    22# Also indentation by a single tab
    33
    4 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src
    5 
    6 AM_LDFLAGS = -ldl
    7 AM_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
    8 
    94ACTIONSSOURCE = \
     5  Actions/Action.cpp \
     6  Actions/ActionHistory.cpp \
     7  Actions/ActionRegistry.cpp \
     8  Actions/ActionSequence.cpp \
     9  Actions/ActionTraits.cpp \
     10  Actions/ErrorAction.cpp \
     11  Actions/MakroAction.cpp \
     12  Actions/ManipulateAtomsProcess.cpp \
     13  Actions/MethodAction.cpp \
     14        Actions/OptionRegistry.cpp \
     15        Actions/OptionTrait.cpp \
     16  Actions/Process.cpp \
     17  Actions/Values.cpp \
     18  Actions/ValueStorage.cpp
     19
     20ACTIONSHEADER = \
     21  Actions/Action.hpp \
     22  Actions/ActionHistory.hpp \
     23  Actions/ActionRegistry.hpp \
     24  Actions/ActionSequence.hpp \
     25  Actions/ActionTraits.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/OptionRegistry.hpp \
     33        Actions/OptionTrait.hpp \
     34  Actions/Process.hpp \
     35  Actions/Values.hpp \
     36        Actions/ValueStorage.hpp
     37 
     38ACTIONPROTOTYPESSOURCE = \
    1039  ${ANALYSISACTIONSOURCE} \
    1140  ${ATOMACTIONSOURCE} \
     
    1948  ${SELECTIONMOLECULEACTIONSOURCE} \
    2049  ${TESSELATIONACTIONSOURCE} \
    21   ${WORLDACTIONSOURCE} \
    22   RedoAction.cpp \
    23   UndoAction.cpp \
    24   Values.cpp \
    25   ValueStorage.cpp
    26 
    27 ACTIONSHEADER = \
     50  $(UNDOACTIONSOURCE) \
     51  ${WORLDACTIONSOURCE}
     52
     53ACTIONPROTOTYPESHEADER = \
    2854  ${ANALYSISACTIONHEADER} \
    2955  ${ATOMACTIONHEADER} \
     
    3763  ${SELECTIONMOLECULEACTIONHEADER} \
    3864  ${TESSELATIONACTIONHEADER} \
    39   ${WORLDACTIONHEADER} \
    40   Values.hpp \
    41   ValueStorage.hpp
    42  
     65  $(UNDOACTIONHEADER) \
     66  ${WORLDACTIONHEADER}
     67
    4368ANALYSISACTIONSOURCE = \
    44   AnalysisAction/DipoleAngularCorrelationAction.cpp \
    45   AnalysisAction/MolecularVolumeAction.cpp \
    46   AnalysisAction/PairCorrelationAction.cpp \
    47   AnalysisAction/PointCorrelationAction.cpp \
    48   AnalysisAction/PrincipalAxisSystemAction.cpp \
    49   AnalysisAction/SurfaceCorrelationAction.cpp
     69  Actions/AnalysisAction/DipoleAngularCorrelationAction.cpp \
     70  Actions/AnalysisAction/MolecularVolumeAction.cpp \
     71  Actions/AnalysisAction/PairCorrelationAction.cpp \
     72  Actions/AnalysisAction/PointCorrelationAction.cpp \
     73  Actions/AnalysisAction/PrincipalAxisSystemAction.cpp \
     74  Actions/AnalysisAction/SurfaceCorrelationAction.cpp
    5075ANALYSISACTIONHEADER = \
    51   AnalysisAction/DipoleAngularCorrelationAction.hpp \
    52   AnalysisAction/MolecularVolumeAction.hpp \
    53   AnalysisAction/PairCorrelationAction.hpp \
    54   AnalysisAction/PointCorrelationAction.hpp \
    55   AnalysisAction/PrincipalAxisSystemAction.hpp \
    56   AnalysisAction/SurfaceCorrelationAction.hpp
     76  Actions/AnalysisAction/DipoleAngularCorrelationAction.hpp \
     77  Actions/AnalysisAction/MolecularVolumeAction.hpp \
     78  Actions/AnalysisAction/PairCorrelationAction.hpp \
     79  Actions/AnalysisAction/PointCorrelationAction.hpp \
     80  Actions/AnalysisAction/PrincipalAxisSystemAction.hpp \
     81  Actions/AnalysisAction/SurfaceCorrelationAction.hpp
    5782
    5883ATOMACTIONSOURCE = \
    59   AtomAction/AddAction.cpp \
    60   AtomAction/ChangeElementAction.cpp \
    61   AtomAction/RemoveAction.cpp \
    62   AtomAction/RotateAroundOriginByAngleAction.cpp \
    63   AtomAction/SaveSelectedAtomsAction.cpp \
    64   AtomAction/TranslateAction.cpp
     84  Actions/AtomAction/AddAction.cpp \
     85  Actions/AtomAction/ChangeElementAction.cpp \
     86  Actions/AtomAction/RemoveAction.cpp \
     87  Actions/AtomAction/RotateAroundOriginByAngleAction.cpp \
     88  Actions/AtomAction/SaveSelectedAtomsAction.cpp \
     89  Actions/AtomAction/TranslateAction.cpp
    6590ATOMACTIONHEADER = \
    66   AtomAction/AddAction.hpp \
    67   AtomAction/ChangeElementAction.hpp \
    68   AtomAction/RemoveAction.cpp \
    69   AtomAction/RotateAroundOriginByAngleAction.hpp \
    70   AtomAction/SaveSelectedAtomsAction.hpp \
    71   AtomAction/TranslateAction.hpp
     91  Actions/AtomAction/AddAction.hpp \
     92  Actions/AtomAction/ChangeElementAction.hpp \
     93  Actions/AtomAction/RemoveAction.cpp \
     94  Actions/AtomAction/RotateAroundOriginByAngleAction.hpp \
     95  Actions/AtomAction/SaveSelectedAtomsAction.hpp \
     96  Actions/AtomAction/TranslateAction.hpp
    7297
    7398CMDACTIONSOURCE = \
    74   CommandAction/BondLengthTableAction.cpp \
    75   CommandAction/ElementDbAction.cpp \
    76   CommandAction/FastParsingAction.cpp \
    77   CommandAction/HelpAction.cpp \
    78   CommandAction/VerboseAction.cpp \
    79   CommandAction/VersionAction.cpp \
    80   CommandAction/WarrantyAction.cpp
     99  Actions/CommandAction/BondLengthTableAction.cpp \
     100  Actions/CommandAction/ElementDbAction.cpp \
     101  Actions/CommandAction/FastParsingAction.cpp \
     102  Actions/CommandAction/HelpAction.cpp \
     103  Actions/CommandAction/VerboseAction.cpp \
     104  Actions/CommandAction/VersionAction.cpp \
     105  Actions/CommandAction/WarrantyAction.cpp
    81106CMDACTIONHEADER = \
    82   CommandAction/BondLengthTableAction.hpp \
    83   CommandAction/ElementDbAction.hpp \
    84   CommandAction/FastParsingAction.hpp \
    85   CommandAction/HelpAction.hpp \
    86   CommandAction/VerboseAction.hpp \
    87   CommandAction/VersionAction.hpp \
    88   CommandAction/WarrantyAction.hpp
     107  Actions/CommandAction/BondLengthTableAction.hpp \
     108  Actions/CommandAction/ElementDbAction.hpp \
     109  Actions/CommandAction/FastParsingAction.hpp \
     110  Actions/CommandAction/HelpAction.hpp \
     111  Actions/CommandAction/VerboseAction.hpp \
     112  Actions/CommandAction/VersionAction.hpp \
     113  Actions/CommandAction/WarrantyAction.hpp
    89114
    90115FRAGMENTATIONACTIONSOURCE = \
    91   FragmentationAction/FragmentationAction.cpp
     116  Actions/FragmentationAction/FragmentationAction.cpp
    92117FRAGMENTATIONACTIONHEADER = \
    93   FragmentationAction/FragmentationAction.hpp
     118  Actions/FragmentationAction/FragmentationAction.hpp
    94119
    95120GRAPHACTIONSOURCE = \
    96   GraphAction/CreateAdjacencyAction.cpp \
    97   GraphAction/DepthFirstSearchAction.cpp \
    98   GraphAction/SubgraphDissectionAction.cpp
     121  Actions/GraphAction/CreateAdjacencyAction.cpp \
     122  Actions/GraphAction/DepthFirstSearchAction.cpp \
     123  Actions/GraphAction/SubgraphDissectionAction.cpp
    99124GRAPHACTIONHEADER = \
    100   GraphAction/CreateAdjacencyAction.hpp \
    101   GraphAction/DepthFirstSearchAction.hpp \
    102   GraphAction/SubgraphDissectionAction.hpp
     125  Actions/GraphAction/CreateAdjacencyAction.hpp \
     126  Actions/GraphAction/DepthFirstSearchAction.hpp \
     127  Actions/GraphAction/SubgraphDissectionAction.hpp
    103128
    104129MOLECULEACTIONSOURCE = \
    105   MoleculeAction/BondFileAction.cpp \
    106   MoleculeAction/ChangeNameAction.cpp \
    107   MoleculeAction/CopyAction.cpp \
    108   MoleculeAction/FillWithMoleculeAction.cpp \
    109   MoleculeAction/FillVoidWithMoleculeAction.cpp \
    110   MoleculeAction/LinearInterpolationofTrajectoriesAction.cpp \
    111   MoleculeAction/LoadAction.cpp \
    112   MoleculeAction/RotateAroundSelfByAngleAction.cpp \
    113   MoleculeAction/RotateToPrincipalAxisSystemAction.cpp \
    114   MoleculeAction/SaveSelectedMoleculesAction.cpp \
    115   MoleculeAction/SaveAdjacencyAction.cpp \
    116   MoleculeAction/SaveBondsAction.cpp \
    117   MoleculeAction/SaveTemperatureAction.cpp \
    118   MoleculeAction/SuspendInWaterAction.cpp \
    119   MoleculeAction/VerletIntegrationAction.cpp
     130  Actions/MoleculeAction/BondFileAction.cpp \
     131  Actions/MoleculeAction/ChangeNameAction.cpp \
     132  Actions/MoleculeAction/CopyAction.cpp \
     133  Actions/MoleculeAction/FillWithMoleculeAction.cpp \
     134  Actions/MoleculeAction/FillVoidWithMoleculeAction.cpp \
     135  Actions/MoleculeAction/LinearInterpolationofTrajectoriesAction.cpp \
     136  Actions/MoleculeAction/LoadAction.cpp \
     137  Actions/MoleculeAction/RotateAroundSelfByAngleAction.cpp \
     138  Actions/MoleculeAction/RotateToPrincipalAxisSystemAction.cpp \
     139  Actions/MoleculeAction/SaveSelectedMoleculesAction.cpp \
     140  Actions/MoleculeAction/SaveAdjacencyAction.cpp \
     141  Actions/MoleculeAction/SaveBondsAction.cpp \
     142  Actions/MoleculeAction/SaveTemperatureAction.cpp \
     143  Actions/MoleculeAction/SuspendInWaterAction.cpp \
     144  Actions/MoleculeAction/VerletIntegrationAction.cpp
    120145MOLECULEACTIONHEADER = \
    121   MoleculeAction/BondFileAction.hpp \
    122   MoleculeAction/ChangeNameAction.hpp \
    123   MoleculeAction/CopyAction.hpp \
    124   MoleculeAction/FillWithMoleculeAction.hpp \
    125   MoleculeAction/FillVoidWithMoleculeAction.hpp \
    126   MoleculeAction/LinearInterpolationofTrajectoriesAction.hpp \
    127   MoleculeAction/LoadAction.cpp \
    128   MoleculeAction/RotateAroundSelfByAngleAction.hpp \
    129   MoleculeAction/RotateToPrincipalAxisSystemAction.hpp \
    130   MoleculeAction/SaveSelectedMoleculesAction.hpp \
    131   MoleculeAction/SaveAdjacencyAction.hpp \
    132   MoleculeAction/SaveBondsAction.hpp \
    133   MoleculeAction/SaveTemperatureAction.hpp \
    134   MoleculeAction/SuspendInWaterAction.hpp \
    135   MoleculeAction/VerletIntegrationAction.hpp
     146  Actions/MoleculeAction/BondFileAction.hpp \
     147  Actions/MoleculeAction/ChangeNameAction.hpp \
     148  Actions/MoleculeAction/CopyAction.hpp \
     149  Actions/MoleculeAction/FillWithMoleculeAction.hpp \
     150  Actions/MoleculeAction/FillVoidWithMoleculeAction.hpp \
     151  Actions/MoleculeAction/LinearInterpolationofTrajectoriesAction.hpp \
     152  Actions/MoleculeAction/LoadAction.cpp \
     153  Actions/MoleculeAction/RotateAroundSelfByAngleAction.hpp \
     154  Actions/MoleculeAction/RotateToPrincipalAxisSystemAction.hpp \
     155  Actions/MoleculeAction/SaveSelectedMoleculesAction.hpp \
     156  Actions/MoleculeAction/SaveAdjacencyAction.hpp \
     157  Actions/MoleculeAction/SaveBondsAction.hpp \
     158  Actions/MoleculeAction/SaveTemperatureAction.hpp \
     159  Actions/MoleculeAction/SuspendInWaterAction.hpp \
     160  Actions/MoleculeAction/VerletIntegrationAction.hpp
    136161
    137162PARSERACTIONSOURCE = \
    138   ParserAction/ParseTremoloPotentialsAction.cpp \
    139   ParserAction/SetMpqcParametersAction.cpp \
    140   ParserAction/SetOutputFormatsAction.cpp
     163  Actions/ParserAction/ParseTremoloPotentialsAction.cpp \
     164  Actions/ParserAction/SetMpqcParametersAction.cpp \
     165  Actions/ParserAction/SetOutputFormatsAction.cpp
    141166PARSERACTIONHEADER = \
    142   ParserAction/ParseTremoloPotentialsAction.hpp \
    143   ParserAction/SetMpqcParametersAction.hpp \
    144   ParserAction/SetOutputFormatsAction.hpp               
     167  Actions/ParserAction/ParseTremoloPotentialsAction.hpp \
     168  Actions/ParserAction/SetMpqcParametersAction.hpp \
     169  Actions/ParserAction/SetOutputFormatsAction.hpp               
    145170
    146171RANDONNUMBERSSOURCE =\
    147         RandomNumbersAction/SetRandomNumbersDistributionAction.cpp \
    148         RandomNumbersAction/SetRandomNumbersEngineAction.cpp
     172        Actions/RandomNumbersAction/SetRandomNumbersDistributionAction.cpp \
     173        Actions/RandomNumbersAction/SetRandomNumbersEngineAction.cpp
    149174RANDONNUMBERSHEADER =\
    150         RandomNumbersAction/SetRandomNumbersDistributionAction.hpp \
    151         RandomNumbersAction/SetRandomNumbersEngineAction.hpp
     175        Actions/RandomNumbersAction/SetRandomNumbersDistributionAction.hpp \
     176        Actions/RandomNumbersAction/SetRandomNumbersEngineAction.hpp
    152177                 
    153178SELECTIONATOMACTIONSOURCE = \
    154         SelectionAction/Atoms/AllAtomsAction.cpp \
    155         SelectionAction/Atoms/AllAtomsInsideCuboidAction.cpp \
    156         SelectionAction/Atoms/AllAtomsInsideSphereAction.cpp \
    157         SelectionAction/Atoms/AllAtomsOfMoleculeAction.cpp \
    158         SelectionAction/Atoms/AtomByElementAction.cpp \
    159         SelectionAction/Atoms/AtomByIdAction.cpp \
    160         SelectionAction/Atoms/ClearAllAtomsAction.cpp \
    161         SelectionAction/Atoms/NotAllAtomsAction.cpp \
    162         SelectionAction/Atoms/NotAllAtomsInsideCuboidAction.cpp \
    163         SelectionAction/Atoms/NotAllAtomsInsideSphereAction.cpp \
    164         SelectionAction/Atoms/NotAllAtomsOfMoleculeAction.cpp \
    165         SelectionAction/Atoms/NotAtomByElementAction.cpp \
    166         SelectionAction/Atoms/NotAtomByIdAction.cpp
     179        Actions/SelectionAction/Atoms/AllAtomsAction.cpp \
     180        Actions/SelectionAction/Atoms/AllAtomsInsideCuboidAction.cpp \
     181        Actions/SelectionAction/Atoms/AllAtomsInsideSphereAction.cpp \
     182        Actions/SelectionAction/Atoms/AllAtomsOfMoleculeAction.cpp \
     183        Actions/SelectionAction/Atoms/AtomByElementAction.cpp \
     184        Actions/SelectionAction/Atoms/AtomByIdAction.cpp \
     185        Actions/SelectionAction/Atoms/ClearAllAtomsAction.cpp \
     186        Actions/SelectionAction/Atoms/NotAllAtomsAction.cpp \
     187        Actions/SelectionAction/Atoms/NotAllAtomsInsideCuboidAction.cpp \
     188        Actions/SelectionAction/Atoms/NotAllAtomsInsideSphereAction.cpp \
     189        Actions/SelectionAction/Atoms/NotAllAtomsOfMoleculeAction.cpp \
     190        Actions/SelectionAction/Atoms/NotAtomByElementAction.cpp \
     191        Actions/SelectionAction/Atoms/NotAtomByIdAction.cpp
    167192SELECTIONATOMACTIONHEADER = \
    168         SelectionAction/Atoms/AllAtomsAction.hpp \
    169         SelectionAction/Atoms/AllAtomsInsideCuboidAction.hpp \
    170         SelectionAction/Atoms/AllAtomsInsideSphereAction.hpp \
    171         SelectionAction/Atoms/AllAtomsOfMoleculeAction.hpp \
    172         SelectionAction/Atoms/AtomByElementAction.hpp \
    173         SelectionAction/Atoms/AtomByIdAction.hpp \
    174         SelectionAction/Atoms/ClearAllAtomsAction.hpp \
    175         SelectionAction/Atoms/NotAllAtomsAction.hpp \
    176         SelectionAction/Atoms/NotAllAtomsInsideCuboidAction.hpp \
    177         SelectionAction/Atoms/NotAllAtomsInsideSphereAction.hpp \
    178         SelectionAction/Atoms/NotAllAtomsOfMoleculeAction.hpp \
    179         SelectionAction/Atoms/NotAtomByElementAction.hpp \
    180         SelectionAction/Atoms/NotAtomByIdAction.hpp
     193        Actions/SelectionAction/Atoms/AllAtomsAction.hpp \
     194        Actions/SelectionAction/Atoms/AllAtomsInsideCuboidAction.hpp \
     195        Actions/SelectionAction/Atoms/AllAtomsInsideSphereAction.hpp \
     196        Actions/SelectionAction/Atoms/AllAtomsOfMoleculeAction.hpp \
     197        Actions/SelectionAction/Atoms/AtomByElementAction.hpp \
     198        Actions/SelectionAction/Atoms/AtomByIdAction.hpp \
     199        Actions/SelectionAction/Atoms/ClearAllAtomsAction.hpp \
     200        Actions/SelectionAction/Atoms/NotAllAtomsAction.hpp \
     201        Actions/SelectionAction/Atoms/NotAllAtomsInsideCuboidAction.hpp \
     202        Actions/SelectionAction/Atoms/NotAllAtomsInsideSphereAction.hpp \
     203        Actions/SelectionAction/Atoms/NotAllAtomsOfMoleculeAction.hpp \
     204        Actions/SelectionAction/Atoms/NotAtomByElementAction.hpp \
     205        Actions/SelectionAction/Atoms/NotAtomByIdAction.hpp
    181206
    182207SELECTIONMOLECULEACTIONSOURCE = \
    183         SelectionAction/Molecules/AllMoleculesAction.cpp \
    184         SelectionAction/Molecules/ClearAllMoleculesAction.cpp \
    185         SelectionAction/Molecules/MoleculeByFormulaAction.cpp \
    186         SelectionAction/Molecules/MoleculeByIdAction.cpp \
    187         SelectionAction/Molecules/MoleculeByNameAction.cpp \
    188         SelectionAction/Molecules/MoleculeByOrderAction.cpp \
    189         SelectionAction/Molecules/MoleculeOfAtomAction.cpp \
    190         SelectionAction/Molecules/NotAllMoleculesAction.cpp \
    191         SelectionAction/Molecules/NotMoleculeByFormulaAction.cpp \
    192         SelectionAction/Molecules/NotMoleculeByIdAction.cpp \
    193         SelectionAction/Molecules/NotMoleculeByNameAction.cpp \
    194         SelectionAction/Molecules/NotMoleculeByOrderAction.cpp \
    195         SelectionAction/Molecules/NotMoleculeOfAtomAction.cpp
     208        Actions/SelectionAction/Molecules/AllMoleculesAction.cpp \
     209        Actions/SelectionAction/Molecules/ClearAllMoleculesAction.cpp \
     210        Actions/SelectionAction/Molecules/MoleculeByFormulaAction.cpp \
     211        Actions/SelectionAction/Molecules/MoleculeByIdAction.cpp \
     212        Actions/SelectionAction/Molecules/MoleculeByNameAction.cpp \
     213        Actions/SelectionAction/Molecules/MoleculeByOrderAction.cpp \
     214        Actions/SelectionAction/Molecules/MoleculeOfAtomAction.cpp \
     215        Actions/SelectionAction/Molecules/NotAllMoleculesAction.cpp \
     216        Actions/SelectionAction/Molecules/NotMoleculeByFormulaAction.cpp \
     217        Actions/SelectionAction/Molecules/NotMoleculeByIdAction.cpp \
     218        Actions/SelectionAction/Molecules/NotMoleculeByNameAction.cpp \
     219        Actions/SelectionAction/Molecules/NotMoleculeByOrderAction.cpp \
     220        Actions/SelectionAction/Molecules/NotMoleculeOfAtomAction.cpp
    196221SELECTIONMOLECULEACTIONHEADER = \
    197         SelectionAction/Molecules/AllMoleculesAction.hpp \
    198         SelectionAction/Molecules/ClearAllMoleculesAction.hpp \
    199         SelectionAction/Molecules/MoleculeByFormulaAction.hpp \
    200         SelectionAction/Molecules/MoleculeByIdAction.hpp \
    201         SelectionAction/Molecules/MoleculeByNameAction.hpp \
    202         SelectionAction/Molecules/MoleculeByOrderAction.hpp \
    203         SelectionAction/Molecules/MoleculeOfAtomAction.hpp \
    204         SelectionAction/Molecules/NotAllMoleculesAction.hpp \
    205         SelectionAction/Molecules/NotMoleculeByFormulaAction.hpp \
    206         SelectionAction/Molecules/NotMoleculeByIdAction.hpp \
    207         SelectionAction/Molecules/NotMoleculeByNameAction.hpp \
    208         SelectionAction/Molecules/NotMoleculeByOrderAction.hpp \
    209         SelectionAction/Molecules/NotMoleculeOfAtomAction.hpp
     222        Actions/SelectionAction/Molecules/AllMoleculesAction.hpp \
     223        Actions/SelectionAction/Molecules/ClearAllMoleculesAction.hpp \
     224        Actions/SelectionAction/Molecules/MoleculeByFormulaAction.hpp \
     225        Actions/SelectionAction/Molecules/MoleculeByIdAction.hpp \
     226        Actions/SelectionAction/Molecules/MoleculeByNameAction.hpp \
     227        Actions/SelectionAction/Molecules/MoleculeByOrderAction.hpp \
     228        Actions/SelectionAction/Molecules/MoleculeOfAtomAction.hpp \
     229        Actions/SelectionAction/Molecules/NotAllMoleculesAction.hpp \
     230        Actions/SelectionAction/Molecules/NotMoleculeByFormulaAction.hpp \
     231        Actions/SelectionAction/Molecules/NotMoleculeByIdAction.hpp \
     232        Actions/SelectionAction/Molecules/NotMoleculeByNameAction.hpp \
     233        Actions/SelectionAction/Molecules/NotMoleculeByOrderAction.hpp \
     234        Actions/SelectionAction/Molecules/NotMoleculeOfAtomAction.hpp
    210235       
    211236TESSELATIONACTIONSOURCE = \
    212   TesselationAction/ConvexEnvelopeAction.cpp \
    213   TesselationAction/NonConvexEnvelopeAction.cpp               
     237  Actions/TesselationAction/ConvexEnvelopeAction.cpp \
     238  Actions/TesselationAction/NonConvexEnvelopeAction.cpp               
    214239TESSELATIONACTIONHEADER = \
    215   TesselationAction/ConvexEnvelopeAction.hpp \
    216   TesselationAction/NonConvexEnvelopeAction.hpp
     240  Actions/TesselationAction/ConvexEnvelopeAction.hpp \
     241  Actions/TesselationAction/NonConvexEnvelopeAction.hpp
     242
     243UNDOACTIONSOURCE = \
     244  Actions/RedoAction.cpp \
     245  Actions/UndoAction.cpp
     246UNDOACTIONHEADER = \
     247  Actions/RedoAction.hpp \
     248  Actions/UndoAction.hpp
     249
    217250
    218251WORLDACTIONSOURCE = \
    219   WorldAction/AddEmptyBoundaryAction.cpp \
    220   WorldAction/BoundInBoxAction.cpp \
    221   WorldAction/CenterInBoxAction.cpp \
    222   WorldAction/CenterOnEdgeAction.cpp \
    223   WorldAction/ChangeBoxAction.cpp \
    224   WorldAction/InputAction.cpp \
    225   WorldAction/OutputAction.cpp \
    226   WorldAction/RepeatBoxAction.cpp \
    227   WorldAction/ScaleBoxAction.cpp \
    228   WorldAction/SetDefaultNameAction.cpp \
    229   WorldAction/SetWorldTimeAction.cpp
     252  Actions/WorldAction/AddEmptyBoundaryAction.cpp \
     253  Actions/WorldAction/BoundInBoxAction.cpp \
     254  Actions/WorldAction/CenterInBoxAction.cpp \
     255  Actions/WorldAction/CenterOnEdgeAction.cpp \
     256  Actions/WorldAction/ChangeBoxAction.cpp \
     257  Actions/WorldAction/InputAction.cpp \
     258  Actions/WorldAction/OutputAction.cpp \
     259  Actions/WorldAction/RepeatBoxAction.cpp \
     260  Actions/WorldAction/ScaleBoxAction.cpp \
     261  Actions/WorldAction/SetDefaultNameAction.cpp \
     262  Actions/WorldAction/SetWorldTimeAction.cpp
    230263WORLDACTIONHEADER = \
    231   WorldAction/AddEmptyBoundaryAction.hpp \
    232   WorldAction/BoundInBoxAction.hpp \
    233   WorldAction/CenterInBoxAction.hpp \
    234   WorldAction/CenterOnEdgeAction.hpp \
    235   WorldAction/ChangeBoxAction.hpp \
    236   WorldAction/InputAction.hpp \
    237   WorldAction/OutputAction.hpp \
    238   WorldAction/RepeatBoxAction.hpp \
    239   WorldAction/ScaleBoxAction.hpp \
    240   WorldAction/SetDefaultNameAction.hpp \
    241   WorldAction/SetWorldTimeAction.hpp
    242 
    243 
    244 lib_LTLIBRARIES = libMolecuilderActions.la
     264  Actions/WorldAction/AddEmptyBoundaryAction.hpp \
     265  Actions/WorldAction/BoundInBoxAction.hpp \
     266  Actions/WorldAction/CenterInBoxAction.hpp \
     267  Actions/WorldAction/CenterOnEdgeAction.hpp \
     268  Actions/WorldAction/ChangeBoxAction.hpp \
     269  Actions/WorldAction/InputAction.hpp \
     270  Actions/WorldAction/OutputAction.hpp \
     271  Actions/WorldAction/RepeatBoxAction.hpp \
     272  Actions/WorldAction/ScaleBoxAction.hpp \
     273  Actions/WorldAction/SetDefaultNameAction.hpp \
     274  Actions/WorldAction/SetWorldTimeAction.hpp
     275
     276
     277noinst_LTLIBRARIES += \
     278        libMolecuilderActions.la \
     279        libMolecuilderActionPrototypes.la
    245280libMolecuilderActions_la_includedir = $(includedir)/MoleCuilder/Actions/
    246 libMolecuilderActions_la_LIBADD = \
    247         ../Parser/libMolecuilderParser.la \
    248         ../Shapes/libMolecuilderShapes.la \
    249         ../Graph/libMolecuilderGraph.la \
    250         ${CodePatterns_LIBS}
    251 #       ../UIElements/libMolecuilderUI.la
     281libMolecuilderActionPrototypes_la_includedir = $(includedir)/MoleCuilder/Actions/
     282
     283#       UIElements/libMolecuilderUI.la
    252284nobase_libMolecuilderActions_la_include_HEADERS = ${ACTIONSHEADER}
     285nobase_libMolecuilderActionPrototypes_la_include_HEADERS = ${ACTIONPROTOTYPESHEADER}
    253286
    254287## Define the source file list for the "libexample-@MOLECUILDER_API_VERSION@.la"
     
    261294## which are already listed elsewhere in a _HEADERS variable assignment.
    262295libMolecuilderActions_la_SOURCES = ${ACTIONSSOURCE}
     296libMolecuilderActionPrototypes_la_SOURCES = ${ACTIONPROTOTYPESSOURCE}
    263297
    264298## Instruct libtool to include ABI version information in the generated shared
    265299## library file (.so).  The library ABI version is defined in configure.ac, so
    266300## that all version information is kept in one place.
    267 libMolecuilderActions_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
     301#libMolecuilderActions_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
    268302
    269303## The generated configuration header is installed in its own subdirectory of
     
    287321#pkgconfigdir = $(libdir)/pkgconfig
    288322#pkgconfig_DATA = $(top_builddir)/MoleCuilder.pc
    289 
    290 unity.cpp:
    291         echo "" >  unity.cpp; \
    292         list='$(ACTIONSSOURCE)'; for file in $$list; do \
    293           echo "#include \"$(srcdir)/$$file\"" >> unity.cpp; \
    294         done;
    295        
    296 MOSTLYCLEANFILES = unity.cpp
  • src/Actions/unittests/ActionRegistryUnitTest.cpp

    rca2cfa r455573  
    5353
    5454  ActionRegistry &AR = ActionRegistry::getInstance();
    55   for (ActionRegistry::const_iterator iter = AR.getBeginIter(); iter != AR.getEndIter(); ++iter)
     55  for (ActionRegistry::const_iterator iter = AR.getBeginIter(); iter != AR.getEndIter(); ++iter) {
    5656    if ((iter->second)->Traits.hasShortForm()) {
    5757      ASSERT(result.find((iter->second)->Traits.getShortForm()) == result.end(),
     
    6161      result[(iter->second)->Traits.getShortForm()] = (iter->second)->getName();
    6262    }
     63  }
    6364}
  • src/Actions/unittests/Makefile.am

    rca2cfa r455573  
    22# Also indentation by a single tab
    33
    4 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src
     4ACTIONTESTSSOURCES = \
     5        ../Actions/unittests/ActionRegistryUnitTest.cpp \
     6        ../Actions/unittests/ActionSequenceUnitTest.cpp \
     7        ../Actions/unittests/AtomsCalculationUnitTest.cpp \
     8        ../Actions/unittests/ManipulateAtomsUnitTest.cpp
    59
    6 AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
    7 AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
     10ACTIONTESTSHEADERS = \
     11        ../Actions/unittests/ActionRegistryUnitTest.hpp \
     12        ../Actions/unittests/ActionSequenceUnitTest.hpp \
     13        ../Actions/unittests/AtomsCalculationUnitTest.hpp \
     14        ../Actions/unittests/ManipulateAtomsUnitTest.hpp
    815
    9 TESTS = \
     16ACTIONTESTS = \
    1017  ActionRegistryUnitTest \
    1118  ActionSequenceUnitTest \
     
    1320  ManipulateAtomsUnitTest
    1421
    15 check_PROGRAMS = $(TESTS)
    16 noinst_PROGRAMS = $(TESTS)
     22TESTS += $(ACTIONTESTS)
     23check_PROGRAMS += $(ACTIONTESTS)
     24noinst_PROGRAMS += $(ACTIONTESTS)
    1725
    18 BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
    19 GSLLIBS = \
    20         ../../Shapes/libMolecuilderShapes.la \
    21         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    22         ../../RandomNumbers/libMolecuilderRandomNumbers.la \
    23         ${CodePatterns_LIBS} \
    24         $(BOOST_LIB)
    25 ALLLIBS = \
    26         ../../UIElements/libMolecuilderUI.la \
    27         ../../Actions/libMolecuilderActions.la \
    28         ${PARSERLIBS} \
    29         ../../libMolecuilder.la \
    30         ${GSLLIBS}
    31 
    32 PARSERLIBS = ../../Parser/libMolecuilderParser.la
    33 UILIBS = ../../UIElements/libMolecuilderUI.la 
    34 
     26ACTIONLIBS = \
     27        ../libMolecuilderUI.la
    3528
    3629ActionRegistryUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    37         ActionRegistryUnitTest.cpp \
    38         ActionRegistryUnitTest.hpp
    39 ActionRegistryUnitTest_LDADD = ${ALLLIBS}
     30        ../Actions/unittests/ActionRegistryUnitTest.cpp \
     31        ../Actions/unittests/ActionRegistryUnitTest.hpp
     32ActionRegistryUnitTest_LDADD = ${ACTIONLIBS}
    4033
    4134ActionSequenceUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    42         ActionSequenceUnitTest.cpp \
    43         ActionSequenceUnitTest.hpp
    44 ActionSequenceUnitTest_LDADD = ${ALLLIBS}
     35        ../Actions/unittests/ActionSequenceUnitTest.cpp \
     36        ../Actions/unittests/ActionSequenceUnitTest.hpp
     37ActionSequenceUnitTest_LDADD = ${ACTIONLIBS}
    4538
    4639AtomsCalculationUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    47         AtomsCalculationUnitTest.cpp \
    48         AtomsCalculationUnitTest.hpp
    49 AtomsCalculationUnitTest_LDADD = ${ALLLIBS}
     40        ../Actions/unittests/AtomsCalculationUnitTest.cpp \
     41        ../Actions/unittests/AtomsCalculationUnitTest.hpp
     42AtomsCalculationUnitTest_LDADD = ${ACTIONLIBS}
    5043
    5144ManipulateAtomsUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    52         ManipulateAtomsUnitTest.cpp \
    53         ManipulateAtomsUnitTest.hpp
    54 ManipulateAtomsUnitTest_LDADD = ${ALLLIBS}
     45        ../Actions/unittests/ManipulateAtomsUnitTest.cpp \
     46        ../Actions/unittests/ManipulateAtomsUnitTest.hpp
     47ManipulateAtomsUnitTest_LDADD = ${ACTIONLIBS}
    5548
    5649
  • src/Descriptors/unittests/Makefile.am

    rca2cfa r455573  
    22# Also indentation by a single tab
    33
    4 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src
     4DESCRIPTORTESTSSOURCES = \
     5        ../Descriptors/unittests/AtomDescriptorUnitTest.cpp \
     6        ../Descriptors/unittests/MoleculeDescriptorUnitTest.cpp
    57
    6 AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
    7 AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
     8DESCRIPTORTESTSHEADERS = \
     9        ../Descriptors/unittests/AtomDescriptorUnitTest.hpp \
     10        ../Descriptors/unittests/MoleculeDescriptorUnitTest.hpp
    811
    9 TESTS = \
     12DESCRIPTORTESTS = \
    1013  AtomDescriptorUnitTest \
    1114  MoleculeDescriptorTest
    1215
    13 check_PROGRAMS = $(TESTS)
    14 noinst_PROGRAMS = $(TESTS)
     16TESTS += $(DESCRIPTORTESTS)
     17check_PROGRAMS += $(DESCRIPTORTESTS)
     18noinst_PROGRAMS += $(DESCRIPTORTESTS)
    1519
    16 BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
    17 GSLLIBS = \
    18         ../../Shapes/libMolecuilderShapes.la \
     20DESCRIPTORLIBS = \
     21        ../libMolecuilderUI.la \
     22        ../libMolecuilderActions.la \
     23        ../libMolecuilderParser.la \
     24        ../libMolecuilder.la \
     25        ../libMolecuilderShapes.la \
    1926        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    20         ../../RandomNumbers/libMolecuilderRandomNumbers.la \
     27        ../libMolecuilderRandomNumbers.la \
    2128        ${CodePatterns_LIBS} \
    2229        $(BOOST_LIB)
    23 ALLLIBS = \
    24         ../../UIElements/libMolecuilderUI.la \
    25         ../../Actions/libMolecuilderActions.la \
    26         ${PARSERLIBS} \
    27         ../../libMolecuilder.la \
    28         ${GSLLIBS}
    29 
    30 PARSERLIBS = ../../Parser/libMolecuilderParser.la
    31 UILIBS = ../../UIElements/libMolecuilderUI.la 
    3230
    3331
    3432AtomDescriptorUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    35         AtomDescriptorUnitTest.cpp \
    36         AtomDescriptorUnitTest.hpp
    37 AtomDescriptorUnitTest_LDADD = ${ALLLIBS}
     33        ../Descriptors/unittests/AtomDescriptorUnitTest.cpp \
     34        ../Descriptors/unittests/AtomDescriptorUnitTest.hpp
     35AtomDescriptorUnitTest_LDADD = ${DESCRIPTORLIBS}
    3836
    3937MoleculeDescriptorTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    40         MoleculeDescriptorUnitTest.cpp \
    41         MoleculeDescriptorUnitTest.hpp
    42 MoleculeDescriptorTest_LDADD = ${ALLLIBS}
     38        ../Descriptors/unittests/MoleculeDescriptorUnitTest.cpp \
     39        ../Descriptors/unittests/MoleculeDescriptorUnitTest.hpp
     40MoleculeDescriptorTest_LDADD = ${DESCRIPTORLIBS}
    4341
    4442
  • src/Graph/Makefile.am

    rca2cfa r455573  
    22# Also indentation by a single tab
    33
    4 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src
    5 
    6 AM_LDFLAGS = ${CodePatterns_LIBS} -ldl
    7 AM_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
    8 
    94GRAPHSOURCE = \
    10         BreadthFirstSearchAdd.cpp \
    11         BuildInducedSubgraph.cpp \
    12         CheckAgainstAdjacencyFile.cpp \
    13         ConnectedSubgraph.cpp \
    14         CyclicStructureAnalysis.cpp \
    15         DepthFirstSearchAnalysis.cpp
     5        Graph/BondGraph.cpp \
     6        Graph/BreadthFirstSearchAdd.cpp \
     7        Graph/BuildInducedSubgraph.cpp \
     8        Graph/CheckAgainstAdjacencyFile.cpp \
     9        Graph/ConnectedSubgraph.cpp \
     10        Graph/CyclicStructureAnalysis.cpp \
     11        Graph/DepthFirstSearchAnalysis.cpp
    1612                                 
    1713GRAPHHEADER = \
    18         BreadthFirstSearchAdd.hpp \
    19         BuildInducedSubgraph.hpp \
    20         CheckAgainstAdjacencyFile.hpp \
    21         ConnectedSubgraph.hpp \
    22         CyclicStructureAnalysis.hpp \
    23         DepthFirstSearchAnalysis.hpp
     14        Graph/BondGraph.hpp \
     15        Graph/BreadthFirstSearchAdd.hpp \
     16        Graph/BuildInducedSubgraph.hpp \
     17        Graph/CheckAgainstAdjacencyFile.hpp \
     18        Graph/ConnectedSubgraph.hpp \
     19        Graph/CyclicStructureAnalysis.hpp \
     20        Graph/DepthFirstSearchAnalysis.hpp
    2421
    2522
    26 lib_LTLIBRARIES = libMolecuilderGraph.la
     23noinst_LTLIBRARIES += libMolecuilderGraph.la
    2724libMolecuilderGraph_la_includedir = $(includedir)/MoleCuilder/Graph/
     25
    2826nobase_libMolecuilderGraph_la_include_HEADERS = ${GRAPHHEADER}
    2927
     
    6361#pkgconfigdir = $(libdir)/pkgconfig
    6462#pkgconfig_DATA = $(top_builddir)/MoleCuilder.pc
    65 
    66 unity.cpp:
    67         echo "" >  unity.cpp; \
    68         list='$(GRAPHSOURCE)'; for file in $$list; do \
    69           echo "#include \"$(srcdir)/$$file\"" >> unity.cpp; \
    70         done;
    71        
    72 MOSTLYCLEANFILES = unity.cpp
  • 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
  • src/Parser/Makefile.am

    rca2cfa r455573  
    22# Also indentation by a single tab
    33
    4 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src
    5 
    6 AM_LDFLAGS = ${CodePatterns_LIBS} -ldl
    7 AM_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
    84
    95PARSERSOURCE = \
    10   ChangeTracker.cpp \
    11   FormatParser.cpp \
    12   FormatParserStorage.cpp \
    13   MpqcParser.cpp \
    14   MpqcParser_Parameters.cpp \
    15   MpqcParser_Parameters_initBasis.cpp \
    16   PcpParser.cpp \
    17   PdbAtomInfoContainer.cpp \
    18   PdbParser.cpp \
    19   TremoloParser.cpp \
    20   TremoloAtomInfoContainer.cpp \
    21   XyzParser.cpp
     6  Parser/ChangeTracker.cpp \
     7  Parser/FormatParser.cpp \
     8  Parser/FormatParserStorage.cpp \
     9  Parser/MpqcParser.cpp \
     10  Parser/MpqcParser_Parameters.cpp \
     11  Parser/MpqcParser_Parameters_initBasis.cpp \
     12  Parser/PcpParser.cpp \
     13  Parser/PdbAtomInfoContainer.cpp \
     14  Parser/PdbParser.cpp \
     15  Parser/TremoloParser.cpp \
     16  Parser/TremoloAtomInfoContainer.cpp \
     17  Parser/XyzParser.cpp
    2218
    2319PARSERHEADER = \
    24   ChangeTracker.hpp \
    25   FormatParser.hpp \
    26   FormatParserStorage.hpp \
    27   MpqcParser.hpp \
    28   MpqcParser_Parameters.hpp \
    29   PcpParser.hpp \
    30   PdbAtomInfoContainer.hpp \
    31   PdbKey.hpp \
    32   PdbParser.hpp \
    33   TremoloKey.hpp \
    34   TremoloParser.hpp \
    35   TremoloAtomInfoContainer.hpp \
    36   XyzParser.hpp
     20  Parser/ChangeTracker.hpp \
     21  Parser/FormatParser.hpp \
     22  Parser/FormatParserStorage.hpp \
     23  Parser/MpqcParser.hpp \
     24  Parser/MpqcParser_Parameters.hpp \
     25  Parser/PcpParser.hpp \
     26  Parser/PdbAtomInfoContainer.hpp \
     27  Parser/PdbKey.hpp \
     28  Parser/PdbParser.hpp \
     29  Parser/TremoloKey.hpp \
     30  Parser/TremoloParser.hpp \
     31  Parser/TremoloAtomInfoContainer.hpp \
     32  Parser/XyzParser.hpp
    3733
    3834
    39 lib_LTLIBRARIES = libMolecuilderParser.la
     35noinst_LTLIBRARIES += libMolecuilderParser.la
    4036libMolecuilderParser_la_includedir = $(includedir)/MoleCuilder/Parser/
     37
    4138nobase_libMolecuilderParser_la_include_HEADERS = ${PARSERHEADER}
    4239
     
    5451## library file (.so).  The library ABI version is defined in configure.ac, so
    5552## that all version information is kept in one place.
    56 libMolecuilderParser_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
     53#libMolecuilderParser_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
    5754
    5855## The generated configuration header is installed in its own subdirectory of
     
    7673#pkgconfigdir = $(libdir)/pkgconfig
    7774#pkgconfig_DATA = $(top_builddir)/MoleCuilder.pc
    78 
    79 unity.cpp:
    80         echo "" >  unity.cpp; \
    81         list='$(PARSERSOURCE)'; for file in $$list; do \
    82           echo "#include \"$(srcdir)/$$file\"" >> unity.cpp; \
    83         done;
    84        
    85 MOSTLYCLEANFILES = unity.cpp
  • src/Parser/unittests/Makefile.am

    rca2cfa r455573  
    22# Also indentation by a single tab
    33
    4 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src
    54
    6 AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
    7 AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
     5PARSERTESTSSOURCES = \
     6        ../Parser/unittests/ParserMpqcUnitTest.cpp \
     7        ../Parser/unittests/ParserPcpUnitTest.cpp \
     8        ../Parser/unittests/ParserPdbUnitTest.cpp \
     9        ../Parser/unittests/ParserTremoloUnitTest.cpp \
     10        ../Parser/unittests/ParserXyzUnitTest.cpp
    811
    9 TESTS = \
     12PARSERTESTSHEADERS = \
     13        ../Parser/unittests/ParserMpqcUnitTest.hpp \
     14        ../Parser/unittests/ParserPcpUnitTest.hpp \
     15        ../Parser/unittests/ParserPdbUnitTest.hpp \
     16        ../Parser/unittests/ParserTremoloUnitTest.hpp \
     17        ../Parser/unittests/ParserXyzUnitTest.hpp
     18
     19PARSERTESTS = \
    1020  ParserMpqcUnitTest \
    1121  ParserPcpUnitTest \
     
    1424  ParserXyzUnitTest
    1525
     26TESTS += $(PARSERTESTS)
     27check_PROGRAMS += $(PARSERTESTS)
     28noinst_PROGRAMS += $(PARSERTESTS)
    1629
    17 check_PROGRAMS = $(TESTS)
    18 noinst_PROGRAMS = $(TESTS)
    19 
    20 BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
    21 GSLLIBS = \
    22         ../../Shapes/libMolecuilderShapes.la \
     30PARSERLIBS = \
     31        ../libMolecuilderUI.la \
    2332        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    24         ../../RandomNumbers/libMolecuilderRandomNumbers.la \
    2533        ${CodePatterns_LIBS} \
    2634        $(BOOST_LIB)
    2735
    28 ALLLIBS = \
    29         ../../UIElements/libMolecuilderUI.la \
    30         ../../Actions/libMolecuilderActions.la \
    31         ${PARSERLIBS} \
    32         ../../libMolecuilder.la \
    33         ${GSLLIBS}
    3436
    35 PARSERLIBS = ../../Parser/libMolecuilderParser.la
    36 UILIBS = ../../UIElements/libMolecuilderUI.la 
    3737
    3838ParserMpqcUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    39         ParserMpqcUnitTest.cpp \
    40         ParserMpqcUnitTest.hpp
    41 ParserMpqcUnitTest_LDADD = ${ALLLIBS}
     39        ../Parser/unittests/ParserMpqcUnitTest.cpp \
     40        ../Parser/unittests/ParserMpqcUnitTest.hpp
     41ParserMpqcUnitTest_LDADD = ${PARSERLIBS}
    4242
    4343ParserPcpUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    44         ParserPcpUnitTest.cpp \
    45         ParserPcpUnitTest.hpp
    46 ParserPcpUnitTest_LDADD = ${ALLLIBS}
     44        ../Parser/unittests/ParserPcpUnitTest.cpp \
     45        ../Parser/unittests/ParserPcpUnitTest.hpp
     46ParserPcpUnitTest_LDADD = ${PARSERLIBS}
    4747
    4848ParserPdbUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    49         ParserPdbUnitTest.cpp \
    50         ParserPdbUnitTest.hpp
    51 ParserPdbUnitTest_LDADD = ${ALLLIBS}
     49        ../Parser/unittests/ParserPdbUnitTest.cpp \
     50        ../Parser/unittests/ParserPdbUnitTest.hpp
     51ParserPdbUnitTest_LDADD = ${PARSERLIBS}
    5252
    5353ParserTremoloUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    54         ParserTremoloUnitTest.cpp \
    55         ParserTremoloUnitTest.hpp
    56 ParserTremoloUnitTest_LDADD = ${ALLLIBS}
     54        ../Parser/unittests/ParserTremoloUnitTest.cpp \
     55        ../Parser/unittests/ParserTremoloUnitTest.hpp
     56ParserTremoloUnitTest_LDADD = ${PARSERLIBS}
    5757
    5858ParserXyzUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    59         ParserXyzUnitTest.cpp \
    60         ParserXyzUnitTest.hpp
    61 ParserXyzUnitTest_LDADD = ${ALLLIBS}
     59        ../Parser/unittests/ParserXyzUnitTest.cpp \
     60        ../Parser/unittests/ParserXyzUnitTest.hpp
     61ParserXyzUnitTest_LDADD = ${PARSERLIBS}
    6262
    6363
  • 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
  • src/Shapes/Makefile.am

    rca2cfa r455573  
    22# Also indentation by a single tab
    33
    4 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src
    5 
    6 # Position-Independent Code necessary for shared library
    7 AM_LDFLAGS = ${CodePatterns_LIBS} -ldl
    8 AM_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
    9 
    104SHAPESOURCE = \
    11   BaseShapes.cpp \
    12   Shape.cpp \
    13   ShapeOps.cpp
     5  Shapes/BaseShapes.cpp \
     6  Shapes/Shape.cpp \
     7  Shapes/ShapeOps.cpp
    148SHAPEHEADER = \
    15   BaseShapes.hpp \
    16   Shape.hpp \
    17   ShapeOps.hpp
     9  Shapes/BaseShapes.hpp \
     10  Shapes/BaseShapes_impl.hpp \
     11  Shapes/Shape.hpp \
     12  Shapes/Shape_impl.hpp \
     13  Shapes/ShapeOps.hpp \
     14  Shapes/ShapeOps_impl.hpp
    1815
    1916 
    2017
    21 lib_LTLIBRARIES = libMolecuilderShapes.la
     18noinst_LTLIBRARIES += libMolecuilderShapes.la
    2219libMolecuilderShapes_la_includedir = $(includedir)/MoleCuilder/Shapes/
    23 libMolecuilderShapes_la_LIBADD = \
    24   $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    25         $(GSL_LIBS)
    2620nobase_libMolecuilderShapes_la_include_HEADERS = ${SHAPEHEADER}
    2721
     
    3933## library file (.so).  The library ABI version is defined in configure.ac, so
    4034## that all version information is kept in one place.
    41 libMolecuilderShapes_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
     35#libMolecuilderShapes_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
    4236
    4337## The generated configuration header is installed in its own subdirectory of
     
    6256#pkgconfig_DATA = $(top_builddir)/MoleCuilder.pc
    6357
    64 unity.cpp:
    65         echo "" >  unity.cpp; \
    66         list='$(LINALGSOURCE)'; for file in $$list; do \
    67           echo "#include \"$(srcdir)/$$file\"" >> unity.cpp; \
    68         done;
    69        
    70 MOSTLYCLEANFILES = unity.cpp
  • src/Shapes/unittests/Makefile.am

    rca2cfa r455573  
    22# Also indentation by a single tab
    33
    4 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src
    54
    6 AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
    7 AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
     5SHAPETESTSSOURCES = \
     6        ../Shapes/unittests/ShapeUnitTest.cpp
    87
    9 TESTS = \
     8SHAPETESTSHEADERS= \
     9        ../Shapes/unittests/ShapeUnitTest.hpp
     10
     11SHAPETESTS = \
    1012  ShapeUnittest
    1113 
     14TESTS += $(SHAPETESTS)
     15check_PROGRAMS += $(SHAPETESTS)
     16noinst_PROGRAMS += $(SHAPETESTS)
    1217
    13 check_PROGRAMS = $(TESTS)
    14 noinst_PROGRAMS = $(TESTS)
    15 
    16 BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
    1718SHAPELIBS = \
    18         ../../Shapes/libMolecuilderShapes.la \
     19        ../libMolecuilderShapes.la \
    1920        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    2021        ${CodePatterns_LIBS} \
     
    2223
    2324ShapeUnittest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    24         ShapeUnitTest.cpp \
    25         ShapeUnitTest.hpp \
    26         ../../Helpers/defs.cpp
     25        ../Shapes/unittests/ShapeUnitTest.cpp \
     26        ../Shapes/unittests/ShapeUnitTest.hpp
     27nodist_ShapeUnittest_SOURCES = \
     28        ../Helpers/defs.hpp \
     29        ../Helpers/defs.cpp
    2730ShapeUnittest_LDADD = $(SHAPELIBS)
    2831
  • src/UIElements/CommandLineUI/unittests/Makefile.am

    rca2cfa r455573  
    22# Also indentation by a single tab
    33
    4 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src -I$(top_srcdir)/src/UIElements
     4UIELEMENTSCOMMANDLINEPARSERTESTSSOURCES = \
     5  ../UIElements/CommandLineUI/unittests/CommandLineParser_ActionRegistry_ConsistenyUnitTest.cpp
    56
    6 AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
    7 AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
     7UIELEMENTSCOMMANDLINEPARSERTESTSHEADERS = \
     8  ../UIElements/CommandLineUI/unittests/CommandLineParser_ActionRegistry_ConsistenyUnitTest.hpp
    89
    9 TESTS = \
    10   CommandLineParser_ActionRegistry_ConsistenyUnitTest
     10UIELEMENTSCOMMANDLINEPARSERTESTS = \
     11  CommandLineParser_ActionRegistry_ConsistencyUnitTest
    1112
     13TESTS += $(UIELEMENTSCOMMANDLINEPARSERTESTS)
     14check_PROGRAMS += $(UIELEMENTSCOMMANDLINEPARSERTESTS)
     15noinst_PROGRAMS += $(UIELEMENTSCOMMANDLINEPARSERTESTS)
    1216
    13 check_PROGRAMS = $(TESTS)
    14 noinst_PROGRAMS = $(TESTS)
    15 
    16 BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
    17 
    18 CommandLineParser_ActionRegistry_ConsistenyUnitTest_SOURCES =  $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    19         CommandLineParser_ActionRegistry_ConsistenyUnitTest.cpp \
    20         CommandLineParser_ActionRegistry_ConsistenyUnitTest.hpp
    21 CommandLineParser_ActionRegistry_ConsistenyUnitTest_LDADD = \
    22   ../../libMolecuilderUI.la \
    23   ../../../Actions/libMolecuilderActions.la \
    24         ../../../Graph/libMolecuilderGraph.la \
    25         ../../../libMolecuilder.la \
    26         ../../../Parser/libMolecuilderParser.la \
    27         ../../../Shapes/libMolecuilderShapes.la \
    28         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    29         ../../../RandomNumbers/libMolecuilderRandomNumbers.la \
    30         ${CodePatterns_LIBS} \
    31         $(BOOST_LIB)
     17CommandLineParser_ActionRegistry_ConsistencyUnitTest_SOURCES =  $(top_srcdir)/src/unittests/UnitTestMain.cpp \
     18  ../UIElements/CommandLineUI/unittests/CommandLineParser_ActionRegistry_ConsistenyUnitTest.cpp \
     19  ../UIElements/CommandLineUI/unittests/CommandLineParser_ActionRegistry_ConsistenyUnitTest.hpp
     20CommandLineParser_ActionRegistry_ConsistencyUnitTest_LDADD = \
     21  ../libMolecuilderUI.la \
     22  ../libMolecuilderActions.la \
     23  ../libMolecuilderGraph.la \
     24  ../libMolecuilder.la \
     25  ../libMolecuilderParser.la \
     26  ../libMolecuilderShapes.la \
     27  $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     28  ../libMolecuilderRandomNumbers.la \
     29  ${CodePatterns_LIBS} \
     30  $(BOOST_LIB)
    3231
    3332#AUTOMAKE_OPTIONS = parallel-tests
  • src/UIElements/Makefile.am

    rca2cfa r455573  
    11# Below is all for the User Interface
    22
    3 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src -I$(top_srcdir)/src/UIElements
    4 
    5 AM_LDFLAGS = ${CodePatterns_LIBS} -ldl
    6 AM_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} ${QT_CXXFLAGS}
    7  
    8 VIEWSOURCE = \
    9   Views/View.cpp \
    10   Views/StringView.cpp \
    11   Views/MethodStringView.cpp \
    12   Views/StreamStringView.cpp
    13 VIEWHEADER = \
    14   Views/View.hpp \
    15   Views/StringView.hpp \
    16   Views/MethodStringView.hpp \
    17   Views/StreamStringView.hpp
     3COMMANDLINEUISOURCE = \
     4        UIElements/CommandLineUI/Query/AtomCommandLineQuery.cpp \
     5        UIElements/CommandLineUI/Query/AtomsCommandLineQuery.cpp \
     6  UIElements/CommandLineUI/Query/BooleanCommandLineQuery.cpp \
     7  UIElements/CommandLineUI/Query/BoxCommandLineQuery.cpp \
     8  UIElements/CommandLineUI/Query/DoubleCommandLineQuery.cpp \
     9  UIElements/CommandLineUI/Query/DoublesCommandLineQuery.cpp \
     10  UIElements/CommandLineUI/Query/ElementCommandLineQuery.cpp \
     11  UIElements/CommandLineUI/Query/ElementsCommandLineQuery.cpp \
     12  UIElements/CommandLineUI/Query/EmptyCommandLineQuery.cpp \
     13  UIElements/CommandLineUI/Query/FileCommandLineQuery.cpp \
     14  UIElements/CommandLineUI/Query/IntCommandLineQuery.cpp \
     15  UIElements/CommandLineUI/Query/IntsCommandLineQuery.cpp \
     16  UIElements/CommandLineUI/Query/MoleculeCommandLineQuery.cpp \
     17  UIElements/CommandLineUI/Query/MoleculesCommandLineQuery.cpp \
     18  UIElements/CommandLineUI/Query/StringCommandLineQuery.cpp \
     19  UIElements/CommandLineUI/Query/StringsCommandLineQuery.cpp \
     20  UIElements/CommandLineUI/Query/VectorCommandLineQuery.cpp \
     21  UIElements/CommandLineUI/Query/VectorsCommandLineQuery.cpp \
     22  UIElements/CommandLineUI/Query/RandomNumberDistribution_ParametersCommandLineQuery.cpp \
     23  UIElements/CommandLineUI/CommandLineDialog.cpp \
     24  UIElements/CommandLineUI/CommandLineParser.cpp \
     25  UIElements/CommandLineUI/CommandLineParser_validate.cpp \
     26  UIElements/CommandLineUI/CommandLineStatusIndicator.cpp \
     27  UIElements/CommandLineUI/CommandLineUIFactory.cpp \
     28  UIElements/CommandLineUI/CommandLineWindow.cpp \
     29  UIElements/CommandLineUI/TypeEnumContainer.cpp
     30 
     31COMMANDLINEUIHEADER = \
     32  UIElements/CommandLineUI/Query/CommandLineQuery.hpp \
     33  UIElements/CommandLineUI/CommandLineDialog.hpp \
     34  UIElements/CommandLineUI/CommandLineParser.hpp \
     35  UIElements/CommandLineUI/CommandLineParser_validate.hpp \
     36  UIElements/CommandLineUI/CommandLineStatusIndicator.hpp \
     37  UIElements/CommandLineUI/CommandLineUIFactory.hpp \
     38  UIElements/CommandLineUI/CommandLineWindow.hpp \
     39  UIElements/CommandLineUI/TypeEnumContainer.hpp
    1840
    1941MENUSOURCE = \
    20   Menu/Menu.cpp \
    21   Menu/MenuDescription.cpp \
    22   Menu/MenuInterface.cpp
     42  UIElements/Menu/Menu.cpp \
     43  UIElements/Menu/MenuDescription.cpp \
     44  UIElements/Menu/MenuInterface.cpp
    2345
    2446MENUHEADER = \
    25   Menu/Menu.hpp \
    26   Menu/MenuDescription.hpp \
    27   Menu/MenuInterface.hpp
     47  UIElements/Menu/Menu.hpp \
     48  UIElements/Menu/MenuDescription.hpp \
     49  UIElements/Menu/MenuInterface.hpp
    2850 
    2951TEXTMENUSOURCE = \
    30   Menu/TextMenu/TxMenuLeaveAction.cpp \
    31   Menu/TextMenu/TxMenu.cpp \
    32   Menu/TextMenu/MenuItem.cpp \
    33   Menu/TextMenu/SubMenuItem.cpp \
    34   Menu/TextMenu/ActionMenuItem.cpp \
    35   Menu/TextMenu/SeparatorMenuItem.cpp \
    36   Menu/TextMenu/DisplayMenuItem.cpp
     52  UIElements/Menu/TextMenu/TxMenuLeaveAction.cpp \
     53  UIElements/Menu/TextMenu/TxMenu.cpp \
     54  UIElements/Menu/TextMenu/MenuItem.cpp \
     55  UIElements/Menu/TextMenu/SubMenuItem.cpp \
     56  UIElements/Menu/TextMenu/ActionMenuItem.cpp \
     57  UIElements/Menu/TextMenu/SeparatorMenuItem.cpp \
     58  UIElements/Menu/TextMenu/DisplayMenuItem.cpp
    3759 
    3860TEXTMENUHEADER = \
    39   Menu/TextMenu/TextMenu.hpp \
    40   Menu/TextMenu/TxMenu.hpp \
    41   Menu/TextMenu/MenuItem.hpp \
    42   Menu/TextMenu/SubMenuItem.hpp \
    43   Menu/TextMenu/ActionMenuItem.hpp \
    44   Menu/TextMenu/SeparatorMenuItem.hpp \
    45   Menu/TextMenu/DisplayMenuItem.hpp
     61  UIElements/Menu/TextMenu/TextMenu.hpp \
     62  UIElements/Menu/TextMenu/TxMenu.hpp \
     63  UIElements/Menu/TextMenu/MenuItem.hpp \
     64  UIElements/Menu/TextMenu/SubMenuItem.hpp \
     65  UIElements/Menu/TextMenu/ActionMenuItem.hpp \
     66  UIElements/Menu/TextMenu/SeparatorMenuItem.hpp \
     67  UIElements/Menu/TextMenu/DisplayMenuItem.hpp
     68
     69TEXTUISOURCE = \
     70  UIElements/TextUI/Query/AtomsTextQuery.cpp \
     71  UIElements/TextUI/Query/AtomTextQuery.cpp \
     72  UIElements/TextUI/Query/BooleanTextQuery.cpp \
     73  UIElements/TextUI/Query/BoxTextQuery.cpp \
     74  UIElements/TextUI/Query/DoubleTextQuery.cpp \
     75  UIElements/TextUI/Query/DoublesTextQuery.cpp \
     76  UIElements/TextUI/Query/ElementTextQuery.cpp \
     77  UIElements/TextUI/Query/ElementsTextQuery.cpp \
     78  UIElements/TextUI/Query/EmptyTextQuery.cpp \
     79  UIElements/TextUI/Query/FileTextQuery.cpp \
     80  UIElements/TextUI/Query/IntTextQuery.cpp \
     81  UIElements/TextUI/Query/IntsTextQuery.cpp \
     82  UIElements/TextUI/Query/MoleculesTextQuery.cpp \
     83  UIElements/TextUI/Query/MoleculeTextQuery.cpp \
     84  UIElements/TextUI/Query/StringTextQuery.cpp \
     85  UIElements/TextUI/Query/StringsTextQuery.cpp \
     86  UIElements/TextUI/Query/VectorTextQuery.cpp \
     87  UIElements/TextUI/Query/VectorsTextQuery.cpp \
     88  UIElements/TextUI/Query/RandomNumberDistribution_ParametersTextQuery.cpp \
     89  UIElements/TextUI/TextDialog.cpp \
     90  UIElements/TextUI/TextStatusIndicator.cpp \
     91  UIElements/TextUI/TextUIFactory.cpp \
     92  UIElements/TextUI/TextWindow.cpp
     93TEXTUIHEADER = \
     94  UIElements/TextUI/Query/TextQuery.hpp \
     95  UIElements/TextUI/TextDialog.hpp \
     96  UIElements/TextUI/TextStatusIndicator.hpp \
     97  UIElements/TextUI/TextUIFactory.hpp \
     98  UIElements/TextUI/TextWindow.hpp
     99
     100VIEWSOURCE = \
     101  UIElements/Views/View.cpp \
     102  UIElements/Views/StringView.cpp \
     103  UIElements/Views/MethodStringView.cpp \
     104  UIElements/Views/StreamStringView.cpp
     105VIEWHEADER = \
     106  UIElements/Views/View.hpp \
     107  UIElements/Views/StringView.hpp \
     108  UIElements/Views/MethodStringView.hpp \
     109  UIElements/Views/StreamStringView.hpp
    46110
    47111UISOURCE = \
    48   ${ACTIONSSOURCE} \
    49112  ${COMMANDLINEUISOURCE} \
    50113  ${MENUSOURCE} \
     
    52115  ${TEXTUISOURCE} \
    53116  ${VIEWSOURCE} \
    54   Query/AtomQuery.cpp \
    55   Query/AtomsQuery.cpp \
    56   Query/BooleanQuery.cpp \
    57   Query/BoxQuery.cpp \
    58   Query/DoubleQuery.cpp \
    59   Query/DoublesQuery.cpp \
    60   Query/ElementQuery.cpp \
    61   Query/ElementsQuery.cpp \
    62   Query/EmptyQuery.cpp \
    63   Query/FileQuery.cpp \
    64   Query/IntQuery.cpp \
    65   Query/IntsQuery.cpp \
    66   Query/MoleculeQuery.cpp \
    67   Query/MoleculesQuery.cpp \
    68   Query/Query.cpp \
    69   Query/RandomNumberDistribution_ParametersQuery.cpp \
    70   Query/StringQuery.cpp \
    71   Query/StringsQuery.cpp \
    72   Query/VectorQuery.cpp \
    73   Query/VectorsQuery.cpp \
    74   Dialog.cpp \
    75   MainWindow.cpp
     117  UIElements/Query/AtomQuery.cpp \
     118  UIElements/Query/AtomsQuery.cpp \
     119  UIElements/Query/BooleanQuery.cpp \
     120  UIElements/Query/BoxQuery.cpp \
     121  UIElements/Query/DoubleQuery.cpp \
     122  UIElements/Query/DoublesQuery.cpp \
     123  UIElements/Query/ElementQuery.cpp \
     124  UIElements/Query/ElementsQuery.cpp \
     125  UIElements/Query/EmptyQuery.cpp \
     126  UIElements/Query/FileQuery.cpp \
     127  UIElements/Query/IntQuery.cpp \
     128  UIElements/Query/IntsQuery.cpp \
     129  UIElements/Query/MoleculeQuery.cpp \
     130  UIElements/Query/MoleculesQuery.cpp \
     131  UIElements/Query/Query.cpp \
     132  UIElements/Query/RandomNumberDistribution_ParametersQuery.cpp \
     133  UIElements/Query/StringQuery.cpp \
     134  UIElements/Query/StringsQuery.cpp \
     135  UIElements/Query/VectorQuery.cpp \
     136  UIElements/Query/VectorsQuery.cpp \
     137  UIElements/Dialog.cpp \
     138  UIElements/MainWindow.cpp
    76139 
    77140UIHEADER = \
    78   ${ACTIONSHEADER} \
    79141  ${COMMANDLINEUIHEADER} \
    80142  ${MENUHEADER} \
     
    82144  ${TEXTUIHEADER} \
    83145  ${VIEWHEADER} \
    84   Dialog.hpp \
    85   MainWindow.hpp
    86 
    87 TEXTUISOURCE = \
    88   TextUI/Query/AtomsTextQuery.cpp \
    89   TextUI/Query/AtomTextQuery.cpp \
    90   TextUI/Query/BooleanTextQuery.cpp \
    91   TextUI/Query/BoxTextQuery.cpp \
    92   TextUI/Query/DoubleTextQuery.cpp \
    93   TextUI/Query/DoublesTextQuery.cpp \
    94   TextUI/Query/ElementTextQuery.cpp \
    95   TextUI/Query/ElementsTextQuery.cpp \
    96   TextUI/Query/EmptyTextQuery.cpp \
    97   TextUI/Query/FileTextQuery.cpp \
    98   TextUI/Query/IntTextQuery.cpp \
    99   TextUI/Query/IntsTextQuery.cpp \
    100   TextUI/Query/MoleculesTextQuery.cpp \
    101   TextUI/Query/MoleculeTextQuery.cpp \
    102   TextUI/Query/StringTextQuery.cpp \
    103   TextUI/Query/StringsTextQuery.cpp \
    104   TextUI/Query/VectorTextQuery.cpp \
    105   TextUI/Query/VectorsTextQuery.cpp \
    106   TextUI/Query/RandomNumberDistribution_ParametersTextQuery.cpp \
    107   TextUI/TextDialog.cpp \
    108   TextUI/TextStatusIndicator.cpp \
    109   TextUI/TextUIFactory.cpp \
    110   TextUI/TextWindow.cpp
    111 TEXTUIHEADER = \
    112   TextUI/Query/TextQuery.hpp \
    113   TextUI/TextDialog.hpp \
    114   TextUI/TextStatusIndicator.hpp \
    115   TextUI/TextUIFactory.hpp \
    116   TextUI/TextWindow.hpp
    117 
    118 COMMANDLINEUISOURCE = \
    119   CommandLineUI/Query/AtomCommandLineQuery.cpp \
    120   CommandLineUI/Query/AtomsCommandLineQuery.cpp \
    121   CommandLineUI/Query/BooleanCommandLineQuery.cpp \
    122   CommandLineUI/Query/BoxCommandLineQuery.cpp \
    123   CommandLineUI/Query/DoubleCommandLineQuery.cpp \
    124   CommandLineUI/Query/DoublesCommandLineQuery.cpp \
    125   CommandLineUI/Query/ElementCommandLineQuery.cpp \
    126   CommandLineUI/Query/ElementsCommandLineQuery.cpp \
    127   CommandLineUI/Query/EmptyCommandLineQuery.cpp \
    128   CommandLineUI/Query/FileCommandLineQuery.cpp \
    129   CommandLineUI/Query/IntCommandLineQuery.cpp \
    130   CommandLineUI/Query/IntsCommandLineQuery.cpp \
    131   CommandLineUI/Query/MoleculeCommandLineQuery.cpp \
    132   CommandLineUI/Query/MoleculesCommandLineQuery.cpp \
    133   CommandLineUI/Query/StringCommandLineQuery.cpp \
    134   CommandLineUI/Query/StringsCommandLineQuery.cpp \
    135   CommandLineUI/Query/VectorCommandLineQuery.cpp \
    136   CommandLineUI/Query/VectorsCommandLineQuery.cpp \
    137   CommandLineUI/Query/RandomNumberDistribution_ParametersCommandLineQuery.cpp \
    138   CommandLineUI/CommandLineDialog.cpp \
    139   CommandLineUI/CommandLineParser.cpp \
    140   CommandLineUI/CommandLineParser_validate.cpp \
    141   CommandLineUI/CommandLineStatusIndicator.cpp \
    142   CommandLineUI/CommandLineUIFactory.cpp \
    143   CommandLineUI/CommandLineWindow.cpp \
    144   CommandLineUI/TypeEnumContainer.cpp
    145  
    146 COMMANDLINEUIHEADER = \
    147   CommandLineUI/Query/CommandLineQuery.hpp \
    148   CommandLineUI/CommandLineDialog.hpp \
    149   CommandLineUI/CommandLineParser.hpp \
    150   CommandLineUI/CommandLineParser_validate.hpp \
    151   CommandLineUI/CommandLineStatusIndicator.hpp \
    152   CommandLineUI/CommandLineUIFactory.hpp \
    153   CommandLineUI/CommandLineWindow.hpp \
    154   CommandLineUI/TypeEnumContainer.cpp
    155 
     146  UIElements/Dialog.hpp \
     147  UIElements/MainWindow.hpp
     148
     149QTUISOURCE = \
     150        allmocs.moc.cpp \
     151  UIElements/Qt4/Pipe/AtomQtQueryPipe.cpp \
     152  UIElements/Qt4/Pipe/AtomsQtQueryPipe.cpp \
     153  UIElements/Qt4/Pipe/BooleanQtQueryPipe.cpp \
     154  UIElements/Qt4/Pipe/BoxQtQueryPipe.cpp \
     155  UIElements/Qt4/Pipe/DoubleQtQueryPipe.cpp \
     156  UIElements/Qt4/Pipe/ElementsQtQueryPipe.cpp \
     157  UIElements/Qt4/Pipe/EmptyQtQueryPipe.cpp \
     158  UIElements/Qt4/Pipe/ElementQtQueryPipe.cpp \
     159  UIElements/Qt4/Pipe/FileQtQueryPipe.cpp \
     160  UIElements/Qt4/Pipe/IntQtQueryPipe.cpp \
     161  UIElements/Qt4/Pipe/MoleculeQtQueryPipe.cpp \
     162  UIElements/Qt4/Pipe/MoleculesQtQueryPipe.cpp \
     163  UIElements/Qt4/Pipe/StringQtQueryPipe.cpp \
     164  UIElements/Qt4/Pipe/VectorQtQueryPipe.cpp \
     165  UIElements/Qt4/Pipe/VectorsQtQueryPipe.cpp \
     166        UIElements/Qt4/Pipe/RandomNumberDistribution_ParametersQtQueryPipe.cpp \
     167  UIElements/Qt4/Query/AtomQtQuery.cpp \
     168  UIElements/Qt4/Query/AtomsQtQuery.cpp \
     169  UIElements/Qt4/Query/BooleanQtQuery.cpp \
     170  UIElements/Qt4/Query/BoxQtQuery.cpp \
     171  UIElements/Qt4/Query/DoubleQtQuery.cpp \
     172  UIElements/Qt4/Query/DoublesQtQuery.cpp \
     173  UIElements/Qt4/Query/ElementQtQuery.cpp \
     174  UIElements/Qt4/Query/ElementsQtQuery.cpp \
     175  UIElements/Qt4/Query/EmptyQtQuery.cpp \
     176  UIElements/Qt4/Query/FileQtQuery.cpp \
     177  UIElements/Qt4/Query/IntQtQuery.cpp \
     178  UIElements/Qt4/Query/IntsQtQuery.cpp \
     179  UIElements/Qt4/Query/MoleculeQtQuery.cpp \
     180  UIElements/Qt4/Query/MoleculesQtQuery.cpp \
     181  UIElements/Qt4/Query/StringQtQuery.cpp \
     182  UIElements/Qt4/Query/StringsQtQuery.cpp \
     183  UIElements/Qt4/Query/VectorQtQuery.cpp \
     184  UIElements/Qt4/Query/VectorsQtQuery.cpp \
     185        UIElements/Qt4/Query/RandomNumberDistribution_ParametersQtQuery.cpp \
     186        UIElements/Qt4/QtMainWindow.cpp \
     187        UIElements/Qt4/QtDialog.cpp \
     188        UIElements/Qt4/QtUIFactory.cpp \
     189        UIElements/Menu/Qt4/QtMenuPipe.cpp \
     190        UIElements/Views/Qt4/QtWorldView.cpp \
     191        UIElements/Views/Qt4/GLMoleculeView.cpp \
     192        UIElements/Views/Qt4/QtMoleculeView.cpp \
     193        UIElements/Views/Qt4/QtStatusBar.cpp
     194             
    156195QTUIMOC_HEADER = \
    157         Qt4/QtDialog.hpp \
    158         Qt4/QtMainWindow.hpp \
    159   Qt4/Pipe/AtomQtQueryPipe.hpp \
    160   Qt4/Pipe/AtomsQtQueryPipe.hpp \
    161   Qt4/Pipe/BooleanQtQueryPipe.hpp \
    162   Qt4/Pipe/BoxQtQueryPipe.hpp \
    163   Qt4/Pipe/DoubleQtQueryPipe.hpp \
    164   Qt4/Pipe/ElementsQtQueryPipe.hpp \
    165   Qt4/Pipe/EmptyQtQueryPipe.hpp \
    166   Qt4/Pipe/ElementQtQueryPipe.hpp \
    167   Qt4/Pipe/FileQtQueryPipe.hpp \
    168   Qt4/Pipe/IntQtQueryPipe.hpp \
    169   Qt4/Pipe/MoleculeQtQueryPipe.hpp \
    170   Qt4/Pipe/MoleculesQtQueryPipe.hpp \
    171   Qt4/Pipe/StringQtQueryPipe.hpp \
    172   Qt4/Pipe/VectorQtQueryPipe.hpp \
    173   Qt4/Pipe/VectorsQtQueryPipe.hpp \
    174         Qt4/Pipe/RandomNumberDistribution_ParametersQtQueryPipe.hpp \
    175         Menu/Qt4/QtMenuPipe.hpp \
    176         Views/Qt4/QtWorldView.hpp \
    177         Views/Qt4/GLMoleculeView.hpp \
    178         Views/Qt4/QtMoleculeView.hpp \
    179         Views/Qt4/QtStatusBar.hpp
     196        UIElements/Qt4/QtDialog.hpp \
     197        UIElements/Qt4/QtMainWindow.hpp \
     198  UIElements/Qt4/Pipe/AtomQtQueryPipe.hpp \
     199  UIElements/Qt4/Pipe/AtomsQtQueryPipe.hpp \
     200  UIElements/Qt4/Pipe/BooleanQtQueryPipe.hpp \
     201  UIElements/Qt4/Pipe/BoxQtQueryPipe.hpp \
     202  UIElements/Qt4/Pipe/DoubleQtQueryPipe.hpp \
     203  UIElements/Qt4/Pipe/ElementsQtQueryPipe.hpp \
     204  UIElements/Qt4/Pipe/EmptyQtQueryPipe.hpp \
     205  UIElements/Qt4/Pipe/ElementQtQueryPipe.hpp \
     206  UIElements/Qt4/Pipe/FileQtQueryPipe.hpp \
     207  UIElements/Qt4/Pipe/IntQtQueryPipe.hpp \
     208  UIElements/Qt4/Pipe/MoleculeQtQueryPipe.hpp \
     209  UIElements/Qt4/Pipe/MoleculesQtQueryPipe.hpp \
     210  UIElements/Qt4/Pipe/StringQtQueryPipe.hpp \
     211  UIElements/Qt4/Pipe/VectorQtQueryPipe.hpp \
     212  UIElements/Qt4/Pipe/VectorsQtQueryPipe.hpp \
     213        UIElements/Qt4/Pipe/RandomNumberDistribution_ParametersQtQueryPipe.hpp \
     214        UIElements/Menu/Qt4/QtMenuPipe.hpp \
     215        UIElements/Views/Qt4/QtWorldView.hpp \
     216        UIElements/Views/Qt4/GLMoleculeView.hpp \
     217        UIElements/Views/Qt4/QtMoleculeView.hpp \
     218        UIElements/Views/Qt4/QtStatusBar.hpp
    180219                                 
    181 QTUISOURCE = allmocs.moc.cpp \
    182   Qt4/Pipe/AtomQtQueryPipe.cpp \
    183   Qt4/Pipe/AtomsQtQueryPipe.cpp \
    184   Qt4/Pipe/BooleanQtQueryPipe.cpp \
    185   Qt4/Pipe/BoxQtQueryPipe.cpp \
    186   Qt4/Pipe/DoubleQtQueryPipe.cpp \
    187   Qt4/Pipe/ElementsQtQueryPipe.cpp \
    188   Qt4/Pipe/EmptyQtQueryPipe.cpp \
    189   Qt4/Pipe/ElementQtQueryPipe.cpp \
    190   Qt4/Pipe/FileQtQueryPipe.cpp \
    191   Qt4/Pipe/IntQtQueryPipe.cpp \
    192   Qt4/Pipe/MoleculeQtQueryPipe.cpp \
    193   Qt4/Pipe/MoleculesQtQueryPipe.cpp \
    194   Qt4/Pipe/StringQtQueryPipe.cpp \
    195   Qt4/Pipe/VectorQtQueryPipe.cpp \
    196   Qt4/Pipe/VectorsQtQueryPipe.cpp \
    197         Qt4/Pipe/RandomNumberDistribution_ParametersQtQueryPipe.cpp \
    198   Qt4/Query/AtomQtQuery.cpp \
    199   Qt4/Query/AtomsQtQuery.cpp \
    200   Qt4/Query/BooleanQtQuery.cpp \
    201   Qt4/Query/BoxQtQuery.cpp \
    202   Qt4/Query/DoubleQtQuery.cpp \
    203   Qt4/Query/DoublesQtQuery.cpp \
    204   Qt4/Query/ElementQtQuery.cpp \
    205   Qt4/Query/ElementsQtQuery.cpp \
    206   Qt4/Query/EmptyQtQuery.cpp \
    207   Qt4/Query/FileQtQuery.cpp \
    208   Qt4/Query/IntQtQuery.cpp \
    209   Qt4/Query/IntsQtQuery.cpp \
    210   Qt4/Query/MoleculeQtQuery.cpp \
    211   Qt4/Query/MoleculesQtQuery.cpp \
    212   Qt4/Query/StringQtQuery.cpp \
    213   Qt4/Query/StringsQtQuery.cpp \
    214   Qt4/Query/VectorQtQuery.cpp \
    215   Qt4/Query/VectorsQtQuery.cpp \
    216         Qt4/Query/RandomNumberDistribution_ParametersQtQuery.cpp \
    217         Qt4/QtMainWindow.cpp \
    218         Qt4/QtDialog.cpp \
    219         Qt4/QtUIFactory.cpp \
    220         Menu/Qt4/QtMenuPipe.cpp \
    221         Views/Qt4/QtWorldView.cpp \
    222         Views/Qt4/GLMoleculeView.cpp \
    223         Views/Qt4/QtMoleculeView.cpp \
    224         Views/Qt4/QtStatusBar.cpp
    225              
    226220QTUIHEADER = \
    227221  ${QTUIMOC_HEADER} \
    228         Menu/Qt4/QtMenu.hpp \
    229         Qt4/Query/QtQuery.hpp \
    230   Qt4/QtUIFactory.hpp \
    231   Qt4/Pipe/QtQueryListPipe.hpp
    232 
    233 QTUI_DEFS =
    234 
    235 GUI_LIBS =
    236 
    237 
    238 lib_LTLIBRARIES = libMolecuilderUI.la \
     222        UIElements/Menu/Qt4/QtMenu.hpp \
     223        UIElements/Qt4/Query/QtQuery.hpp \
     224  UIElements/Qt4/QtUIFactory.hpp \
     225  UIElements/Qt4/Pipe/QtQueryListPipe.hpp
     226
     227lib_LTLIBRARIES += libMolecuilderUI.la \
    239228        libMolecuilderQtUI.la
    240229libMolecuilderUI_la_includedir = $(includedir)/MoleCuilder/UIElements/
    241 libMolecuilderQtUI_la_includedir = $(includedir)/MoleCuilder/UIElements/
     230libMolecuilderQtUI_la_includedir = $(includedir)/MoleCuilder/UIElements/
     231libMolecuilderUI_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} ${QT_CXXFLAGS}
     232libMolecuilderQtUI_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} ${QT_CXXFLAGS}
     233# NOTE: ActionPrototypes BEFORE Actions!
     234# this is to ensure that static Action prototypes are instantiated after
     235# ActionRegistry is present.
    242236libMolecuilderUI_la_LIBADD = \
    243         ../Actions/libMolecuilderActions.la
     237        libMolecuilderActionPrototypes.la \
     238        libMolecuilderActions.la \
     239        libMolecuilderGraph.la \
     240        libMolecuilder.la \
     241        libMolecuilderParser.la \
     242        libMolecuilderShapes.la \
     243        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     244        libMolecuilderRandomNumbers.la \
     245        ${CodePatterns_LIBS} \
     246        $(BOOST_LIB)
    244247libMolecuilderQtUI_la_LIBADD = \
    245         ../Actions/libMolecuilderActions.la \
    246         ${QT_LIB_GUI} \
    247         -lQtOpenGL \
    248         ${GLU_LIBS} \
    249         ${QT_LDADD}
     248       ${QT_LIB_GUI} \
     249       -lQtOpenGL \
     250       ${GLU_LIBS} \
     251       ${QT_LDADD}
     252
    250253
    251254nobase_libMolecuilderUI_la_include_HEADERS = ${UIHEADER}
     
    267270## that all version information is kept in one place.
    268271libMolecuilderUI_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
    269 libMolecuilderQtUI_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
     272#libMolecuilderQtUI_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
    270273
    271274## The generated configuration header is installed in its own subdirectory of
     
    292295#pkgconfig_DATA = $(top_builddir)/MoleCuilder.pc
    293296
    294 unity.cpp:
    295         echo "" >  unity.cpp; \
    296         list='$(UISOURCE)'; for file in $$list; do \
    297           echo "#include \"$(srcdir)/$$file\"" >> unity.cpp; \
    298         done;
    299        
    300297#Rules needed for Qt4
    301298# UI-Files are scattered throughout several subdirectories
     
    313310
    314311       
    315 MOSTLYCLEANFILES = unity.cpp allmocs.moc.cpp
     312MOSTLYCLEANFILES += allmocs.moc.cpp
  • src/UIElements/Menu/unittests/Makefile.am

    rca2cfa r455573  
    22# Also indentation by a single tab
    33
    4 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src -I$(top_srcdir)/src/UIElements
     4UIELEMENTSMENUTESTSSOURCES = \
     5  ../UIElements/Menu/unittests/MenuDescriptionUnitTest.cpp \
     6  ../UIElements/Menu/unittests/MenuDescription_ActionRegistry_ConsistencyUnitTest.cpp
    57
    6 AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
    7 AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
     8UIELEMENTSMENUTESTSHEADERS = \
     9  ../UIElements/Menu/unittests/MenuDescriptionUnitTest.hpp \
     10  ../UIElements/Menu/unittests/MenuDescription_ActionRegistry_ConsistencyUnitTest.hpp
    811
    9 TESTS = \
     12UIELEMENTSMENUTESTS = \
    1013  MenuDescriptionUnitTest \
    1114  MenuDescription_ActionRegistry_ConsistencyUnitTest
    1215
     16TESTS += $(UIELEMENTSMENUTESTS)
     17check_PROGRAMS += $(UIELEMENTSMENUTESTS)
     18noinst_PROGRAMS += $(UIELEMENTSMENUTESTS)
    1319
    14 check_PROGRAMS = $(TESTS)
    15 noinst_PROGRAMS = $(TESTS)
    16 
    17 BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
    1820MENULIBS = \
    19         $(BOOST_LIB)
     21  $(BOOST_LIB)
    2022
    2123
    2224MenuDescriptionUnitTest_SOURCES =  $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    23         MenuDescriptionUnitTest.cpp \
    24         MenuDescriptionUnitTest.hpp \
    25         ../MenuDescription.cpp \
    26         ../MenuDescription.hpp
     25  ../UIElements/Menu/unittests/MenuDescriptionUnitTest.cpp \
     26  ../UIElements/Menu/unittests/MenuDescriptionUnitTest.hpp \
     27  ../UIElements/Menu/MenuDescription.cpp \
     28  ../UIElements/Menu/MenuDescription.hpp
     29MenuDescriptionUnitTest_CXXFLAGS = -I$(top_srcdir)/src/UIElements
    2730MenuDescriptionUnitTest_LDADD = $(MENULIBS)
    2831
    2932MenuDescription_ActionRegistry_ConsistencyUnitTest_SOURCES =  $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    30         MenuDescription_ActionRegistry_ConsistencyUnitTest.cpp \
    31         MenuDescription_ActionRegistry_ConsistencyUnitTest.hpp
     33  ../UIElements/Menu/unittests/MenuDescription_ActionRegistry_ConsistencyUnitTest.cpp \
     34  ../UIElements/Menu/unittests/MenuDescription_ActionRegistry_ConsistencyUnitTest.hpp
    3235MenuDescription_ActionRegistry_ConsistencyUnitTest_LDADD = \
    33   ../../libMolecuilderUI.la \
    34   ../../../Actions/libMolecuilderActions.la \
    35         ../../../Graph/libMolecuilderGraph.la \
    36         ../../../libMolecuilder.la \
    37         ../../../Parser/libMolecuilderParser.la \
    38         ../../../Shapes/libMolecuilderShapes.la \
    39         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    40         ../../../RandomNumbers/libMolecuilderRandomNumbers.la \
    41         ${CodePatterns_LIBS} \
    42         $(BOOST_LIB)
     36  ../libMolecuilderUI.la \
     37  ../libMolecuilderActions.la \
     38  ../libMolecuilderGraph.la \
     39  ../libMolecuilder.la \
     40  ../libMolecuilderParser.la \
     41  ../libMolecuilderShapes.la \
     42  $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     43  ../libMolecuilderRandomNumbers.la \
     44  ${CodePatterns_LIBS} \
     45  $(BOOST_LIB)
    4346
    4447
  • src/unittests/Makefile.am

    rca2cfa r455573  
    22# Also indentation by a single tab
    33
    4 SUBDIRS = \
    5         ../Actions/unittests \
    6         ../Descriptors/unittests \
    7         ../Parser/unittests \
    8         ../RandomNumbers/unittests \
    9         ../Shapes/unittests \
    10         ../UIElements/CommandLineUI/unittests \
    11         ../UIElements/Menu/unittests
     4check_PROGRAMS =
     5noinst_PROGRAMS =
     6TESTS =
     7
     8include ../../src/Actions/unittests/Makefile.am
     9include ../../src/Descriptors/unittests/Makefile.am
     10include ../../src/Parser/unittests/Makefile.am
     11include ../../src/RandomNumbers/unittests/Makefile.am
     12include ../../src/Shapes/unittests/Makefile.am
     13include ../../src/UIElements/CommandLineUI/unittests/Makefile.am
     14include ../../src/UIElements/Menu/unittests/Makefile.am
    1215
    1316INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src
     
    1619AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
    1720
    18 TESTS = \
     21GENERALTESTS = \
    1922  AnalysisBondsUnitTest \
    2023  AnalysisCorrelationToPointUnitTest \
     
    3336  WorldTimeUnitTest
    3437
    35 
    36 check_PROGRAMS = $(TESTS)
    37 noinst_PROGRAMS = $(TESTS) TestRunner
     38# these ones are checked
     39TESTS += $(GENERALTESTS)
     40# these ones are built for checking only
     41check_PROGRAMS += $(GENERALTESTS)
     42# ... and not installed
     43noinst_PROGRAMS += $(GENERALTESTS) TestRunner
    3844
    3945BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
    40 GSLLIBS = \
    41         ../Shapes/libMolecuilderShapes.la \
     46
     47ALLLIBS = \
     48        ../libMolecuilderUI.la \
     49        ../libMolecuilder.la \
    4250        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    43         ../RandomNumbers/libMolecuilderRandomNumbers.la \
     51        ${CodePatterns_LIBS} \
    4452        $(BOOST_LIB)
    45 ALLLIBS = \
    46         ../UIElements/libMolecuilderUI.la \
    47         ../Actions/libMolecuilderActions.la \
    48         ${PARSERLIBS} \
    49         ../libMolecuilder.la \
    50         ${GSLLIBS}
    51 
    52 PARSERLIBS = ../Parser/libMolecuilderParser.la
    53 UILIBS = ../UIElements/libMolecuilderUI.la
    5453
    5554TESTSOURCES = \
    56   ../Actions/unittests/ActionRegistryUnitTest.cpp \
    57   ../Actions/unittests/ActionSequenceUnitTest.cpp \
     55        ${ACTIONTESTSSOURCES} \
     56        ${DESCRIPTORTESTSSOURCES} \
     57        ${LINEARALGEBRATESTSSOURCES} \
     58        ${PARSERTESTSSOURCES} \
     59        ${RANDOMNUMBERTESTSSOURCES} \
     60        ${SHAPETESTSSOURCES} \
     61        $(UIELEMENTSCOMMANDLINEPARSERTESTSSOURCES) \
     62        ${UIELEMENTSMENUTESTSSOURCES} \
    5863  AnalysisBondsUnitTest.cpp \
    5964  AnalysisCorrelationToPointUnitTest.cpp \
    6065  AnalysisCorrelationToSurfaceUnitTest.cpp  \
    6166  AnalysisPairCorrelationUnitTest.cpp \
    62   ../Descriptors/unittests/AtomDescriptorUnitTest.cpp \
    63   ../Actions/unittests/AtomsCalculationUnitTest.cpp \
    6467  BondGraphUnitTest.cpp \
    6568  BoxUnitTest.cpp \
     
    6871  LinkedCellUnitTest.cpp \
    6972  ListOfBondsUnitTest.cpp \
    70   ../Actions/unittests/ManipulateAtomsUnitTest.cpp \
    71   ../UIElements/CommandLineUI/unittests/CommandLineParser_ActionRegistry_ConsistenyUnitTest.cpp \
    72   ../UIElements/Menu/unittests/MenuDescriptionUnitTest.cpp \
    73   ../Descriptors/unittests/MoleculeDescriptorUnitTest.cpp \
    74   ../Parser/unittests/ParserMpqcUnitTest.cpp \
    75   ../Parser/unittests/ParserPcpUnitTest.cpp \
    76   ../Parser/unittests/ParserPdbUnitTest.cpp \
    77   ../Parser/unittests/ParserTremoloUnitTest.cpp \
    78   ../Parser/unittests/ParserXyzUnitTest.cpp \
    7973  PeriodentafelUnitTest.cpp \
    80   ../Shapes/unittests/ShapeUnitTest.cpp \
    8174  TesselationUnitTest.cpp \
    8275  Tesselation_BoundaryTriangleUnitTest.cpp \
     
    8578
    8679TESTHEADERS = \
    87   ../Actions/unittests/ActionRegistryUnitTest.hpp \
    88   ../Actions/unittests/ActionSequenceUnitTest.hpp \
     80        ${ACTIONTESTSHEADERS} \
     81        ${DESCRIPTORTESTSHEADERS} \
     82        ${LINEARALGEBRATESTSHEADERS} \
     83        ${PARSERTESTSHEADERS} \
     84        ${RANDOMNUMBERTESTSHEADERS} \
     85        ${SHAPETESTSHEADERS} \
     86        $(UIELEMENTSCOMMANDLINEPARSERTESTSHEADERS) \
     87        ${UIELEMENTSMENUTESTSHEADERS} \
    8988  AnalysisBondsUnitTest.hpp \
    9089  AnalysisCorrelationToPointUnitTest.hpp \
    9190  AnalysisCorrelationToSurfaceUnitTest.hpp  \
    9291  AnalysisPairCorrelationUnitTest.hpp \
    93   ../Descriptors/unittests/AtomDescriptorUnitTest.hpp \
    94   ../Actions/unittests/AtomsCalculationUnitTest.hpp \
    9592  BondGraphUnitTest.hpp \
    9693  BoxUnitTest.hpp \
     
    9996  LinkedCellUnitTest.hpp \
    10097  ListOfBondsUnitTest.hpp \
    101   ../Actions/unittests/ManipulateAtomsUnitTest.hpp \
    102   ../UIElements/CommandLineUI/unittests/CommandLineParser_ActionRegistry_ConsistenyUnitTest.hpp \
    103   ../UIElements/Menu/unittests/MenuDescriptionUnitTest.hpp \
    104   ../Descriptors/unittests/MoleculeDescriptorUnitTest.hpp \
    105   ../Parser/unittests/ParserMpqcUnitTest.hpp \
    106   ../Parser/unittests/ParserPcpUnitTest.hpp \
    107   ../Parser/unittests/ParserPdbUnitTest.hpp \
    108   ../Parser/unittests/ParserTremoloUnitTest.hpp \
    109   ../Parser/unittests/ParserXyzUnitTest.hpp \
    11098  PeriodentafelUnitTest.hpp \
    111   ../Shapes/unittests/ShapeUnitTest.hpp \
    11299  TesselationUnitTest.hpp \
    113100  Tesselation_BoundaryTriangleUnitTest.hpp \
Note: See TracChangeset for help on using the changeset viewer.