- Timestamp:
- Oct 30, 2015, 11:44:33 AM (10 years ago)
- Children:
- b09709
- Parents:
- 3681dd
- git-author:
- Frederik Heber <heber@…> (07/25/15 17:56:56)
- git-committer:
- Frederik Heber <heber@…> (10/30/15 11:44:33)
- Location:
- src
- Files:
-
- 8 edited
-
Helpers/Makefile.am (modified) (2 diffs)
-
Helpers/unittests/Makefile.am (modified) (6 diffs)
-
Makefile.am (modified) (7 diffs)
-
Observer/Makefile.am (modified) (2 diffs)
-
Observer/unittests/Makefile.am (modified) (3 diffs)
-
Patterns/Makefile.am (modified) (2 diffs)
-
Patterns/unittests/Makefile.am (modified) (10 diffs)
-
unittests/Makefile.am (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
src/Helpers/Makefile.am
r3681dd r315a1e 34 34 HELPERDEBUGHEADER = 35 35 36 noinst_LTLIBRARIES = libCodePatterns-Helpers.la libCodePatterns-Helpers-debug.la 37 libCodePatterns_Helpers_la_includedir = $(includedir)/CodePatterns/ 38 libCodePatterns_Helpers_debug_la_includedir = $(includedir)/CodePatterns/ 39 libCodePatterns_Helpers_la_LDFLAGS = \ 40 $(BOOST_THREAD_LDFLAGS) 41 libCodePatterns_Helpers_debug_la_LDFLAGS = \ 42 $(BOOST_THREAD_LDFLAGS) 43 libCodePatterns_Helpers_la_LIBADD = \ 36 noinst_LTLIBRARIES = libcodepatterns-Helpers.la libcodepatterns-Helpers-debug.la 37 libcodepatterns_Helpers_la_includedir = $(includedir)/CodePatterns/ 38 libcodepatterns_Helpers_debug_la_includedir = $(includedir)/CodePatterns/ 39 libcodepatterns_Helpers_la_LDFLAGS = \ 40 $(AM_LDFLAGS) \ 41 $(BOOST_THREAD_LDFLAGS) \ 44 42 $(LIBRT) \ 45 43 $(BOOST_THREAD_LIBS) 46 libCodePatterns_Helpers_debug_la_LIBADD = \ 44 libcodepatterns_Helpers_debug_la_LDFLAGS = \ 45 $(AM_LDFLAGS) \ 46 $(BOOST_THREAD_LDFLAGS) \ 47 47 $(LIBRT) \ 48 48 $(BOOST_THREAD_LIBS) 49 49 50 lib CodePatterns_Helpers_la_CPPFLAGS = -DNDEBUG -DNO_MEMDEBUG $(AM_CPPFLAGS)51 lib CodePatterns_Helpers_debug_la_CPPFLAGS = -DMEMDEBUG -DLOG_HELPER $(AM_CPPFLAGS)50 libcodepatterns_Helpers_la_CPPFLAGS = -DNDEBUG -DNO_MEMDEBUG $(AM_CPPFLAGS) 51 libcodepatterns_Helpers_debug_la_CPPFLAGS = -DMEMDEBUG -DLOG_HELPER $(AM_CPPFLAGS) 52 52 53 lib CodePatterns_Helpers_la_include_HEADERS = $(HELPERHEADER)54 lib CodePatterns_Helpers_debug_la_include_HEADERS = $(HELPERDEBUGHEADER)53 libcodepatterns_Helpers_la_include_HEADERS = $(HELPERHEADER) 54 libcodepatterns_Helpers_debug_la_include_HEADERS = $(HELPERDEBUGHEADER) 55 55 56 56 ## Define the source file list for the "libexample-@MOLECUILDER_API_VERSION@.la" … … 62 62 ## from each source file. Note that it is not necessary to list header files 63 63 ## which are already listed elsewhere in a _HEADERS variable assignment. 64 lib CodePatterns_Helpers_la_SOURCES = $(HELPERSOURCE)65 lib CodePatterns_Helpers_debug_la_SOURCES = $(HELPERDEBUGSOURCE)64 libcodepatterns_Helpers_la_SOURCES = $(HELPERSOURCE) 65 libcodepatterns_Helpers_debug_la_SOURCES = $(HELPERDEBUGSOURCE) -
src/Helpers/unittests/Makefile.am
r3681dd r315a1e 34 34 #nodist_AssertUnitTest_SOURCES = 35 35 AssertUnitTest_LDADD = \ 36 ../Helpers/lib CodePatterns-Helpers-debug.la36 ../Helpers/libcodepatterns-Helpers-debug.la 37 37 38 38 ChronosUnitTest_SOURCES = UnitTestMain.cpp \ … … 46 46 $(top_srcdir)/src/CodePatterns/Info.hpp 47 47 ChronosUnitTest_LDADD = \ 48 ../Helpers/lib CodePatterns-Helpers-debug.la \48 ../Helpers/libcodepatterns-Helpers-debug.la \ 49 49 $(LIBRT) 50 50 … … 65 65 $(top_srcdir)/src/CodePatterns/MemDebug.hpp 66 66 InfoUnitTest_LDADD = \ 67 ../Helpers/lib CodePatterns-Helpers-debug.la67 ../Helpers/libcodepatterns-Helpers-debug.la 68 68 69 69 IteratorAdaptorsUnitTest_SOURCES = UnitTestMain.cpp \ … … 73 73 $(top_srcdir)/src/CodePatterns/IteratorAdaptors.hpp 74 74 IteratorAdaptorsUnitTest_LDADD = \ 75 ../Helpers/lib CodePatterns-Helpers-debug.la75 ../Helpers/libcodepatterns-Helpers-debug.la 76 76 77 77 LogUnitTest_SOURCES = UnitTestMain.cpp \ … … 85 85 $(top_srcdir)/src/CodePatterns/MemDebug.hpp 86 86 LogUnitTest_LDADD = \ 87 ../Helpers/lib CodePatterns-Helpers-debug.la87 ../Helpers/libcodepatterns-Helpers-debug.la 88 88 89 89 RangeUnitTest_SOURCES = UnitTestMain.cpp \ … … 92 92 #nodist_RangeUnitTest_SOURCES = 93 93 RangeUnitTest_LDADD = \ 94 ../Helpers/lib CodePatterns-Helpers-debug.la94 ../Helpers/libcodepatterns-Helpers-debug.la 95 95 96 96 -
src/Makefile.am
r3681dd r315a1e 19 19 $(CONFIGSOURCES) \ 20 20 codepatterns-config.cpp 21 codepatterns_config_CPPFLAGS = $(BOOST_CPPFLAGS) 22 codepatterns_config_LDFLAGS = $(AM_LDFLAGS) \ 23 $(BOOST_PROGRAM_OPTIONS_LDFLAGS) 21 codepatterns_config_CPPFLAGS = \ 22 $(AM_CPPFLAGS) \ 23 $(BOOST_CPPFLAGS) 24 codepatterns_config_LDFLAGS = \ 25 $(AM_LDFLAGS) \ 26 $(BOOST_PROGRAM_OPTIONS_LDFLAGS) \ 27 $(BOOST_PROGRAM_OPTIONS_LIBS) 24 28 codepatterns_config_LDADD = \ 25 $(BOOST_PROGRAM_OPTIONS_LIBS) \ 26 libCodePatterns.la 29 libcodepatterns.la 27 30 28 31 codepatterns_debug_config_SOURCES = \ 29 32 $(CONFIGSOURCES) \ 30 33 codepatterns-debug-config.cpp 31 codepatterns_debug_config_CPPFLAGS = $(BOOST_CPPFLAGS) 32 codepatterns_debug_config_LDFLAGS = $(AM_LDFLAGS) \ 33 $(BOOST_PROGRAM_OPTIONS_LDFLAGS) 34 codepatterns_debug_config_CPPFLAGS = \ 35 $(AM_CPPFLAGS) \ 36 $(BOOST_CPPFLAGS) 37 codepatterns_debug_config_LDFLAGS = \ 38 $(AM_LDFLAGS) \ 39 $(BOOST_PROGRAM_OPTIONS_LDFLAGS) \ 40 $(BOOST_PROGRAM_OPTIONS_LIBS) 34 41 codepatterns_debug_config_LDADD = \ 35 $(BOOST_PROGRAM_OPTIONS_LIBS) \ 36 libCodePatterns.la 42 libcodepatterns.la 37 43 38 44 dist_man_MANS = \ … … 54 60 55 61 ##-@CODEPATTERNS_API_VERSION@ 56 lib_LTLIBRARIES = libCodePatterns.la libCodePatterns-debug.la 57 libCodePatterns_la_LIBADD = \ 58 Patterns/libCodePatterns-Patterns.la \ 59 Observer/libCodePatterns-Observer.la \ 60 Helpers/libCodePatterns-Helpers.la \ 62 lib_LTLIBRARIES = libcodepatterns.la libcodepatterns-debug.la 63 libcodepatterns_la_LDFLAGS = \ 64 $(AM_LDFLAGS) \ 61 65 $(LIBRT) 62 libCodePatterns_debug_la_LIBADD = \ 63 Patterns/libCodePatterns-Patterns-debug.la \ 64 Observer/libCodePatterns-Observer-debug.la \ 65 Helpers/libCodePatterns-Helpers-debug.la \ 66 libcodepatterns_debug_la_LDFLAGS = \ 67 $(AM_LDFLAGS) \ 66 68 $(LIBRT) 69 libcodepatterns_la_LIBADD = \ 70 Patterns/libcodepatterns-Patterns.la \ 71 Observer/libcodepatterns-Observer.la \ 72 Helpers/libcodepatterns-Helpers.la 73 libcodepatterns_debug_la_LIBADD = \ 74 Patterns/libcodepatterns-Patterns-debug.la \ 75 Observer/libcodepatterns-Observer-debug.la \ 76 Helpers/libcodepatterns-Helpers-debug.la 67 77 68 lib CodePatterns_la_CPPFLAGS = -DNDEBUG -DNO_MEMDEBUG $(AM_CPPFLAGS)69 lib CodePatterns_debug_la_CPPFLAGS = -DMEMDEBUG -DLOG_OBSERVER $(AM_CPPFLAGS)78 libcodepatterns_la_CPPFLAGS = -DNDEBUG -DNO_MEMDEBUG $(AM_CPPFLAGS) 79 libcodepatterns_debug_la_CPPFLAGS = -DMEMDEBUG -DLOG_OBSERVER $(AM_CPPFLAGS) 70 80 71 81 ## Define the source file list for the "libexample-@CODEPATTERNS_API_VERSION@.la" … … 78 88 ## which are already listed elsewhere in a _HEADERS variable assignment. 79 89 #-$(CODEPATTERNS_API_VERSION) 80 lib CodePatterns_la_SOURCES = $(SOURCE)81 lib CodePatterns_debug_la_SOURCES = $(SOURCEDEBUG)90 libcodepatterns_la_SOURCES = $(SOURCE) 91 libcodepatterns_debug_la_SOURCES = $(SOURCEDEBUG) 82 92 83 93 ## Instruct libtool to include ABI version information in the generated shared … … 85 95 ## that all version information is kept in one place. 86 96 #-$(CODEPATTERNS_API_VERSION) 87 lib CodePatterns_la_LDFLAGS = $(AM_LDFLAGS)-version-info $(CODEPATTERNS_SO_VERSION)88 lib CodePatterns_debug_la_LDFLAGS = $(AM_LDFLAGS)-version-info $(CODEPATTERNS_SO_VERSION)97 libcodepatterns_la_LDFLAGS += -version-info $(CODEPATTERNS_SO_VERSION) 98 libcodepatterns_debug_la_LDFLAGS += -version-info $(CODEPATTERNS_SO_VERSION) 89 99 90 100 ## The generated configuration header is installed in its own subdirectory of … … 99 109 ## configuration header file is generated at configure time and should not be 100 110 ## shipped with the source tarball. 101 lib CodePatterns_libincludedir = $(includedir)/CodePatterns/111 libcodepatterns_libincludedir = $(includedir)/CodePatterns/ 102 112 #-$(CODEPATTERNS_API_VERSION) 103 lib CodePatterns_libinclude_HEADERS = $(HEADER) $(top_builddir)/libCodePatterns_config.h113 libcodepatterns_libinclude_HEADERS = $(HEADER) $(top_builddir)/libcodepatterns_config.h 104 114 105 115 ## Install the generated pkg-config file (.pc) into the expected location for … … 108 118 ## in which case the correct install location would be $(datadir)/pkgconfig. 109 119 pkgconfigdir = $(libdir)/pkgconfig 110 pkgconfig_DATA = $(top_builddir)/ CodePatterns.pc $(top_builddir)/CodePatterns-debug.pc120 pkgconfig_DATA = $(top_builddir)/libcodepatterns.pc $(top_builddir)/libcodepatterns-debug.pc 111 121 112 122 FORCE: … … 127 137 128 138 codepatterns-config.cpp: 129 echo -e "const char *CODEPATTERNSCFLAGS=\"-I$(includedir) ${BOOST_CPPFLAGS}\";\nconst char *CODEPATTERNSLDFLAGS=\"-L$(libdir) $(BOOST_LDFLAGS)\";\nconst char *CODEPATTERNSLIBS=\"-l CodePatterns $(BOOST_THREAD_LIB)\";\n" > $@139 echo -e "const char *CODEPATTERNSCFLAGS=\"-I$(includedir) ${BOOST_CPPFLAGS}\";\nconst char *CODEPATTERNSLDFLAGS=\"-L$(libdir) $(BOOST_LDFLAGS)\";\nconst char *CODEPATTERNSLIBS=\"-lcodepatterns $(BOOST_THREAD_LIB)\";\n" > $@ 130 140 131 141 codepatterns-debug-config.cpp: 132 echo -e "const char *CODEPATTERNSCFLAGS=\"-I$(includedir) ${BOOST_CPPFLAGS}\";\nconst char *CODEPATTERNSLDFLAGS=\"-L$(libdir) $(BOOST_LDFLAGS)\";\nconst char *CODEPATTERNSLIBS=\"-l CodePatterns-debug $(BOOST_THREAD_LIB)\";\n" > $@142 echo -e "const char *CODEPATTERNSCFLAGS=\"-I$(includedir) ${BOOST_CPPFLAGS}\";\nconst char *CODEPATTERNSLDFLAGS=\"-L$(libdir) $(BOOST_LDFLAGS)\";\nconst char *CODEPATTERNSLIBS=\"-lcodepatterns-debug $(BOOST_THREAD_LIB)\";\n" > $@ -
src/Observer/Makefile.am
r3681dd r315a1e 37 37 OBSERVERDEBUGHEADER = 38 38 39 noinst_LTLIBRARIES = lib CodePatterns-Observer.la libCodePatterns-Observer-debug.la40 lib CodePatterns_Observer_la_includedir = $(includedir)/CodePatterns/Observer/41 lib CodePatterns_Observer_debug_la_includedir = $(includedir)/CodePatterns/Observer/39 noinst_LTLIBRARIES = libcodepatterns-Observer.la libcodepatterns-Observer-debug.la 40 libcodepatterns_Observer_la_includedir = $(includedir)/CodePatterns/Observer/ 41 libcodepatterns_Observer_debug_la_includedir = $(includedir)/CodePatterns/Observer/ 42 42 43 lib CodePatterns_Observer_la_CPPFLAGS = -DNDEBUG -DNO_MEMDEBUG $(AM_CPPFLAGS)44 lib CodePatterns_Observer_debug_la_CPPFLAGS = -DMEMDEBUG -DLOG_OBSERVER $(AM_CPPFLAGS)43 libcodepatterns_Observer_la_CPPFLAGS = -DNDEBUG -DNO_MEMDEBUG $(AM_CPPFLAGS) 44 libcodepatterns_Observer_debug_la_CPPFLAGS = -DMEMDEBUG -DLOG_OBSERVER $(AM_CPPFLAGS) 45 45 46 lib CodePatterns_Observer_la_include_HEADERS = $(OBSERVERHEADER)47 lib CodePatterns_Observer_debug_la_include_HEADERS = $(OBSERVERDEBUGHEADER)46 libcodepatterns_Observer_la_include_HEADERS = $(OBSERVERHEADER) 47 libcodepatterns_Observer_debug_la_include_HEADERS = $(OBSERVERDEBUGHEADER) 48 48 49 49 ## Define the source file list for the "libexample-@MOLECUILDER_API_VERSION@.la" … … 55 55 ## from each source file. Note that it is not necessary to list header files 56 56 ## which are already listed elsewhere in a _HEADERS variable assignment. 57 lib CodePatterns_Observer_la_SOURCES = $(OBSERVERSOURCE)58 lib CodePatterns_Observer_debug_la_SOURCES = $(OBSERVERDEBUGSOURCE)57 libcodepatterns_Observer_la_SOURCES = $(OBSERVERSOURCE) 58 libcodepatterns_Observer_debug_la_SOURCES = $(OBSERVERDEBUGSOURCE) 59 59 60 60 #Observer/all.hpp: FORCE -
src/Observer/unittests/Makefile.am
r3681dd r315a1e 38 38 $(top_srcdir)/src/CodePatterns/Observer/ObserverIterator.hpp 39 39 ObserverUnitTest_LDADD = \ 40 ../Observer/lib CodePatterns-Observer-debug.la \41 ../Helpers/lib CodePatterns-Helpers-debug.la40 ../Observer/libcodepatterns-Observer-debug.la \ 41 ../Helpers/libcodepatterns-Helpers-debug.la 42 42 43 43 GraveyardUnitTest_SOURCES = UnitTestMain.cpp \ … … 56 56 $(top_srcdir)/src/CodePatterns/Observer/ObserverIterator.hpp 57 57 GraveyardUnitTest_LDADD = \ 58 ../Observer/lib CodePatterns-Observer-debug.la \59 ../Helpers/lib CodePatterns-Helpers-debug.la58 ../Observer/libcodepatterns-Observer-debug.la \ 59 ../Helpers/libcodepatterns-Helpers-debug.la 60 60 61 61 ObservedContainerUnitTest_SOURCES = UnitTestMain.cpp \ … … 68 68 $(top_srcdir)/src/CodePatterns/Observer/ObserverContainer_impl.hpp 69 69 ObservedContainerUnitTest_LDADD = \ 70 ../Observer/lib CodePatterns-Observer-debug.la \71 ../Helpers/lib CodePatterns-Helpers-debug.la70 ../Observer/libcodepatterns-Observer-debug.la \ 71 ../Helpers/libcodepatterns-Helpers-debug.la 72 72 73 73 #AUTOMAKE_OPTIONS = parallel-tests -
src/Patterns/Makefile.am
r3681dd r315a1e 30 30 PATTERNDEBUGHEADER = 31 31 32 noinst_LTLIBRARIES = libCodePatterns-Patterns.la libCodePatterns-Patterns-debug.la 33 libCodePatterns_Patterns_la_includedir = $(includedir)/CodePatterns/ 34 libCodePatterns_Patterns_debug_la_includedir = $(includedir)/CodePatterns/ 35 libCodePatterns_Patterns_la_LDFLAGS = \ 36 $(BOOST_THREAD_LDFLAGS) 37 libCodePatterns_Patterns_debug_la_LDFLAGS = \ 38 $(BOOST_THREAD_LDFLAGS) 39 libCodePatterns_Patterns_la_LIBADD = \ 32 noinst_LTLIBRARIES = libcodepatterns-Patterns.la libcodepatterns-Patterns-debug.la 33 libcodepatterns_Patterns_la_includedir = $(includedir)/CodePatterns/ 34 libcodepatterns_Patterns_debug_la_includedir = $(includedir)/CodePatterns/ 35 libcodepatterns_Patterns_la_LDFLAGS = \ 36 $(AM_LDFLAGS) \ 37 $(BOOST_THREAD_LDFLAGS) \ 40 38 $(BOOST_THREAD_LIBS) 41 libCodePatterns_Patterns_debug_la_LIBADD = \ 39 libcodepatterns_Patterns_la_LIBADD = 40 libcodepatterns_Patterns_debug_la_LDFLAGS = \ 41 $(AM_LDFLAGS) \ 42 $(BOOST_THREAD_LDFLAGS) \ 42 43 $(BOOST_THREAD_LIBS) 44 libcodepatterns_Patterns_debug_la_LIBADD = 43 45 44 lib CodePatterns_Patterns_la_CPPFLAGS = -DNDEBUG -DNO_MEMDEBUG $(AM_CPPFLAGS)45 lib CodePatterns_Patterns_debug_la_CPPFLAGS = -DMEMDEBUG -DLOG_OBSERVER $(AM_CPPFLAGS)46 libcodepatterns_Patterns_la_CPPFLAGS = -DNDEBUG -DNO_MEMDEBUG $(AM_CPPFLAGS) 47 libcodepatterns_Patterns_debug_la_CPPFLAGS = -DMEMDEBUG -DLOG_OBSERVER $(AM_CPPFLAGS) 46 48 47 lib CodePatterns_Patterns_la_include_HEADERS = $(PATTERNHEADER)48 lib CodePatterns_Patterns_debug_la_include_HEADERS = $(PATTERNDEBUGHEADER)49 libcodepatterns_Patterns_la_include_HEADERS = $(PATTERNHEADER) 50 libcodepatterns_Patterns_debug_la_include_HEADERS = $(PATTERNDEBUGHEADER) 49 51 50 52 ## Define the source file list for the "libexample-@MOLECUILDER_API_VERSION@.la" … … 56 58 ## from each source file. Note that it is not necessary to list header files 57 59 ## which are already listed elsewhere in a _HEADERS variable assignment. 58 lib CodePatterns_Patterns_la_SOURCES = $(PATTERNSOURCE)59 lib CodePatterns_Patterns_debug_la_SOURCES = $(PATTERNDEBUGSOURCE)60 libcodepatterns_Patterns_la_SOURCES = $(PATTERNSOURCE) 61 libcodepatterns_Patterns_debug_la_SOURCES = $(PATTERNDEBUGSOURCE) 60 62 61 63 #Observer/all.hpp: FORCE -
src/Patterns/unittests/Makefile.am
r3681dd r315a1e 81 81 $(top_srcdir)/src/CodePatterns/Observer/ObserverIterator.hpp 82 82 CacheableUnitTest_LDADD = \ 83 ../Observer/lib CodePatterns-Observer-debug.la \84 ../Patterns/lib CodePatterns-Patterns-debug.la \85 ../Helpers/lib CodePatterns-Helpers-debug.la83 ../Observer/libcodepatterns-Observer-debug.la \ 84 ../Patterns/libcodepatterns-Patterns-debug.la \ 85 ../Helpers/libcodepatterns-Helpers-debug.la 86 86 87 87 CloneUnitTest_SOURCES = UnitTestMain.cpp \ … … 95 95 $(top_srcdir)/src/CodePatterns/Clone.hpp 96 96 CloneUnitTest_LDADD = \ 97 ../Helpers/lib CodePatterns-Helpers-debug.la97 ../Helpers/libcodepatterns-Helpers-debug.la 98 98 99 99 CreatorUnitTest_SOURCES = UnitTestMain.cpp \ … … 106 106 $(top_srcdir)/src/CodePatterns/Creator.hpp 107 107 CreatorUnitTest_LDADD = \ 108 ../Helpers/lib CodePatterns-Helpers-debug.la108 ../Helpers/libcodepatterns-Helpers-debug.la 109 109 110 110 FactoryUnitTest_SOURCES = UnitTestMain.cpp \ … … 121 121 $(top_srcdir)/src/CodePatterns/Factory_impl.hpp 122 122 FactoryUnitTest_LDADD = \ 123 ../Helpers/lib CodePatterns-Helpers-debug.la123 ../Helpers/libcodepatterns-Helpers-debug.la 124 124 125 125 ManipulableCloneUnitTest_SOURCES = UnitTestMain.cpp \ … … 133 133 $(top_srcdir)/src/CodePatterns/ManipulableClone.hpp 134 134 ManipulableCloneUnitTest_LDADD = \ 135 ../Helpers/lib CodePatterns-Helpers-debug.la135 ../Helpers/libcodepatterns-Helpers-debug.la 136 136 137 137 ManipulablePrototypeFactoryUnitTest_SOURCES = UnitTestMain.cpp \ … … 149 149 $(top_srcdir)/src/CodePatterns/ManipulablePrototypeFactory_impl.hpp 150 150 ManipulablePrototypeFactoryUnitTest_LDADD = \ 151 ../Helpers/lib CodePatterns-Helpers-debug.la151 ../Helpers/libcodepatterns-Helpers-debug.la 152 152 153 153 ObservedValueUnitTest_SOURCES = UnitTestMain.cpp \ … … 160 160 $(top_srcdir)/src/CodePatterns/Observer/Observer.hpp 161 161 ObservedValueUnitTest_LDADD = \ 162 ../Observer/lib CodePatterns-Observer-debug.la \163 ../Patterns/lib CodePatterns-Patterns-debug.la \164 ../Helpers/lib CodePatterns-Helpers-debug.la162 ../Observer/libcodepatterns-Observer-debug.la \ 163 ../Patterns/libcodepatterns-Patterns-debug.la \ 164 ../Helpers/libcodepatterns-Helpers-debug.la 165 165 166 166 PrototypeFactoryUnitTest_SOURCES = UnitTestMain.cpp \ … … 178 178 $(top_srcdir)/src/CodePatterns/PrototypeFactory_impl.hpp 179 179 PrototypeFactoryUnitTest_LDADD = \ 180 ../Helpers/lib CodePatterns-Helpers-debug.la180 ../Helpers/libcodepatterns-Helpers-debug.la 181 181 182 182 RegistryUnitTest_SOURCES = UnitTestMain.cpp \ … … 191 191 $(top_srcdir)/src/CodePatterns/Registry_impl.hpp 192 192 RegistryUnitTest_LDADD = \ 193 ../Helpers/lib CodePatterns-Helpers-debug.la193 ../Helpers/libcodepatterns-Helpers-debug.la 194 194 195 195 SingletonUnitTest_SOURCES = UnitTestMain.cpp \ … … 198 198 #nodist_SingletonUnitTest_SOURCES = 199 199 SingletonUnitTest_LDADD = \ 200 ../Helpers/lib CodePatterns-Helpers-debug.la200 ../Helpers/libcodepatterns-Helpers-debug.la 201 201 202 202 #AUTOMAKE_OPTIONS = parallel-tests -
src/unittests/Makefile.am
r3681dd r315a1e 25 25 $(TESTHEADERS) 26 26 TestRunner_LDADD = \ 27 ../Patterns/lib CodePatterns-Patterns-debug.la \28 ../Observer/lib CodePatterns-Observer-debug.la \29 ../Helpers/lib CodePatterns-Helpers-debug.la \27 ../Patterns/libcodepatterns-Patterns-debug.la \ 28 ../Observer/libcodepatterns-Observer-debug.la \ 29 ../Helpers/libcodepatterns-Helpers-debug.la \ 30 30 $(LIBRT) 31 31
Note:
See TracChangeset
for help on using the changeset viewer.
