Changeset 3324cf for src/Patterns/Observer

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/Patterns/Observer

Files:

• all.hpp (modified) (3 diffs)
• unittests/Makefile.am (modified) (1 diff)

src/Patterns/Observer/all.hpp

@@ -6 +6 @@
  */
 
-#ifndef ALL_HPP_
-#define ALL_HPP_
+#ifndef OBSERVER_ALL_HPP_
+#define OBSERVER_ALL_HPP_
 
 // include config.h
@@ -13 +13 @@
 #include <config.h>
 #endif
-
 
 // Deactivate any logging when we are not in debug mode
@@ -24 +23 @@
 #include "Notification.hpp"
 #include "Observable.hpp"
+#include "ObservedContainer.hpp"
+#include "ObservedIterator.hpp"
 #include "Observer.hpp"
+#include "Relay.hpp"
 
-#endif /* ALL_HPP_ */
+#endif /* OBSERVER_ALL_HPP_ */

src/Patterns/Observer/unittests/Makefile.am

@@ -8 +8 @@
   ObserverUnitTest
 
+TESTSOURCES += \
+  ../Patterns/Observer/unittests/ObserverUnitTest.cpp \
+  ../Patterns/Observer/unittests/ObservedContainerUnitTest.cpp \
+  ../Patterns/Observer/unittests/stubs/ObserverStub.cpp
+
+TESTHEADERS += \
+  ../Patterns/unittests/Observer/ObserverUnitTest.hpp \
+  ../Patterns/unittests/Observer/ObservedContainerUnitTest.hpp
 
 check_PROGRAMS += $(TESTS) 
 noinst_PROGRAMS += $(TESTS)
 
-ObserverUnitTest_SOURCES = unittests/UnitTestMain.cpp \
-        Patterns/Observer/unittests/ObserverUnitTest.cpp \
-        Patterns/Observer/unittests/ObserverUnitTest.hpp \
-        Patterns/Observer/unittests/stubs/ObserverStub.cpp \
-        Patterns/Observer/unittests/stubs/ObserverStub.hpp
+ObserverUnitTest_SOURCES = UnitTestMain.cpp \
+        ../Patterns/Observer/unittests/ObserverUnitTest.cpp \
+        ../Patterns/Observer/unittests/ObserverUnitTest.hpp \
+        ../Patterns/Observer/unittests/stubs/ObserverStub.cpp \
+        ../Patterns/Observer/unittests/stubs/ObserverStub.hpp
 nodist_ObserverUnitTest_SOURCES = \
-        Patterns/Observer/Channels.hpp \
-        Patterns/Observer/defs.hpp \
-        Patterns/Observer/Notification.hpp \
-        Patterns/Observer/Observer.hpp \
-        Patterns/Observer/ObserverLog.hpp \
-        Patterns/Observer/ObserverContainer.hpp \
-        Patterns/Observer/ObserverContainer_impl.hpp \
-        Patterns/Observer/ObserverIterator.hpp
-ObserverUnitTest_LDADD = $(TESTLIBS)
+        ../Patterns/Observer/Channels.hpp \
+        ../Patterns/Observer/defs.hpp \
+        ../Patterns/Observer/Notification.hpp \
+        ../Patterns/Observer/Observer.hpp \
+        ../Patterns/Observer/ObserverLog.hpp \
+        ../Patterns/Observer/ObserverContainer.hpp \
+        ../Patterns/Observer/ObserverContainer_impl.hpp \
+        ../Patterns/Observer/ObserverIterator.hpp
+ObserverUnitTest_LDADD = \
+        ../Patterns/libCodePatterns-Patterns-debug.la \
+        ../Helpers/libCodePatterns-Helpers-debug.la \
+        $(BOOST_THREAD_LIBS)
 
-ObservedContainerUnitTest_SOURCES = unittests/UnitTestMain.cpp \
-        Patterns/Observer/unittests/ObservedContainerUnitTest.cpp \
-        Patterns/Observer/unittests/ObservedContainerUnitTest.hpp \
-        Patterns/Observer/unittests/stubs/ObserverStub.cpp \
-        Patterns/Observer/unittests/stubs/ObserverStub.hpp
+ObservedContainerUnitTest_SOURCES = UnitTestMain.cpp \
+        ../Patterns/Observer/unittests/ObservedContainerUnitTest.cpp \
+        ../Patterns/Observer/unittests/ObservedContainerUnitTest.hpp \
+        ../Patterns/Observer/unittests/stubs/ObserverStub.cpp \
+        ../Patterns/Observer/unittests/stubs/ObserverStub.hpp
 nodist_ObservedContainerUnitTest_SOURCES = \
-        Patterns/Observer/ObserverContainer.hpp \
-        Patterns/Observer/ObserverContainer_impl.hpp
-ObservedContainerUnitTest_LDADD = $(TESTLIBS)
+        ../Patterns/Observer/ObserverContainer.hpp \
+        ../Patterns/Observer/ObserverContainer_impl.hpp
+ObservedContainerUnitTest_LDADD = \
+        ../Patterns/libCodePatterns-Patterns-debug.la \
+        ../Helpers/libCodePatterns-Helpers-debug.la \
+        $(BOOST_THREAD_LIBS)