Changeset 455573 for src/UIElements


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/UIElements
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • 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
Note: See TracChangeset for help on using the changeset viewer.