Changeset 3324cf for src


Ignore:
Timestamp:
Dec 13, 2011, 1:06:33 PM (14 years ago)
Author:
Frederik Heber <heber@…>
Children:
9b8fa4
Parents:
b760ac5
git-author:
Frederik Heber <heber@…> (12/05/11 23:45:18)
git-committer:
Frederik Heber <heber@…> (12/13/11 13:06:33)
Message:

Added convenience libraries for Patterns and Helpers.

  • this way we may place Observer stuff (own convenience lib) into own subfolder.
  • unit tests depend only on these two libs now.
Location:
src
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed

  • src/Helpers/unittests/Makefile.am

    rb760ac5 r3324cf  
    1212  RangeUnitTest
    1313
     14TESTSOURCES += \
     15  ../Helpers/unittests/AssertUnitTest.cpp \
     16  ../Helpers/unittests/ChronosUnitTest.cpp \
     17  ../Helpers/unittests/InfoUnitTest.cpp \
     18  ../Helpers/unittests/LogUnitTest.cpp \
     19  ../Helpers/unittests/RangeUnitTest.cpp
     20
     21TESTHEADERS += \
     22  ../Helpers/unittests/AssertUnitTest.hpp \
     23  ../Helpers/unittests/ChronosUnitTest.hpp \
     24  ../Helpers/unittests/InfoUnitTest.hpp \
     25  ../Helpers/unittests/LogUnitTest.hpp \
     26  ../Helpers/unittests/RangeUnitTest.hpp
     27
    1428check_PROGRAMS += $(TESTS)
    1529noinst_PROGRAMS += $(TESTS)
    1630
    17 AssertUnitTest_SOURCES = unittests/UnitTestMain.cpp \
    18         Helpers/unittests/AssertUnitTest.cpp \
    19         Helpers/unittests/AssertUnitTest.hpp
    20 nodist_AssertUnitTest_SOURCES = \
    21         Helpers/Assert.cpp \
    22         Helpers/Assert.hpp
    23 AssertUnitTest_LDADD =
     31AssertUnitTest_SOURCES = UnitTestMain.cpp \
     32        ../Helpers/unittests/AssertUnitTest.cpp \
     33        ../Helpers/unittests/AssertUnitTest.hpp
     34AssertUnitTest_LDADD = \
     35        ../Helpers/libCodePatterns-Helpers-debug.la
    2436       
    25 ChronosUnitTest_SOURCES = unittests/UnitTestMain.cpp \
    26         Helpers/unittests/ChronosUnitTest.cpp \
    27         Helpers/unittests/ChronosUnitTest.hpp \
    28         Helpers/unittests/stubs/InfoStub.cpp
     37ChronosUnitTest_SOURCES = UnitTestMain.cpp \
     38        ../Helpers/unittests/ChronosUnitTest.cpp \
     39        ../Helpers/unittests/ChronosUnitTest.hpp \
     40        ../Helpers/unittests/stubs/InfoStub.cpp
    2941nodist_ChronosUnitTest_SOURCES = \
    30         Helpers/Assert.cpp \
    31         Helpers/Assert.hpp \
    32         Helpers/MemDebug.cpp \
    33         Helpers/MemDebug.hpp \
    34         Helpers/Chronos.cpp \
    35         Helpers/Chronos.hpp \
    36         Helpers/Info.hpp
     42        ../Helpers/Assert.cpp \
     43        ../Helpers/Assert.hpp \
     44        ../Helpers/MemDebug.cpp \
     45        ../Helpers/MemDebug.hpp \
     46        ../Helpers/Chronos.cpp \
     47        ../Helpers/Chronos.hpp \
     48        ../Helpers/Info.hpp
    3749ChronosUnitTest_LDADD = \
    3850        $(BOOST_THREAD_LIBS)
    3951
    40 InfoUnitTest_SOURCES = unittests/UnitTestMain.cpp \
    41         Helpers/unittests/InfoUnitTest.cpp \
    42         Helpers/unittests/InfoUnitTest.hpp \
    43         Helpers/unittests/stubs/ChronosStub.cpp \
    44         Helpers/unittests/stubs/errorloggerStub.cpp \
    45         Helpers/unittests/stubs/LogStub.cpp \
    46         Helpers/unittests/stubs/loggerStub.cpp
     52InfoUnitTest_SOURCES = UnitTestMain.cpp \
     53        ../Helpers/unittests/InfoUnitTest.cpp \
     54        ../Helpers/unittests/InfoUnitTest.hpp \
     55        ../Helpers/unittests/stubs/ChronosStub.cpp \
     56        ../Helpers/unittests/stubs/errorloggerStub.cpp \
     57        ../Helpers/unittests/stubs/LogStub.cpp \
     58        ../Helpers/unittests/stubs/loggerStub.cpp
    4759nodist_InfoUnitTest_SOURCES = \
    48         Helpers/Assert.cpp \
    49         Helpers/Assert.hpp \
    50         Helpers/Chronos.hpp \
    51         Helpers/errorlogger.hpp \
    52         Helpers/Info.cpp \
    53         Helpers/Info.hpp \
    54         Helpers/Log.hpp \
    55         Helpers/logger.hpp \
    56         Helpers/MemDebug.cpp \
    57         Helpers/MemDebug.hpp
     60        ../Helpers/Assert.cpp \
     61        ../Helpers/Assert.hpp \
     62        ../Helpers/Chronos.hpp \
     63        ../Helpers/errorlogger.hpp \
     64        ../Helpers/Info.cpp \
     65        ../Helpers/Info.hpp \
     66        ../Helpers/Log.hpp \
     67        ../Helpers/logger.hpp \
     68        ../Helpers/MemDebug.cpp \
     69        ../Helpers/MemDebug.hpp
    5870InfoUnitTest_LDADD = \
    5971        $(BOOST_THREAD_LIBS)
    6072
    61 IteratorAdaptorsUnitTest_SOURCES = unittests/UnitTestMain.cpp \
    62         Helpers/unittests/IteratorAdaptorsUnitTest.cpp \
    63         Helpers/unittests/IteratorAdaptorsUnitTest.hpp
     73IteratorAdaptorsUnitTest_SOURCES = UnitTestMain.cpp \
     74        ../Helpers/unittests/IteratorAdaptorsUnitTest.cpp \
     75        ../Helpers/unittests/IteratorAdaptorsUnitTest.hpp
    6476nodist_IteratorAdaptorsUnitTest_SOURCES = \
    65         $(top_srcdir)/src/Helpers/IteratorAdaptors.hpp
    66 IteratorAdaptorsUnitTest_LDADD =
     77        $(top_srcdir)/src/../Helpers/IteratorAdaptors.hpp
     78IteratorAdaptorsUnitTest_LDADD = \
     79        ../Helpers/libCodePatterns-Helpers-debug.la
    6780
    68 LogUnitTest_SOURCES = unittests/UnitTestMain.cpp \
    69         Helpers/unittests/LogUnitTest.cpp \
    70         Helpers/unittests/LogUnitTest.hpp \
    71         Helpers/unittests/stubs/errorloggerStub.cpp \
    72         Helpers/unittests/stubs/loggerStub.cpp
     81LogUnitTest_SOURCES = UnitTestMain.cpp \
     82        ../Helpers/unittests/LogUnitTest.cpp \
     83        ../Helpers/unittests/LogUnitTest.hpp \
     84        ../Helpers/unittests/stubs/errorloggerStub.cpp \
     85        ../Helpers/unittests/stubs/loggerStub.cpp
    7386nodist_LogUnitTest_SOURCES = \
    74         Helpers/Assert.cpp \
    75         Helpers/Assert.hpp \
    76         Helpers/errorlogger.hpp \
    77         Helpers/Log.cpp \
    78         Helpers/Log.hpp \
    79         Helpers/logger.hpp \
    80         Helpers/MemDebug.cpp \
    81         Helpers/MemDebug.hpp
     87        ../Helpers/Assert.cpp \
     88        ../Helpers/Assert.hpp \
     89        ../Helpers/errorlogger.hpp \
     90        ../Helpers/Log.cpp \
     91        ../Helpers/Log.hpp \
     92        ../Helpers/logger.hpp \
     93        ../Helpers/MemDebug.cpp \
     94        ../Helpers/MemDebug.hpp
    8295LogUnitTest_LDADD = \
    8396        $(BOOST_THREAD_LIBS)
    8497
    85 RangeUnitTest_SOURCES = unittests/UnitTestMain.cpp \
    86         Helpers/unittests/RangeUnitTest.cpp \
    87         Helpers/unittests/RangeUnitTest.hpp
    88 nodist_RangeUnitTest_SOURCES = \
    89         Helpers/Range.hpp
    90 RangeUnitTest_LDADD =
     98RangeUnitTest_SOURCES = UnitTestMain.cpp \
     99        ../Helpers/unittests/RangeUnitTest.cpp \
     100        ../Helpers/unittests/RangeUnitTest.hpp
     101RangeUnitTest_LDADD = \
     102        ../Helpers/libCodePatterns-Helpers-debug.la
    91103
    92104

  • src/Makefile.am

    rb760ac5 r3324cf  
    77AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS)
    88
    9 check_PROGRAMS =
    10 noinst_PROGRAMS =
    11 TESTS =
     9noinst_LTLIBRARIES =
     10
     11SUBDIRS = Helpers Patterns unittests
    1212
    1313TESTLIBS = \
    1414        libCodePatterns-debug.la \
    1515        $(BOOST_THREAD_LIBS)
    16 
    17 include Helpers/unittests/Makefile.am
    18 include Patterns/unittests/Makefile.am
    19 include Patterns/Observer/unittests/Makefile.am
    20 include unittests/Makefile.am
    2116
    2217## config utility ###
    … …  
    3530
    3631
    37 ### PATTERNS ###
    38 
    39 PATTERNSOURCE = \
    40         Patterns/Observer/Channels.cpp \
    41         Patterns/Observer/Notification.cpp \
    42         Patterns/Observer/Observable.cpp \
    43         Patterns/Observer/Observer.cpp \
    44         Patterns/Observer/Relay.cpp
    45 PATTERNSOURCEDEBUG = \
    46         $(PATTERNSOURCE) \
    47         Patterns/Observer/ObserverLog.cpp
    48 PATTERNHEADER = \
    49         Patterns/Cacheable.hpp \
    50         Patterns/Clone.hpp \
    51         Patterns/Creator.hpp \
    52         Patterns/Factory.hpp \
    53         Patterns/Factory_impl.hpp \
    54         Patterns/FactoryTypeList.hpp \
    55         Patterns/ManipulableClone.hpp \
    56         Patterns/ManipulablePrototypeFactory.hpp \
    57         Patterns/ManipulablePrototypeFactory_impl.hpp \
    58         Patterns/Observer/Channels.hpp \
    59         Patterns/Observer/defs.hpp \
    60         Patterns/Observer/Notification.hpp \
    61         Patterns/Observer/Observable.hpp \
    62         Patterns/Observer/Observer.hpp \
    63         Patterns/Observer/ObservedContainer.hpp \
    64         Patterns/Observer/ObserverLog.hpp \
    65         Patterns/Observer/ObservedIterator.hpp \
    66         Patterns/Observer/ObservedContainer_impl.hpp \
    67         Patterns/Observer/Relay.hpp \
    68         Patterns/Registry_impl.hpp \
    69         Patterns/Singleton_impl.hpp \
    70         Patterns/PrototypeFactory.hpp \
    71         Patterns/PrototypeFactory_impl.hpp \
    72         Patterns/Registry.hpp \
    73         Patterns/Singleton.hpp
    74 
    75 ### HELPERS ###
    76 
    7732include_HEADERS = \
    7833        $(srcdir)/version.hpp
    7934
    8035# this includes source files that need to be present at multiple points
    81 HELPERSSOURCE =  \
    82         Helpers/Assert.cpp \
    83         Helpers/Chronos.cpp \
    84         Helpers/errorlogger.cpp \
    85         Helpers/Info.cpp \
    86         Helpers/Log.cpp \
    87         Helpers/logger.cpp \
    88         Helpers/MemDebug.cpp \
    89         Helpers/Verbose.cpp \
     36SOURCE =  \
    9037        $(srcdir)/version.cpp
     38SOURCEDEBUG = \
     39        $(SOURCE)
    9140
    92 HELPERSHEADER =  \
    93         Helpers/Assert.hpp \
    94         Helpers/Chronos.hpp \
    95         Helpers/enumeration.hpp \
    96         Helpers/errorlogger.hpp \
    97         Helpers/Info.hpp \
    98         Helpers/IteratorAdaptors.hpp \
    99         Helpers/Log.hpp \
    100         Helpers/logger.hpp \
    101         Helpers/MemDebug.hpp \
    102         Helpers/Range.hpp \
    103         Helpers/toString.hpp \
    104         Helpers/Verbose.hpp \
     41HEADER =  \
    10542        $(srcdir)/version.hpp
    10643
    … …  
    10845lib_LTLIBRARIES = libCodePatterns.la libCodePatterns-debug.la
    10946libCodePatterns_la_LIBADD = \
    110         $(BOOST_THREAD_LIBS)
     47        Patterns/libCodePatterns-Patterns.la \
     48        Helpers/libCodePatterns-Helpers.la
    11149libCodePatterns_debug_la_LIBADD = \
    112         $(BOOST_THREAD_LIBS)
     50        Patterns/libCodePatterns-Patterns-debug.la \
     51        Helpers/libCodePatterns-Helpers-debug.la
    11352
    11453libCodePatterns_la_CPPFLAGS = -DNDEBUG -DNO_MEMDEBUG $(AM_CPPFLAGS)
    … …  
    12463## which are already listed elsewhere in a _HEADERS variable assignment.
    12564#-$(CODEPATTERNS_API_VERSION)
    126 libCodePatterns_la_SOURCES = $(HELPERSSOURCE) $(PATTERNSOURCE)
    127 libCodePatterns_debug_la_SOURCES = $(HELPERSSOURCE) $(PATTERNSOURCEDEBUG)
     65libCodePatterns_la_SOURCES = $(SOURCE)
     66libCodePatterns_debug_la_SOURCES = $(SOURCEDEBUG)
    12867
    12968## Instruct libtool to include ABI version information in the generated shared
    … …  
    14786libCodePatterns_libincludedir = $(includedir)/CodePatterns/
    14887#-$(CODEPATTERNS_API_VERSION)
    149 libCodePatterns_libinclude_HEADERS = $(HELPERSHEADER) $(PATTERNHEADER) $(top_builddir)/libCodePatterns_config.h
     88libCodePatterns_libinclude_HEADERS = $(HEADER) $(top_builddir)/libCodePatterns_config.h
    15089
    15190## Install the generated pkg-config file (.pc) into the expected location for

  • src/Patterns/Observer/all.hpp

    rb760ac5 r3324cf  
    66 */
    77
    8 #ifndef ALL_HPP_
    9 #define ALL_HPP_
     8#ifndef OBSERVER_ALL_HPP_
     9#define OBSERVER_ALL_HPP_
    1010
    1111// include config.h
    … …  
    1313#include <config.h>
    1414#endif
    15 
    1615
    1716// Deactivate any logging when we are not in debug mode
    … …  
    2423#include "Notification.hpp"
    2524#include "Observable.hpp"
     25#include "ObservedContainer.hpp"
     26#include "ObservedIterator.hpp"
    2627#include "Observer.hpp"
     28#include "Relay.hpp"
    2729
    28 #endif /* ALL_HPP_ */
     30#endif /* OBSERVER_ALL_HPP_ */

  • src/Patterns/Observer/unittests/Makefile.am

    rb760ac5 r3324cf  
    88  ObserverUnitTest
    99
     10TESTSOURCES += \
     11  ../Patterns/Observer/unittests/ObserverUnitTest.cpp \
     12  ../Patterns/Observer/unittests/ObservedContainerUnitTest.cpp \
     13  ../Patterns/Observer/unittests/stubs/ObserverStub.cpp
     14
     15TESTHEADERS += \
     16  ../Patterns/unittests/Observer/ObserverUnitTest.hpp \
     17  ../Patterns/unittests/Observer/ObservedContainerUnitTest.hpp
    1018
    1119check_PROGRAMS += $(TESTS)
    1220noinst_PROGRAMS += $(TESTS)
    1321
    14 ObserverUnitTest_SOURCES = unittests/UnitTestMain.cpp \
    15         Patterns/Observer/unittests/ObserverUnitTest.cpp \
    16         Patterns/Observer/unittests/ObserverUnitTest.hpp \
    17         Patterns/Observer/unittests/stubs/ObserverStub.cpp \
    18         Patterns/Observer/unittests/stubs/ObserverStub.hpp
     22ObserverUnitTest_SOURCES = UnitTestMain.cpp \
     23        ../Patterns/Observer/unittests/ObserverUnitTest.cpp \
     24        ../Patterns/Observer/unittests/ObserverUnitTest.hpp \
     25        ../Patterns/Observer/unittests/stubs/ObserverStub.cpp \
     26        ../Patterns/Observer/unittests/stubs/ObserverStub.hpp
    1927nodist_ObserverUnitTest_SOURCES = \
    20         Patterns/Observer/Channels.hpp \
    21         Patterns/Observer/defs.hpp \
    22         Patterns/Observer/Notification.hpp \
    23         Patterns/Observer/Observer.hpp \
    24         Patterns/Observer/ObserverLog.hpp \
    25         Patterns/Observer/ObserverContainer.hpp \
    26         Patterns/Observer/ObserverContainer_impl.hpp \
    27         Patterns/Observer/ObserverIterator.hpp
    28 ObserverUnitTest_LDADD = $(TESTLIBS)
     28        ../Patterns/Observer/Channels.hpp \
     29        ../Patterns/Observer/defs.hpp \
     30        ../Patterns/Observer/Notification.hpp \
     31        ../Patterns/Observer/Observer.hpp \
     32        ../Patterns/Observer/ObserverLog.hpp \
     33        ../Patterns/Observer/ObserverContainer.hpp \
     34        ../Patterns/Observer/ObserverContainer_impl.hpp \
     35        ../Patterns/Observer/ObserverIterator.hpp
     36ObserverUnitTest_LDADD = \
     37        ../Patterns/libCodePatterns-Patterns-debug.la \
     38        ../Helpers/libCodePatterns-Helpers-debug.la \
     39        $(BOOST_THREAD_LIBS)
    2940
    30 ObservedContainerUnitTest_SOURCES = unittests/UnitTestMain.cpp \
    31         Patterns/Observer/unittests/ObservedContainerUnitTest.cpp \
    32         Patterns/Observer/unittests/ObservedContainerUnitTest.hpp \
    33         Patterns/Observer/unittests/stubs/ObserverStub.cpp \
    34         Patterns/Observer/unittests/stubs/ObserverStub.hpp
     41ObservedContainerUnitTest_SOURCES = UnitTestMain.cpp \
     42        ../Patterns/Observer/unittests/ObservedContainerUnitTest.cpp \
     43        ../Patterns/Observer/unittests/ObservedContainerUnitTest.hpp \
     44        ../Patterns/Observer/unittests/stubs/ObserverStub.cpp \
     45        ../Patterns/Observer/unittests/stubs/ObserverStub.hpp
    3546nodist_ObservedContainerUnitTest_SOURCES = \
    36         Patterns/Observer/ObserverContainer.hpp \
    37         Patterns/Observer/ObserverContainer_impl.hpp
    38 ObservedContainerUnitTest_LDADD = $(TESTLIBS)
     47        ../Patterns/Observer/ObserverContainer.hpp \
     48        ../Patterns/Observer/ObserverContainer_impl.hpp
     49ObservedContainerUnitTest_LDADD = \
     50        ../Patterns/libCodePatterns-Patterns-debug.la \
     51        ../Helpers/libCodePatterns-Helpers-debug.la \
     52        $(BOOST_THREAD_LIBS)
    3953
    4054

  • src/Patterns/unittests/Makefile.am

    rb760ac5 r3324cf  
    1515  SingletonUnitTest
    1616
     17TESTSOURCES += \
     18  ../Patterns/unittests/CacheableUnitTest.cpp \
     19  ../Patterns/unittests/CloneUnitTest.cpp \
     20  ../Patterns/unittests/CreatorUnitTest.cpp \
     21  ../Patterns/unittests/FactoryUnitTest.cpp \
     22  ../Patterns/unittests/ManipulableCloneUnitTest.cpp \
     23  ../Patterns/unittests/ManipulablePrototypeFactoryUnitTest.cpp \
     24  ../Patterns/unittests/PrototypeFactoryUnitTest.cpp \
     25  ../Patterns/unittests/RegistryUnitTest.cpp \
     26  ../Patterns/unittests/SingletonUnitTest.cpp \
     27  ../Patterns/unittests/stubs/CloneStub.cpp \
     28  ../Patterns/unittests/stubs/CommonStub.cpp \
     29  ../Patterns/unittests/stubs/CommonNamedStub.cpp \
     30  ../Patterns/unittests/stubs/FactoryStub.cpp \
     31  ../Patterns/unittests/stubs/ManipulableCloneStub.cpp \
     32  ../Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.cpp \
     33  ../Patterns/unittests/stubs/PrototypeFactoryStub.cpp \
     34  ../Patterns/unittests/stubs/RegistryStub.cpp
     35
     36TESTHEADERS += \
     37  ../Patterns/unittests/stubs/Observer/ObserverStub.hpp \
     38  ../Patterns/unittests/CacheableUnitTest.hpp \
     39  ../Patterns/unittests/CloneUnitTest.hpp \
     40  ../Patterns/unittests/CreatorUnitTest.hpp \
     41  ../Patterns/unittests/FactoryUnitTest.hpp \
     42  ../Patterns/unittests/ManipulableCloneUnitTest.hpp \
     43  ../Patterns/unittests/ManipulablePrototypeFactoryUnitTest.hpp \
     44  ../Patterns/unittests/PrototypeFactoryUnitTest.hpp \
     45  ../Patterns/unittests/RegistryUnitTest.hpp \
     46  ../Patterns/unittests/SingletonUnitTest.hpp \
     47  ../Patterns/unittests/stubs/CloneStub.hpp \
     48  ../Patterns/unittests/stubs/CommonStub.hpp \
     49  ../Patterns/unittests/stubs/CommonNamedStub.hpp \
     50  ../Patterns/unittests/stubs/CommonParametersStub.hpp \
     51  ../Patterns/unittests/stubs/CreatorStub.hpp \
     52  ../Patterns/unittests/stubs/FactoryStub.hpp \
     53  ../Patterns/unittests/stubs/ManipulableCloneStub.hpp \
     54  ../Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.hpp \
     55  ../Patterns/unittests/stubs/PrototypeFactoryStub.hpp \
     56  ../Patterns/unittests/stubs/FactoryStub.def \
     57  ../Patterns/unittests/stubs/FactoryStub.undef \
     58  ../Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.def \
     59  ../Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.undef \
     60  ../Patterns/unittests/stubs/PrototypeFactoryStub.def \
     61  ../Patterns/unittests/stubs/PrototypeFactoryStub.undef \
     62  ../Patterns/unittests/stubs/RegistryStub.hpp
    1763
    1864check_PROGRAMS += $(TESTS)
    1965noinst_PROGRAMS += $(TESTS)
    2066
    21 CacheableUnitTest_SOURCES = unittests/UnitTestMain.cpp \
    22         Patterns/unittests/CacheableUnitTest.cpp \
    23         Patterns/unittests/CacheableUnitTest.hpp
     67CacheableUnitTest_SOURCES = UnitTestMain.cpp \
     68        ../Patterns/unittests/CacheableUnitTest.cpp \
     69        ../Patterns/unittests/CacheableUnitTest.hpp
    2470nodist_CacheableUnitTest_SOURCES = \
    25         Patterns/Cachable.hpp \
    26         Patterns/Observer.hpp \
    27         Patterns/ObserverIterator.hpp
    28 CacheableUnitTest_LDADD = $(TESTLIBS)
     71        ../Patterns/Cachable.hpp \
     72        ../Patterns/Observer.hpp \
     73        ../Patterns/ObserverIterator.hpp
     74CacheableUnitTest_LDADD = \
     75        ../Patterns/libCodePatterns-Patterns-debug.la \
     76        ../Helpers/libCodePatterns-Helpers-debug.la \
     77        $(BOOST_THREAD_LIBS)
    2978
    30 CloneUnitTest_SOURCES = unittests/UnitTestMain.cpp \
    31         Patterns/unittests/CloneUnitTest.cpp \
    32         Patterns/unittests/CloneUnitTest.hpp \
    33         Patterns/unittests/stubs/CommonStub.cpp \
    34         Patterns/unittests/stubs/CommonStub.hpp \
    35         Patterns/unittests/stubs/CloneStub.cpp \
    36         Patterns/unittests/stubs/CloneStub.hpp
     79CloneUnitTest_SOURCES = UnitTestMain.cpp \
     80        ../Patterns/unittests/CloneUnitTest.cpp \
     81        ../Patterns/unittests/CloneUnitTest.hpp \
     82        ../Patterns/unittests/stubs/CommonStub.cpp \
     83        ../Patterns/unittests/stubs/CommonStub.hpp \
     84        ../Patterns/unittests/stubs/CloneStub.cpp \
     85        ../Patterns/unittests/stubs/CloneStub.hpp
    3786nodist_CloneUnitTest_SOURCES = \
    38         Patterns/Clone.hpp
    39 CloneUnitTest_LDADD = $(TESTLIBS)
     87        ../Patterns/Clone.hpp
     88CloneUnitTest_LDADD = \
     89        ../Helpers/libCodePatterns-Helpers-debug.la
    4090
    41 CreatorUnitTest_SOURCES = unittests/UnitTestMain.cpp \
    42         Patterns/unittests/CreatorUnitTest.cpp \
    43         Patterns/unittests/CreatorUnitTest.hpp \
    44         Patterns/unittests/stubs/CommonStub.cpp \
    45         Patterns/unittests/stubs/CommonStub.hpp \
    46         Patterns/unittests/stubs/CreatorStub.hpp
     91CreatorUnitTest_SOURCES = UnitTestMain.cpp \
     92        ../Patterns/unittests/CreatorUnitTest.cpp \
     93        ../Patterns/unittests/CreatorUnitTest.hpp \
     94        ../Patterns/unittests/stubs/CommonStub.cpp \
     95        ../Patterns/unittests/stubs/CommonStub.hpp \
     96        ../Patterns/unittests/stubs/CreatorStub.hpp
    4797nodist_CreatorUnitTest_SOURCES = \
    48         Patterns/Creator.hpp
    49 CreatorUnitTest_LDADD = $(TESTLIBS)
     98        ../Patterns/Creator.hpp
     99CreatorUnitTest_LDADD = \
     100        ../Helpers/libCodePatterns-Helpers-debug.la
    50101
    51 FactoryUnitTest_SOURCES = unittests/UnitTestMain.cpp \
    52         Patterns/unittests/FactoryUnitTest.cpp \
    53         Patterns/unittests/FactoryUnitTest.hpp \
    54         Patterns/unittests/stubs/CommonStub.cpp \
    55         Patterns/unittests/stubs/CommonStub.hpp \
    56         Patterns/unittests/stubs/CreatorStub.hpp \
    57         Patterns/unittests/stubs/FactoryStub.hpp \
    58         Patterns/unittests/stubs/FactoryStub.cpp
     102FactoryUnitTest_SOURCES = UnitTestMain.cpp \
     103        ../Patterns/unittests/FactoryUnitTest.cpp \
     104        ../Patterns/unittests/FactoryUnitTest.hpp \
     105        ../Patterns/unittests/stubs/CommonStub.cpp \
     106        ../Patterns/unittests/stubs/CommonStub.hpp \
     107        ../Patterns/unittests/stubs/CreatorStub.hpp \
     108        ../Patterns/unittests/stubs/FactoryStub.hpp \
     109        ../Patterns/unittests/stubs/FactoryStub.cpp
    59110nodist_FactoryUnitTest_SOURCES = \
    60         Patterns/Factory.hpp \
    61         Patterns/FactoryTypeList.hpp \
    62         Patterns/Factory_impl.hpp
    63 FactoryUnitTest_LDADD = $(TESTLIBS)
     111        ../Patterns/Factory.hpp \
     112        ../Patterns/FactoryTypeList.hpp \
     113        ../Patterns/Factory_impl.hpp
     114FactoryUnitTest_LDADD = \
     115        ../Helpers/libCodePatterns-Helpers-debug.la
    64116
    65 ManipulableCloneUnitTest_SOURCES = unittests/UnitTestMain.cpp \
    66         Patterns/unittests/ManipulableCloneUnitTest.cpp \
    67         Patterns/unittests/ManipulableCloneUnitTest.hpp \
    68         Patterns/unittests/stubs/CommonStub.cpp \
    69         Patterns/unittests/stubs/CommonStub.hpp \
    70         Patterns/unittests/stubs/ManipulableCloneStub.cpp \
    71         Patterns/unittests/stubs/ManipulableCloneStub.hpp
     117ManipulableCloneUnitTest_SOURCES = UnitTestMain.cpp \
     118        ../Patterns/unittests/ManipulableCloneUnitTest.cpp \
     119        ../Patterns/unittests/ManipulableCloneUnitTest.hpp \
     120        ../Patterns/unittests/stubs/CommonStub.cpp \
     121        ../Patterns/unittests/stubs/CommonStub.hpp \
     122        ../Patterns/unittests/stubs/ManipulableCloneStub.cpp \
     123        ../Patterns/unittests/stubs/ManipulableCloneStub.hpp
    72124nodist_ManipulableCloneUnitTest_SOURCES = \
    73         Patterns/ManipulableClone.hpp
    74 ManipulableCloneUnitTest_LDADD = $(TESTLIBS)
     125        ../Patterns/ManipulableClone.hpp
     126ManipulableCloneUnitTest_LDADD = \
     127        ../Helpers/libCodePatterns-Helpers-debug.la
    75128
    76 ManipulablePrototypeFactoryUnitTest_SOURCES = unittests/UnitTestMain.cpp \
    77         Patterns/unittests/ManipulablePrototypeFactoryUnitTest.cpp \
    78         Patterns/unittests/ManipulablePrototypeFactoryUnitTest.hpp \
    79         Patterns/unittests/stubs/ManipulableCloneStub.cpp \
    80         Patterns/unittests/stubs/ManipulableCloneStub.hpp \
    81         Patterns/unittests/stubs/CommonStub.cpp \
    82         Patterns/unittests/stubs/CommonStub.hpp \
    83         Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.hpp \
    84         Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.cpp
     129ManipulablePrototypeFactoryUnitTest_SOURCES = UnitTestMain.cpp \
     130        ../Patterns/unittests/ManipulablePrototypeFactoryUnitTest.cpp \
     131        ../Patterns/unittests/ManipulablePrototypeFactoryUnitTest.hpp \
     132        ../Patterns/unittests/stubs/ManipulableCloneStub.cpp \
     133        ../Patterns/unittests/stubs/ManipulableCloneStub.hpp \
     134        ../Patterns/unittests/stubs/CommonStub.cpp \
     135        ../Patterns/unittests/stubs/CommonStub.hpp \
     136        ../Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.hpp \
     137        ../Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.cpp
    85138nodist_ManipulablePrototypeFactoryUnitTest_SOURCES = \
    86         Patterns/ManipulablePrototypeFactory.hpp \
    87         Patterns/FactoryTypeList.hpp \
    88         Patterns/ManipulablePrototypeFactory_impl.hpp
    89 ManipulablePrototypeFactoryUnitTest_LDADD = $(TESTLIBS)
     139        ../Patterns/ManipulablePrototypeFactory.hpp \
     140        ../Patterns/FactoryTypeList.hpp \
     141        ../Patterns/ManipulablePrototypeFactory_impl.hpp
     142ManipulablePrototypeFactoryUnitTest_LDADD = \
     143        ../Helpers/libCodePatterns-Helpers-debug.la
    90144
    91 PrototypeFactoryUnitTest_SOURCES = unittests/UnitTestMain.cpp \
    92         Patterns/unittests/PrototypeFactoryUnitTest.cpp \
    93         Patterns/unittests/PrototypeFactoryUnitTest.hpp \
    94         Patterns/unittests/stubs/CloneStub.cpp \
    95         Patterns/unittests/stubs/CloneStub.hpp \
    96         Patterns/unittests/stubs/CommonStub.cpp \
    97         Patterns/unittests/stubs/CommonStub.hpp \
    98         Patterns/unittests/stubs/PrototypeFactoryStub.hpp \
    99         Patterns/unittests/stubs/PrototypeFactoryStub.cpp
     145PrototypeFactoryUnitTest_SOURCES = UnitTestMain.cpp \
     146        ../Patterns/unittests/PrototypeFactoryUnitTest.cpp \
     147        ../Patterns/unittests/PrototypeFactoryUnitTest.hpp \
     148        ../Patterns/unittests/stubs/CloneStub.cpp \
     149        ../Patterns/unittests/stubs/CloneStub.hpp \
     150        ../Patterns/unittests/stubs/CommonStub.cpp \
     151        ../Patterns/unittests/stubs/CommonStub.hpp \
     152        ../Patterns/unittests/stubs/PrototypeFactoryStub.hpp \
     153        ../Patterns/unittests/stubs/PrototypeFactoryStub.cpp
    100154nodist_PrototypeFactoryUnitTest_SOURCES = \
    101         Patterns/PrototypeFactory.hpp \
    102         Patterns/FactoryTypeList.hpp \
    103         Patterns/PrototypeFactory_impl.hpp
    104 PrototypeFactoryUnitTest_LDADD = $(TESTLIBS)
     155        ../Patterns/PrototypeFactory.hpp \
     156        ../Patterns/FactoryTypeList.hpp \
     157        ../Patterns/PrototypeFactory_impl.hpp
     158PrototypeFactoryUnitTest_LDADD = \
     159        ../Helpers/libCodePatterns-Helpers-debug.la
    105160
    106 RegistryUnitTest_SOURCES = unittests/UnitTestMain.cpp \
    107         Patterns/unittests/RegistryUnitTest.cpp \
    108         Patterns/unittests/RegistryUnitTest.hpp \
    109         Patterns/unittests/stubs/CommonNamedStub.cpp \
    110         Patterns/unittests/stubs/CommonNamedStub.hpp \
    111         Patterns/unittests/stubs/RegistryStub.cpp \
    112         Patterns/unittests/stubs/RegistryStub.hpp
     161RegistryUnitTest_SOURCES = UnitTestMain.cpp \
     162        ../Patterns/unittests/RegistryUnitTest.cpp \
     163        ../Patterns/unittests/RegistryUnitTest.hpp \
     164        ../Patterns/unittests/stubs/CommonNamedStub.cpp \
     165        ../Patterns/unittests/stubs/CommonNamedStub.hpp \
     166        ../Patterns/unittests/stubs/RegistryStub.cpp \
     167        ../Patterns/unittests/stubs/RegistryStub.hpp
    113168nodist_RegistryUnitTest_SOURCES = \
    114         Patterns/unittests/Registry.hpp \
    115         Patterns/unittests/Registry_impl.hpp
    116 RegistryUnitTest_LDADD = $(TESTLIBS)
     169        ../Patterns/unittests/Registry.hpp \
     170        ../Patterns/unittests/Registry_impl.hpp
     171RegistryUnitTest_LDADD = \
     172        ../Helpers/libCodePatterns-Helpers-debug.la
    117173
    118 SingletonUnitTest_SOURCES = unittests/UnitTestMain.cpp \
    119         Patterns/unittests/SingletonUnitTest.cpp \
    120         Patterns/unittests/SingletonUnitTest.hpp
     174SingletonUnitTest_SOURCES = UnitTestMain.cpp \
     175        ../Patterns/unittests/SingletonUnitTest.cpp \
     176        ../Patterns/unittests/SingletonUnitTest.hpp
    121177#nodist_SingletonUnitTest_SOURCES =
    122 SingletonUnitTest_LDADD = $(TESTLIBS)
     178SingletonUnitTest_LDADD = \
     179        ../Helpers/libCodePatterns-Helpers-debug.la
    123180
    124181#AUTOMAKE_OPTIONS = parallel-tests

  • src/unittests/Makefile.am

    rb760ac5 r3324cf  
    44# NOTE that all paths are relative to ./src (because we get included there!)
    55
     6check_PROGRAMS =
     7noinst_PROGRAMS =
     8TESTS =
     9TESTSOURCES =
     10TESTHEADERS =
     11
     12INCLUDES = -I$(top_srcdir)/src/Helpers -I$(top_srcdir)/src/Patterns
     13
     14AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl $(BOOST_THREAD_LDFLAGS)
     15AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS)
     16
     17include ../Helpers/unittests/Makefile.am
     18include ../Patterns/unittests/Makefile.am
     19include ../Patterns/Observer/unittests/Makefile.am
     20
    621check_PROGRAMS += 
    722noinst_PROGRAMS += TestRunner
    823
    9 TESTSOURCES = \
    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/Observer/unittests/ObserverUnitTest.cpp \
    16   Patterns/Observer/unittests/ObservedContainerUnitTest.cpp \
    17   Patterns/Observer/unittests/stubs/ObserverStub.cpp \
    18   Patterns/unittests/CacheableUnitTest.cpp \
    19   Patterns/unittests/CloneUnitTest.cpp \
    20   Patterns/unittests/CreatorUnitTest.cpp \
    21   Patterns/unittests/FactoryUnitTest.cpp \
    22   Patterns/unittests/ManipulableCloneUnitTest.cpp \
    23   Patterns/unittests/ManipulablePrototypeFactoryUnitTest.cpp \
    24   Patterns/unittests/PrototypeFactoryUnitTest.cpp \
    25   Patterns/unittests/RegistryUnitTest.cpp \
    26   Patterns/unittests/SingletonUnitTest.cpp \
    27   Patterns/unittests/stubs/CloneStub.cpp \
    28   Patterns/unittests/stubs/CommonStub.cpp \
    29   Patterns/unittests/stubs/CommonNamedStub.cpp \
    30   Patterns/unittests/stubs/FactoryStub.cpp \
    31   Patterns/unittests/stubs/ManipulableCloneStub.cpp \
    32   Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.cpp \
    33   Patterns/unittests/stubs/PrototypeFactoryStub.cpp \
    34   Patterns/unittests/stubs/RegistryStub.cpp
    35 
    36 TESTHEADERS = \
    37   Helpers/unittests/AssertUnitTest.hpp \
    38   Helpers/unittests/ChronosUnitTest.hpp \
    39   Helpers/unittests/InfoUnitTest.hpp \
    40   Helpers/unittests/LogUnitTest.hpp \
    41   Helpers/unittests/RangeUnitTest.hpp \
    42   Patterns/unittests/Observer/ObserverUnitTest.hpp \
    43   Patterns/unittests/Observer/ObservedContainerUnitTest.hpp \
    44   Patterns/unittests/stubs/Observer/ObserverStub.hpp \
    45   Patterns/unittests/CacheableUnitTest.hpp \
    46   Patterns/unittests/CloneUnitTest.hpp \
    47   Patterns/unittests/CreatorUnitTest.hpp \
    48   Patterns/unittests/FactoryUnitTest.hpp \
    49   Patterns/unittests/ManipulableCloneUnitTest.hpp \
    50   Patterns/unittests/ManipulablePrototypeFactoryUnitTest.hpp \
    51   Patterns/unittests/PrototypeFactoryUnitTest.hpp \
    52   Patterns/unittests/RegistryUnitTest.hpp \
    53   Patterns/unittests/SingletonUnitTest.hpp \
    54   Patterns/unittests/stubs/CloneStub.hpp \
    55   Patterns/unittests/stubs/CommonStub.hpp \
    56   Patterns/unittests/stubs/CommonNamedStub.hpp \
    57   Patterns/unittests/stubs/CommonParametersStub.hpp \
    58   Patterns/unittests/stubs/CreatorStub.hpp \
    59   Patterns/unittests/stubs/FactoryStub.hpp \
    60   Patterns/unittests/stubs/ManipulableCloneStub.hpp \
    61   Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.hpp \
    62   Patterns/unittests/stubs/PrototypeFactoryStub.hpp \
    63   Patterns/unittests/stubs/FactoryStub.def \
    64   Patterns/unittests/stubs/FactoryStub.undef \
    65   Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.def \
    66   Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.undef \
    67   Patterns/unittests/stubs/PrototypeFactoryStub.def \
    68   Patterns/unittests/stubs/PrototypeFactoryStub.undef \
    69   Patterns/unittests/stubs/RegistryStub.hpp
    70        
    7124TestRunner_SOURCES = \
    72         unittests/TestRunnerMain.cpp \
     25        TestRunnerMain.cpp \
    7326        $(TESTSOURCES) \
     27nodist_TestRunner_SOURCES = \
    7428        $(TESTHEADERS)
    75 nodist_TestRunner_SOURCES = \
    76         Patterns/Observer/Channels.hpp \
    77         Patterns/Observer/defs.hpp \
    78         Patterns/Observer/Notification.hpp \
    79         Patterns/Observer/Observable.hpp \
    80         Patterns/Observer/Observer.hpp \
    81         Patterns/Observer/ObserverLog.hpp \
    82         Patterns/Observer/ObservedContainer_impl.hpp \
    83         Patterns/Observer/ObservedContainer.hpp \
    84         Patterns/Observer/ObserverIterator.hpp \
    85         Patterns/Cachable.hpp \
    86         Patterns/Clone.hpp \
    87         Patterns/Creator.hpp \
    88         Patterns/Factory_impl.hpp \
    89         Patterns/Factory.hpp \
    90         Patterns/FactoryTypeList.hpp \
    91         Patterns/ManipulableClone.hpp \
    92         Patterns/ManipulablePrototypeFactory_impl.hpp \
    93         Patterns/ManipulablePrototypeFactory.hpp \
    94         Patterns/PrototypeFactory_impl.hpp \
    95         Patterns/PrototypeFactory.hpp \
    96         Patterns/Registry_impl.hpp \
    97         Patterns/Registry.hpp \
    98         Patterns/Singleton_impl.hpp \
    99         Patterns/Singleton.hpp
    10029TestRunner_LDADD = \
    101         libCodePatterns-debug.la \
     30        ../Patterns/libCodePatterns-Patterns-debug.la \
     31        ../Helpers/libCodePatterns-Helpers-debug.la \
    10232        $(BOOST_THREAD_LIBS)
    10333
Note: See TracChangeset for help on using the changeset viewer.