Changeset 315a1e for src/Observer
- 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/Observer
- Files:
-
- 2 edited
-
Makefile.am (modified) (2 diffs)
-
unittests/Makefile.am (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
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
Note:
See TracChangeset
for help on using the changeset viewer.
