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.
File:
1 edited

Legend:

Unmodified
Added
Removed

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