Changeset 2ed1a0


Ignore:
Timestamp:
Apr 6, 2011, 4:05:13 PM (15 years ago)
Author:
Frederik Heber <heber@…>
Children:
17eaa5
Parents:
a0ddcf
git-author:
Frederik Heber <heber@…> (04/06/11 15:33:06)
git-committer:
Frederik Heber <heber@…> (04/06/11 16:05:13)
Message:

Replaced SUBDIRS directive in Makefile.am by inclusion of respective Makefile.ams.

  • this has the advantage that compilation is faster and dependencies are resolved automatically.
  • the included folder concern the unittests.
  • all paths in now included Makefile.ams had to be changed to be relative to ./src.
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • Makefile.am

    ra0ddcf r2ed1a0  
    11ACLOCAL_AMFLAGS = -I m4
    2 SUBDIRS = src src/Helpers/unittests src/Patterns/unittests src/unittests doc
     2SUBDIRS = src doc
    33
    44AUTOMAKE_OPTIONS = subdir-objects

  • configure.ac

    ra0ddcf r2ed1a0  
    5858        src/Makefile
    5959        ])
    60 AC_CONFIG_FILES([
    61         src/unittests/Makefile
    62         src/Helpers/unittests/Makefile
    63         src/Patterns/unittests/Makefile
    64         ])
    6560AC_OUTPUT

  • src/Helpers/unittests/Makefile.am

    ra0ddcf r2ed1a0  
    22# Also indentation by a single tab
    33
    4 INCLUDES = -I$(top_srcdir)/src/Patterns -I$(top_srcdir)/src/Helpers
     4# NOTE that all paths are relative to ./src (because we get included there!)
    55
    6 AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl $(BOOST_THREAD_LDFLAGS)
    7 AM_CXXFLAGS = $(CPPUNIT_CFLAGS)
    8 AM_CPPFLAGS = ${BOOST_CPPFLAGS}
    9 
    10 TESTS = \
     6TESTS += \
    117        AssertUnitTest \
    128        ChronosUnitTest \
    … …  
    1612  RangeUnitTest
    1713
    18 check_PROGRAMS = $(TESTS)
    19 noinst_PROGRAMS = $(TESTS)
     14check_PROGRAMS += $(TESTS)
     15noinst_PROGRAMS += $(TESTS)
    2016
    21 AssertUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    22         AssertUnitTest.cpp \
    23         AssertUnitTest.hpp
     17AssertUnitTest_SOURCES = unittests/UnitTestMain.cpp \
     18        Helpers/unittests/AssertUnitTest.cpp \
     19        Helpers/unittests/AssertUnitTest.hpp
    2420nodist_AssertUnitTest_SOURCES = \
    25         ../Assert.cpp \
    26         ../Assert.hpp
     21        Helpers/Assert.cpp \
     22        Helpers/Assert.hpp
    2723AssertUnitTest_LDADD = \
    2824        $(BOOST_THREAD_LIB)
    2925
    30 ChronosUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    31         ChronosUnitTest.cpp \
    32         ChronosUnitTest.hpp \
    33         stubs/InfoStub.cpp
     26ChronosUnitTest_SOURCES = unittests/UnitTestMain.cpp \
     27        Helpers/unittests/ChronosUnitTest.cpp \
     28        Helpers/unittests/ChronosUnitTest.hpp \
     29        Helpers/unittests/stubs/InfoStub.cpp
    3430nodist_ChronosUnitTest_SOURCES = \
    35         ../Assert.cpp \
    36         ../Assert.hpp \
    37         ../MemDebug.cpp \
    38         ../MemDebug.hpp \
    39         ../Chronos.cpp \
    40         ../Chronos.hpp \
    41         ../Info.hpp
     31        Helpers/Assert.cpp \
     32        Helpers/Assert.hpp \
     33        Helpers/MemDebug.cpp \
     34        Helpers/MemDebug.hpp \
     35        Helpers/Chronos.cpp \
     36        Helpers/Chronos.hpp \
     37        Helpers/Info.hpp
    4238ChronosUnitTest_LDADD = \
    4339        $(BOOST_THREAD_LIBS)
    4440
    45 InfoUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    46         InfoUnitTest.cpp \
    47         InfoUnitTest.hpp \
    48         stubs/ChronosStub.cpp \
    49         stubs/errorloggerStub.cpp \
    50         stubs/LogStub.cpp \
    51         stubs/loggerStub.cpp
     41InfoUnitTest_SOURCES = unittests/UnitTestMain.cpp \
     42        Helpers/unittests/InfoUnitTest.cpp \
     43        Helpers/unittests/InfoUnitTest.hpp \
     44        Helpers/unittests/stubs/ChronosStub.cpp \
     45        Helpers/unittests/stubs/errorloggerStub.cpp \
     46        Helpers/unittests/stubs/LogStub.cpp \
     47        Helpers/unittests/stubs/loggerStub.cpp
    5248nodist_InfoUnitTest_SOURCES = \
    53         ../Assert.cpp \
    54         ../Assert.hpp \
    55         ../Chronos.hpp \
    56         ../errorlogger.hpp \
    57         ../Info.cpp \
    58         ../Info.hpp \
    59         ../Log.hpp \
    60         ../logger.hpp \
    61         ../MemDebug.cpp \
    62         ../MemDebug.hpp
     49        Helpers/Assert.cpp \
     50        Helpers/Assert.hpp \
     51        Helpers/Chronos.hpp \
     52        Helpers/errorlogger.hpp \
     53        Helpers/Info.cpp \
     54        Helpers/Info.hpp \
     55        Helpers/Log.hpp \
     56        Helpers/logger.hpp \
     57        Helpers/MemDebug.cpp \
     58        Helpers/MemDebug.hpp
    6359InfoUnitTest_LDADD = \
    6460        $(BOOST_THREAD_LIBS)
    6561
    66 IteratorAdaptorsUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    67         IteratorAdaptorsUnitTest.cpp \
    68         IteratorAdaptorsUnitTest.hpp
     62IteratorAdaptorsUnitTest_SOURCES = unittests/UnitTestMain.cpp \
     63        Helpers/unittests/IteratorAdaptorsUnitTest.cpp \
     64        Helpers/unittests/IteratorAdaptorsUnitTest.hpp
    6965nodist_IteratorAdaptorsUnitTest_SOURCES = \
    7066        $(top_srcdir)/src/Helpers/IteratorAdaptors.hpp
    7167IteratorAdaptorsUnitTest_LDADD =
    7268
    73 LogUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    74         LogUnitTest.cpp \
    75         LogUnitTest.hpp \
    76         stubs/errorloggerStub.cpp \
    77         stubs/loggerStub.cpp
     69LogUnitTest_SOURCES = unittests/UnitTestMain.cpp \
     70        Helpers/unittests/LogUnitTest.cpp \
     71        Helpers/unittests/LogUnitTest.hpp \
     72        Helpers/unittests/stubs/errorloggerStub.cpp \
     73        Helpers/unittests/stubs/loggerStub.cpp
    7874nodist_LogUnitTest_SOURCES = \
    79         ../Assert.cpp \
    80         ../Assert.hpp \
    81         ../errorlogger.hpp \
    82         ../Log.cpp \
    83         ../Log.hpp \
    84         ../logger.hpp \
    85         ../MemDebug.cpp \
    86         ../MemDebug.hpp
     75        Helpers/Assert.cpp \
     76        Helpers/Assert.hpp \
     77        Helpers/errorlogger.hpp \
     78        Helpers/Log.cpp \
     79        Helpers/Log.hpp \
     80        Helpers/logger.hpp \
     81        Helpers/MemDebug.cpp \
     82        Helpers/MemDebug.hpp
    8783LogUnitTest_LDADD = \
    8884        $(BOOST_THREAD_LIBS)
    8985
    90 RangeUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    91         RangeUnitTest.cpp \
    92         RangeUnitTest.hpp
     86RangeUnitTest_SOURCES = unittests/UnitTestMain.cpp \
     87        Helpers/unittests/RangeUnitTest.cpp \
     88        Helpers/unittests/RangeUnitTest.hpp
    9389nodist_RangeUnitTest_SOURCES = \
    94         ../Range.hpp
     90        Helpers/Range.hpp
    9591RangeUnitTest_LDADD =
    9692

  • src/Makefile.am

    ra0ddcf r2ed1a0  
    66AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl $(BOOST_THREAD_LDFLAGS)
    77AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS)
     8
     9check_PROGRAMS =
     10noinst_PROGRAMS =
     11TESTS =
     12
     13include Helpers/unittests/Makefile.am
     14include Patterns/unittests/Makefile.am
     15include unittests/Makefile.am
    816
    917## config utility ###

  • src/Patterns/unittests/Makefile.am

    ra0ddcf r2ed1a0  
    22# Also indentation by a single tab
    33
    4 INCLUDES = -I$(top_srcdir)/src/Patterns -I$(top_srcdir)/src/Helpers
     4# NOTE that all paths are relative to ./src (because we get included there!)
    55
    6 AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl $(BOOST_THREAD_LDFLAGS)
    7 AM_CXXFLAGS = $(CPPUNIT_CFLAGS)
    8 AM_CPPFLAGS = ${BOOST_CPPFLAGS}
    9 
    10 TESTS = \
     6TESTS += \
    117  CacheableUnitTest \
    128  CloneUnitTest \
    … …  
    2218
    2319
    24 check_PROGRAMS = $(TESTS)
    25 noinst_PROGRAMS = $(TESTS)
     20check_PROGRAMS += $(TESTS)
     21noinst_PROGRAMS += $(TESTS)
    2622
    2723TESTLIBS = \
    28         ../../libCodePatterns-debug.la \
     24        libCodePatterns-debug.la \
    2925        $(BOOST_THREAD_LIBS)
    3026
    31 CacheableUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    32         CacheableUnitTest.cpp \
    33         CacheableUnitTest.hpp
     27CacheableUnitTest_SOURCES = unittests/UnitTestMain.cpp \
     28        Patterns/unittests/CacheableUnitTest.cpp \
     29        Patterns/unittests/CacheableUnitTest.hpp
    3430nodist_CacheableUnitTest_SOURCES = \
    35         ../Cachable.hpp \
    36         ../Observer.hpp \
    37         ../ObserverIterator.hpp
     31        Patterns/Cachable.hpp \
     32        Patterns/Observer.hpp \
     33        Patterns/ObserverIterator.hpp
    3834CacheableUnitTest_LDADD = $(TESTLIBS)
    3935
    40 CloneUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    41         CloneUnitTest.cpp \
    42         CloneUnitTest.hpp \
    43         stubs/CommonStub.cpp \
    44         stubs/CommonStub.hpp \
    45         stubs/CloneStub.cpp \
    46         stubs/CloneStub.hpp
     36CloneUnitTest_SOURCES = unittests/UnitTestMain.cpp \
     37        Patterns/unittests/CloneUnitTest.cpp \
     38        Patterns/unittests/CloneUnitTest.hpp \
     39        Patterns/unittests/stubs/CommonStub.cpp \
     40        Patterns/unittests/stubs/CommonStub.hpp \
     41        Patterns/unittests/stubs/CloneStub.cpp \
     42        Patterns/unittests/stubs/CloneStub.hpp
    4743nodist_CloneUnitTest_SOURCES = \
    48         ../Clone.hpp
     44        Patterns/Clone.hpp
    4945CloneUnitTest_LDADD = $(TESTLIBS)
    5046
    51 CreatorUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    52         CreatorUnitTest.cpp \
    53         CreatorUnitTest.hpp \
    54         stubs/CommonStub.cpp \
    55         stubs/CommonStub.hpp \
    56         stubs/CreatorStub.hpp
     47CreatorUnitTest_SOURCES = unittests/UnitTestMain.cpp \
     48        Patterns/unittests/CreatorUnitTest.cpp \
     49        Patterns/unittests/CreatorUnitTest.hpp \
     50        Patterns/unittests/stubs/CommonStub.cpp \
     51        Patterns/unittests/stubs/CommonStub.hpp \
     52        Patterns/unittests/stubs/CreatorStub.hpp
    5753nodist_CreatorUnitTest_SOURCES = \
    58         ../Creator.hpp
     54        Patterns/Creator.hpp
    5955CreatorUnitTest_LDADD = $(TESTLIBS)
    6056
    61 FactoryUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    62         FactoryUnitTest.cpp \
    63         FactoryUnitTest.hpp \
    64         stubs/CommonStub.cpp \
    65         stubs/CommonStub.hpp \
    66         stubs/CreatorStub.hpp \
    67         stubs/FactoryStub.hpp \
    68         stubs/FactoryStub.cpp
     57FactoryUnitTest_SOURCES = unittests/UnitTestMain.cpp \
     58        Patterns/unittests/FactoryUnitTest.cpp \
     59        Patterns/unittests/FactoryUnitTest.hpp \
     60        Patterns/unittests/stubs/CommonStub.cpp \
     61        Patterns/unittests/stubs/CommonStub.hpp \
     62        Patterns/unittests/stubs/CreatorStub.hpp \
     63        Patterns/unittests/stubs/FactoryStub.hpp \
     64        Patterns/unittests/stubs/FactoryStub.cpp
    6965nodist_FactoryUnitTest_SOURCES = \
    70         ../Factory.hpp \
    71         ../FactoryTypeList.hpp \
    72         ../Factory_impl.hpp
     66        Patterns/Factory.hpp \
     67        Patterns/FactoryTypeList.hpp \
     68        Patterns/Factory_impl.hpp
    7369FactoryUnitTest_LDADD = $(TESTLIBS)
    7470
    75 ManipulableCloneUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    76         ManipulableCloneUnitTest.cpp \
    77         ManipulableCloneUnitTest.hpp \
    78         stubs/CommonStub.cpp \
    79         stubs/CommonStub.hpp \
    80         stubs/ManipulableCloneStub.cpp \
    81         stubs/ManipulableCloneStub.hpp
     71ManipulableCloneUnitTest_SOURCES = unittests/UnitTestMain.cpp \
     72        Patterns/unittests/ManipulableCloneUnitTest.cpp \
     73        Patterns/unittests/ManipulableCloneUnitTest.hpp \
     74        Patterns/unittests/stubs/CommonStub.cpp \
     75        Patterns/unittests/stubs/CommonStub.hpp \
     76        Patterns/unittests/stubs/ManipulableCloneStub.cpp \
     77        Patterns/unittests/stubs/ManipulableCloneStub.hpp
    8278nodist_ManipulableCloneUnitTest_SOURCES = \
    83         ../ManipulableClone.hpp
     79        Patterns/ManipulableClone.hpp
    8480ManipulableCloneUnitTest_LDADD = $(TESTLIBS)
    8581
    86 ManipulablePrototypeFactoryUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    87         ManipulablePrototypeFactoryUnitTest.cpp \
    88         ManipulablePrototypeFactoryUnitTest.hpp \
    89         stubs/ManipulableCloneStub.cpp \
    90         stubs/ManipulableCloneStub.hpp \
    91         stubs/CommonStub.cpp \
    92         stubs/CommonStub.hpp \
    93         stubs/ManipulablePrototypeFactoryStub.hpp \
    94         stubs/ManipulablePrototypeFactoryStub.cpp
     82ManipulablePrototypeFactoryUnitTest_SOURCES = unittests/UnitTestMain.cpp \
     83        Patterns/unittests/ManipulablePrototypeFactoryUnitTest.cpp \
     84        Patterns/unittests/ManipulablePrototypeFactoryUnitTest.hpp \
     85        Patterns/unittests/stubs/ManipulableCloneStub.cpp \
     86        Patterns/unittests/stubs/ManipulableCloneStub.hpp \
     87        Patterns/unittests/stubs/CommonStub.cpp \
     88        Patterns/unittests/stubs/CommonStub.hpp \
     89        Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.hpp \
     90        Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.cpp
    9591nodist_ManipulablePrototypeFactoryUnitTest_SOURCES = \
    96         ../ManipulablePrototypeFactory.hpp \
    97         ../FactoryTypeList.hpp \
    98         ../ManipulablePrototypeFactory_impl.hpp
     92        Patterns/ManipulablePrototypeFactory.hpp \
     93        Patterns/FactoryTypeList.hpp \
     94        Patterns/ManipulablePrototypeFactory_impl.hpp
    9995ManipulablePrototypeFactoryUnitTest_LDADD = $(TESTLIBS)
    10096
    101 ObserverUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    102         ObserverUnitTest.cpp \
    103         ObserverUnitTest.hpp \
    104         stubs/ObserverStub.cpp \
    105         stubs/ObserverStub.hpp
     97ObserverUnitTest_SOURCES = unittests/UnitTestMain.cpp \
     98        Patterns/unittests/ObserverUnitTest.cpp \
     99        Patterns/unittests/ObserverUnitTest.hpp \
     100        Patterns/unittests/stubs/ObserverStub.cpp \
     101        Patterns/unittests/stubs/ObserverStub.hpp
    106102nodist_ObserverUnitTest_SOURCES = \
    107         ../Observer.hpp \
    108         ../ObserverContainer.hpp \
    109         ../ObserverContainer_impl.hpp \
    110         ../ObserverIterator.hpp
     103        Patterns/Observer.hpp \
     104        Patterns/ObserverContainer.hpp \
     105        Patterns/ObserverContainer_impl.hpp \
     106        Patterns/ObserverIterator.hpp
    111107ObserverUnitTest_LDADD = $(TESTLIBS)
    112108
    113 ObservedContainerUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    114         ObservedContainerUnitTest.cpp \
    115         ObservedContainerUnitTest.hpp \
    116         stubs/ObserverStub.cpp \
    117         stubs/ObserverStub.hpp
     109ObservedContainerUnitTest_SOURCES = unittests/UnitTestMain.cpp \
     110        Patterns/unittests/ObservedContainerUnitTest.cpp \
     111        Patterns/unittests/ObservedContainerUnitTest.hpp \
     112        Patterns/unittests/stubs/ObserverStub.cpp \
     113        Patterns/unittests/stubs/ObserverStub.hpp
    118114nodist_ObservedContainerUnitTest_SOURCES = \
    119         ../ObserverContainer.hpp \
    120         ../ObserverContainer_impl.hpp
     115        Patterns/ObserverContainer.hpp \
     116        Patterns/ObserverContainer_impl.hpp
    121117ObservedContainerUnitTest_LDADD = $(TESTLIBS)
    122118
    123 PrototypeFactoryUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    124         PrototypeFactoryUnitTest.cpp \
    125         PrototypeFactoryUnitTest.hpp \
    126         stubs/CloneStub.cpp \
    127         stubs/CloneStub.hpp \
    128         stubs/CommonStub.cpp \
    129         stubs/CommonStub.hpp \
    130         stubs/PrototypeFactoryStub.hpp \
    131         stubs/PrototypeFactoryStub.cpp
     119PrototypeFactoryUnitTest_SOURCES = unittests/UnitTestMain.cpp \
     120        Patterns/unittests/PrototypeFactoryUnitTest.cpp \
     121        Patterns/unittests/PrototypeFactoryUnitTest.hpp \
     122        Patterns/unittests/stubs/CloneStub.cpp \
     123        Patterns/unittests/stubs/CloneStub.hpp \
     124        Patterns/unittests/stubs/CommonStub.cpp \
     125        Patterns/unittests/stubs/CommonStub.hpp \
     126        Patterns/unittests/stubs/PrototypeFactoryStub.hpp \
     127        Patterns/unittests/stubs/PrototypeFactoryStub.cpp
    132128nodist_PrototypeFactoryUnitTest_SOURCES = \
    133         ../PrototypeFactory.hpp \
    134         ../FactoryTypeList.hpp \
    135         ../PrototypeFactory_impl.hpp
     129        Patterns/PrototypeFactory.hpp \
     130        Patterns/FactoryTypeList.hpp \
     131        Patterns/PrototypeFactory_impl.hpp
    136132PrototypeFactoryUnitTest_LDADD = $(TESTLIBS)
    137133
    138 RegistryUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    139         RegistryUnitTest.cpp \
    140         RegistryUnitTest.hpp \
    141         stubs/CommonNamedStub.cpp \
    142         stubs/CommonNamedStub.hpp \
    143         stubs/RegistryStub.cpp \
    144         stubs/RegistryStub.hpp
     134RegistryUnitTest_SOURCES = unittests/UnitTestMain.cpp \
     135        Patterns/unittests/RegistryUnitTest.cpp \
     136        Patterns/unittests/RegistryUnitTest.hpp \
     137        Patterns/unittests/stubs/CommonNamedStub.cpp \
     138        Patterns/unittests/stubs/CommonNamedStub.hpp \
     139        Patterns/unittests/stubs/RegistryStub.cpp \
     140        Patterns/unittests/stubs/RegistryStub.hpp
    145141nodist_RegistryUnitTest_SOURCES = \
    146         Registry.hpp \
    147         Registry_impl.hpp
     142        Patterns/unittests/Registry.hpp \
     143        Patterns/unittests/Registry_impl.hpp
    148144RegistryUnitTest_LDADD = $(TESTLIBS)
    149145
    150 SingletonUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    151         SingletonUnitTest.cpp \
    152         SingletonUnitTest.hpp
     146SingletonUnitTest_SOURCES = unittests/UnitTestMain.cpp \
     147        Patterns/unittests/SingletonUnitTest.cpp \
     148        Patterns/unittests/SingletonUnitTest.hpp
    153149#nodist_SingletonUnitTest_SOURCES =
    154150SingletonUnitTest_LDADD = $(TESTLIBS)

  • src/unittests/Makefile.am

    ra0ddcf r2ed1a0  
    22# Also indentation by a single tab
    33
    4 INCLUDES = -I$(top_srcdir)/src/Patterns -I$(top_srcdir)/src/Helpers
     4# NOTE that all paths are relative to ./src (because we get included there!)
    55
    6 AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl $(BOOST_THREAD_LDFLAGS)
    7 AM_CXXFLAGS = $(CPPUNIT_CFLAGS)
    8 AM_CPPFLAGS = ${BOOST_CPPFLAGS}
    9 
    10 check_PROGRAMS = 
    11 noinst_PROGRAMS = TestRunner
    12 
    13 TESTLIBS = \
    14         ../libCodePatterns-debug.la \
    15         $(BOOST_THREAD_LIBS)
     6check_PROGRAMS += 
     7noinst_PROGRAMS += TestRunner
    168
    179TESTSOURCES = \
    18   $(top_srcdir)/src/Helpers/unittests/AssertUnitTest.cpp \
    19   $(top_srcdir)/src/Helpers/unittests/ChronosUnitTest.cpp \
    20   $(top_srcdir)/src/Helpers/unittests/InfoUnitTest.cpp \
    21   $(top_srcdir)/src/Helpers/unittests/LogUnitTest.cpp \
    22   $(top_srcdir)/src/Helpers/unittests/RangeUnitTest.cpp \
    23   $(top_srcdir)/src/Patterns/unittests/CacheableUnitTest.cpp \
    24   $(top_srcdir)/src/Patterns/unittests/CloneUnitTest.cpp \
    25   $(top_srcdir)/src/Patterns/unittests/CreatorUnitTest.cpp \
    26   $(top_srcdir)/src/Patterns/unittests/FactoryUnitTest.cpp \
    27   $(top_srcdir)/src/Patterns/unittests/ManipulableCloneUnitTest.cpp \
    28   $(top_srcdir)/src/Patterns/unittests/ManipulablePrototypeFactoryUnitTest.cpp \
    29   $(top_srcdir)/src/Patterns/unittests/ObserverUnitTest.cpp \
    30   $(top_srcdir)/src/Patterns/unittests/PrototypeFactoryUnitTest.cpp \
    31   $(top_srcdir)/src/Patterns/unittests/RegistryUnitTest.cpp \
    32   $(top_srcdir)/src/Patterns/unittests/SingletonUnitTest.cpp \
    33   $(top_srcdir)/src/Patterns/unittests/stubs/CloneStub.cpp \
    34   $(top_srcdir)/src/Patterns/unittests/stubs/CommonStub.cpp \
    35   $(top_srcdir)/src/Patterns/unittests/stubs/CommonNamedStub.cpp \
    36   $(top_srcdir)/src/Patterns/unittests/stubs/FactoryStub.cpp \
    37   $(top_srcdir)/src/Patterns/unittests/stubs/ManipulableCloneStub.cpp \
    38   $(top_srcdir)/src/Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.cpp \
    39   $(top_srcdir)/src/Patterns/unittests/stubs/ObserverStub.cpp \
    40   $(top_srcdir)/src/Patterns/unittests/stubs/PrototypeFactoryStub.cpp \
    41   $(top_srcdir)/src/Patterns/unittests/stubs/RegistryStub.cpp
     10  Helpers/unittests/AssertUnitTest.cpp \
     11  Helpers/unittests/ChronosUnitTest.cpp \
     12  Helpers/unittests/InfoUnitTest.cpp \
     13  Helpers/unittests/LogUnitTest.cpp \
     14  Helpers/unittests/RangeUnitTest.cpp \
     15  Patterns/unittests/CacheableUnitTest.cpp \
     16  Patterns/unittests/CloneUnitTest.cpp \
     17  Patterns/unittests/CreatorUnitTest.cpp \
     18  Patterns/unittests/FactoryUnitTest.cpp \
     19  Patterns/unittests/ManipulableCloneUnitTest.cpp \
     20  Patterns/unittests/ManipulablePrototypeFactoryUnitTest.cpp \
     21  Patterns/unittests/ObserverUnitTest.cpp \
     22  Patterns/unittests/PrototypeFactoryUnitTest.cpp \
     23  Patterns/unittests/RegistryUnitTest.cpp \
     24  Patterns/unittests/SingletonUnitTest.cpp \
     25  Patterns/unittests/stubs/CloneStub.cpp \
     26  Patterns/unittests/stubs/CommonStub.cpp \
     27  Patterns/unittests/stubs/CommonNamedStub.cpp \
     28  Patterns/unittests/stubs/FactoryStub.cpp \
     29  Patterns/unittests/stubs/ManipulableCloneStub.cpp \
     30  Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.cpp \
     31  Patterns/unittests/stubs/ObserverStub.cpp \
     32  Patterns/unittests/stubs/PrototypeFactoryStub.cpp \
     33  Patterns/unittests/stubs/RegistryStub.cpp
    4234
    4335TESTHEADERS = \
    44   $(top_srcdir)/src/Helpers/unittests/AssertUnitTest.hpp \
    45   $(top_srcdir)/src/Helpers/unittests/ChronosUnitTest.hpp \
    46   $(top_srcdir)/src/Helpers/unittests/InfoUnitTest.hpp \
    47   $(top_srcdir)/src/Helpers/unittests/LogUnitTest.hpp \
    48   $(top_srcdir)/src/Helpers/unittests/RangeUnitTest.hpp \
    49   $(top_srcdir)/src/Patterns/unittests/CacheableUnitTest.hpp \
    50   $(top_srcdir)/src/Patterns/unittests/CloneUnitTest.hpp \
    51   $(top_srcdir)/src/Patterns/unittests/CreatorUnitTest.hpp \
    52   $(top_srcdir)/src/Patterns/unittests/FactoryUnitTest.hpp \
    53   $(top_srcdir)/src/Patterns/unittests/ManipulableCloneUnitTest.hpp \
    54   $(top_srcdir)/src/Patterns/unittests/ManipulablePrototypeFactoryUnitTest.hpp \
    55   $(top_srcdir)/src/Patterns/unittests/ObserverUnitTest.hpp \
    56   $(top_srcdir)/src/Patterns/unittests/PrototypeFactoryUnitTest.hpp \
    57   $(top_srcdir)/src/Patterns/unittests/RegistryUnitTest.hpp \
    58   $(top_srcdir)/src/Patterns/unittests/SingletonUnitTest.hpp \
    59   $(top_srcdir)/src/Patterns/unittests/stubs/CloneStub.hpp \
    60   $(top_srcdir)/src/Patterns/unittests/stubs/CommonStub.hpp \
    61   $(top_srcdir)/src/Patterns/unittests/stubs/CommonNamedStub.hpp \
    62   $(top_srcdir)/src/Patterns/unittests/stubs/CommonParametersStub.hpp \
    63   $(top_srcdir)/src/Patterns/unittests/stubs/CreatorStub.hpp \
    64   $(top_srcdir)/src/Patterns/unittests/stubs/FactoryStub.hpp \
    65   $(top_srcdir)/src/Patterns/unittests/stubs/ManipulableCloneStub.hpp \
    66   $(top_srcdir)/src/Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.hpp \
    67   $(top_srcdir)/src/Patterns/unittests/stubs/PrototypeFactoryStub.hpp \
    68   $(top_srcdir)/src/Patterns/unittests/stubs/FactoryStub.def \
    69   $(top_srcdir)/src/Patterns/unittests/stubs/FactoryStub.undef \
    70   $(top_srcdir)/src/Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.def \
    71   $(top_srcdir)/src/Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.undef \
    72   $(top_srcdir)/src/Patterns/unittests/stubs/ObserverStub.hpp \
    73   $(top_srcdir)/src/Patterns/unittests/stubs/PrototypeFactoryStub.def \
    74   $(top_srcdir)/src/Patterns/unittests/stubs/PrototypeFactoryStub.undef \
    75   $(top_srcdir)/src/Patterns/unittests/stubs/RegistryStub.hpp
     36  Helpers/unittests/AssertUnitTest.hpp \
     37  Helpers/unittests/ChronosUnitTest.hpp \
     38  Helpers/unittests/InfoUnitTest.hpp \
     39  Helpers/unittests/LogUnitTest.hpp \
     40  Helpers/unittests/RangeUnitTest.hpp \
     41  Patterns/unittests/CacheableUnitTest.hpp \
     42  Patterns/unittests/CloneUnitTest.hpp \
     43  Patterns/unittests/CreatorUnitTest.hpp \
     44  Patterns/unittests/FactoryUnitTest.hpp \
     45  Patterns/unittests/ManipulableCloneUnitTest.hpp \
     46  Patterns/unittests/ManipulablePrototypeFactoryUnitTest.hpp \
     47  Patterns/unittests/ObserverUnitTest.hpp \
     48  Patterns/unittests/PrototypeFactoryUnitTest.hpp \
     49  Patterns/unittests/RegistryUnitTest.hpp \
     50  Patterns/unittests/SingletonUnitTest.hpp \
     51  Patterns/unittests/stubs/CloneStub.hpp \
     52  Patterns/unittests/stubs/CommonStub.hpp \
     53  Patterns/unittests/stubs/CommonNamedStub.hpp \
     54  Patterns/unittests/stubs/CommonParametersStub.hpp \
     55  Patterns/unittests/stubs/CreatorStub.hpp \
     56  Patterns/unittests/stubs/FactoryStub.hpp \
     57  Patterns/unittests/stubs/ManipulableCloneStub.hpp \
     58  Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.hpp \
     59  Patterns/unittests/stubs/PrototypeFactoryStub.hpp \
     60  Patterns/unittests/stubs/FactoryStub.def \
     61  Patterns/unittests/stubs/FactoryStub.undef \
     62  Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.def \
     63  Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.undef \
     64  Patterns/unittests/stubs/ObserverStub.hpp \
     65  Patterns/unittests/stubs/PrototypeFactoryStub.def \
     66  Patterns/unittests/stubs/PrototypeFactoryStub.undef \
     67  Patterns/unittests/stubs/RegistryStub.hpp
    7668       
    77 TestRunner_SOURCES = TestRunnerMain.cpp \
     69TestRunner_SOURCES = \
     70        unittests/TestRunnerMain.cpp \
    7871        $(TESTSOURCES) \
    7972        $(TESTHEADERS)
    8073nodist_TestRunner_SOURCES = \
    81         $(top_srcdir)/src/Patterns/Cachable.hpp \
    82         $(top_srcdir)/src/Patterns/Clone.hpp \
    83         $(top_srcdir)/src/Patterns/Creator.hpp \
    84         $(top_srcdir)/src/Patterns/Factory_impl.hpp \
    85         $(top_srcdir)/src/Patterns/Factory.hpp \
    86         $(top_srcdir)/src/Patterns/FactoryTypeList.hpp \
    87         $(top_srcdir)/src/Patterns/ManipulableClone.hpp \
    88         $(top_srcdir)/src/Patterns/ManipulablePrototypeFactory_impl.hpp \
    89         $(top_srcdir)/src/Patterns/ManipulablePrototypeFactory.hpp \
    90         $(top_srcdir)/src/Patterns/ObservedContainer_impl.hpp \
    91         $(top_srcdir)/src/Patterns/ObservedContainer.hpp \
    92         $(top_srcdir)/src/Patterns/Observer.hpp \
    93         $(top_srcdir)/src/Patterns/ObserverIterator.hpp \
    94         $(top_srcdir)/src/Patterns/PrototypeFactory_impl.hpp \
    95         $(top_srcdir)/src/Patterns/PrototypeFactory.hpp \
    96         $(top_srcdir)/src/Patterns/Registry_impl.hpp \
    97         $(top_srcdir)/src/Patterns/Registry.hpp \
    98         $(top_srcdir)/src/Patterns/Singleton_impl.hpp \
    99         $(top_srcdir)/src/Patterns/Singleton.hpp
    100 TestRunner_LDADD = ${TESTLIBS}
     74        Patterns/Cachable.hpp \
     75        Patterns/Clone.hpp \
     76        Patterns/Creator.hpp \
     77        Patterns/Factory_impl.hpp \
     78        Patterns/Factory.hpp \
     79        Patterns/FactoryTypeList.hpp \
     80        Patterns/ManipulableClone.hpp \
     81        Patterns/ManipulablePrototypeFactory_impl.hpp \
     82        Patterns/ManipulablePrototypeFactory.hpp \
     83        Patterns/ObservedContainer_impl.hpp \
     84        Patterns/ObservedContainer.hpp \
     85        Patterns/Observer.hpp \
     86        Patterns/ObserverIterator.hpp \
     87        Patterns/PrototypeFactory_impl.hpp \
     88        Patterns/PrototypeFactory.hpp \
     89        Patterns/Registry_impl.hpp \
     90        Patterns/Registry.hpp \
     91        Patterns/Singleton_impl.hpp \
     92        Patterns/Singleton.hpp
     93TestRunner_LDADD = \
     94        libCodePatterns-debug.la \
     95        $(BOOST_THREAD_LIBS)
    10196
    10297#AUTOMAKE_OPTIONS = parallel-tests
Note: See TracChangeset for help on using the changeset viewer.