Changeset 9b8fa4 for src/Patterns/unittests/Makefile.am

Timestamp:

Dec 13, 2011, 1:09:40 PM (14 years ago)

Author:

Frederik Heber <heber@…>

Children:

c7ac70

Parents:

3324cf

git-author:

Frederik Heber <heber@…> (12/11/11 14:49:06)

git-committer:

Frederik Heber <heber@…> (12/13/11 13:09:40)

Message:

Huge update of file structure to place installation header files into right folder.

• The problem ist that we desire use as include "CodePatterns/...". For this to work, especially with the new Observer subfolder structure, it has been necessary to place all header files away from their source files into a distinct folder called CodePatterns. This emulates the later, after make install present structure.
• essentially all source and header files had to be changed to adapt the include.
• all Makefile.am's had to be changed.
• nobase_ ... was removed such that header files are installed flat and not creating their subfolder along the process.
• We placed Observer into its own convenience library and own folder Observer away from Patterns.

Some other changes:

• FIX: MemDebug.hpp inclusion has been removed in all stubs.

File:

• src/Patterns/unittests/Makefile.am (modified) (9 diffs)

src/Patterns/unittests/Makefile.am

@@ -5 +5 @@
 
 TESTS += \
-  CacheableUnitTest \
-  CloneUnitTest \
-  CreatorUnitTest \
-  FactoryUnitTest \
-  ManipulableCloneUnitTest \
-  ManipulablePrototypeFactoryUnitTest \
-  PrototypeFactoryUnitTest \
-  RegistryUnitTest \
-  SingletonUnitTest
+        CacheableUnitTest \
+        CloneUnitTest \
+        CreatorUnitTest \
+        FactoryUnitTest \
+        ManipulableCloneUnitTest \
+        ManipulablePrototypeFactoryUnitTest \
+        PrototypeFactoryUnitTest \
+        RegistryUnitTest \
+        SingletonUnitTest
 
 TESTSOURCES += \
-  ../Patterns/unittests/CacheableUnitTest.cpp \
-  ../Patterns/unittests/CloneUnitTest.cpp \
-  ../Patterns/unittests/CreatorUnitTest.cpp \
-  ../Patterns/unittests/FactoryUnitTest.cpp \
-  ../Patterns/unittests/ManipulableCloneUnitTest.cpp \
-  ../Patterns/unittests/ManipulablePrototypeFactoryUnitTest.cpp \
-  ../Patterns/unittests/PrototypeFactoryUnitTest.cpp \
-  ../Patterns/unittests/RegistryUnitTest.cpp \
-  ../Patterns/unittests/SingletonUnitTest.cpp \
-  ../Patterns/unittests/stubs/CloneStub.cpp \
-  ../Patterns/unittests/stubs/CommonStub.cpp \
-  ../Patterns/unittests/stubs/CommonNamedStub.cpp \
-  ../Patterns/unittests/stubs/FactoryStub.cpp \
-  ../Patterns/unittests/stubs/ManipulableCloneStub.cpp \
-  ../Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.cpp \
-  ../Patterns/unittests/stubs/PrototypeFactoryStub.cpp \
-  ../Patterns/unittests/stubs/RegistryStub.cpp
+        ../Patterns/unittests/CacheableUnitTest.cpp \
+        ../Patterns/unittests/CloneUnitTest.cpp \
+        ../Patterns/unittests/CreatorUnitTest.cpp \
+        ../Patterns/unittests/FactoryUnitTest.cpp \
+        ../Patterns/unittests/ManipulableCloneUnitTest.cpp \
+        ../Patterns/unittests/ManipulablePrototypeFactoryUnitTest.cpp \
+        ../Patterns/unittests/PrototypeFactoryUnitTest.cpp \
+        ../Patterns/unittests/RegistryUnitTest.cpp \
+        ../Patterns/unittests/SingletonUnitTest.cpp \
+        ../Patterns/unittests/stubs/CloneStub.cpp \
+        ../Patterns/unittests/stubs/CommonStub.cpp \
+        ../Patterns/unittests/stubs/CommonNamedStub.cpp \
+        ../Patterns/unittests/stubs/FactoryStub.cpp \
+        ../Patterns/unittests/stubs/ManipulableCloneStub.cpp \
+        ../Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.cpp \
+        ../Patterns/unittests/stubs/PrototypeFactoryStub.cpp \
+        ../Patterns/unittests/stubs/RegistryStub.cpp
 
 TESTHEADERS += \
-  ../Patterns/unittests/stubs/Observer/ObserverStub.hpp \
-  ../Patterns/unittests/CacheableUnitTest.hpp \
-  ../Patterns/unittests/CloneUnitTest.hpp \
-  ../Patterns/unittests/CreatorUnitTest.hpp \
-  ../Patterns/unittests/FactoryUnitTest.hpp \
-  ../Patterns/unittests/ManipulableCloneUnitTest.hpp \
-  ../Patterns/unittests/ManipulablePrototypeFactoryUnitTest.hpp \
-  ../Patterns/unittests/PrototypeFactoryUnitTest.hpp \
-  ../Patterns/unittests/RegistryUnitTest.hpp \
-  ../Patterns/unittests/SingletonUnitTest.hpp \
-  ../Patterns/unittests/stubs/CloneStub.hpp \
-  ../Patterns/unittests/stubs/CommonStub.hpp \
-  ../Patterns/unittests/stubs/CommonNamedStub.hpp \
-  ../Patterns/unittests/stubs/CommonParametersStub.hpp \
-  ../Patterns/unittests/stubs/CreatorStub.hpp \
-  ../Patterns/unittests/stubs/FactoryStub.hpp \
-  ../Patterns/unittests/stubs/ManipulableCloneStub.hpp \
-  ../Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.hpp \
-  ../Patterns/unittests/stubs/PrototypeFactoryStub.hpp \
-  ../Patterns/unittests/stubs/FactoryStub.def \
-  ../Patterns/unittests/stubs/FactoryStub.undef \
-  ../Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.def \
-  ../Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.undef \
-  ../Patterns/unittests/stubs/PrototypeFactoryStub.def \
-  ../Patterns/unittests/stubs/PrototypeFactoryStub.undef \
-  ../Patterns/unittests/stubs/RegistryStub.hpp
+        ../Patterns/unittests/CacheableUnitTest.hpp \
+        ../Patterns/unittests/CloneUnitTest.hpp \
+        ../Patterns/unittests/CreatorUnitTest.hpp \
+        ../Patterns/unittests/FactoryUnitTest.hpp \
+        ../Patterns/unittests/ManipulableCloneUnitTest.hpp \
+        ../Patterns/unittests/ManipulablePrototypeFactoryUnitTest.hpp \
+        ../Patterns/unittests/PrototypeFactoryUnitTest.hpp \
+        ../Patterns/unittests/RegistryUnitTest.hpp \
+        ../Patterns/unittests/SingletonUnitTest.hpp \
+        ../Patterns/unittests/stubs/CloneStub.hpp \
+        ../Patterns/unittests/stubs/CommonStub.hpp \
+        ../Patterns/unittests/stubs/CommonNamedStub.hpp \
+        ../Patterns/unittests/stubs/CommonParametersStub.hpp \
+        ../Patterns/unittests/stubs/CreatorStub.hpp \
+        ../Patterns/unittests/stubs/FactoryStub.hpp \
+        ../Patterns/unittests/stubs/ManipulableCloneStub.hpp \
+        ../Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.hpp \
+        ../Patterns/unittests/stubs/PrototypeFactoryStub.hpp \
+        ../Patterns/unittests/stubs/FactoryStub.def \
+        ../Patterns/unittests/stubs/FactoryStub.undef \
+        ../Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.def \
+        ../Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.undef \
+        ../Patterns/unittests/stubs/PrototypeFactoryStub.def \
+        ../Patterns/unittests/stubs/PrototypeFactoryStub.undef \
+        ../Patterns/unittests/stubs/RegistryStub.hpp
 
 check_PROGRAMS += $(TESTS) 
@@ -69 +68 @@
         ../Patterns/unittests/CacheableUnitTest.hpp
 nodist_CacheableUnitTest_SOURCES = \
-        ../Patterns/Cachable.hpp \
-        ../Patterns/Observer.hpp \
-        ../Patterns/ObserverIterator.hpp
+        $(top_srcdir)/src/CodePatterns/Cachable.hpp \
+        $(top_srcdir)/src/CodePatterns/Observer/Observer.hpp \
+        $(top_srcdir)/src/CodePatterns/Observer/ObserverIterator.hpp
 CacheableUnitTest_LDADD = \
+        ../Observer/libCodePatterns-Observer-debug.la \
         ../Patterns/libCodePatterns-Patterns-debug.la \
         ../Helpers/libCodePatterns-Helpers-debug.la \
@@ -85 +85 @@
         ../Patterns/unittests/stubs/CloneStub.hpp
 nodist_CloneUnitTest_SOURCES = \
-        ../Patterns/Clone.hpp
+        $(top_srcdir)/src/CodePatterns/Clone.hpp
 CloneUnitTest_LDADD = \
         ../Helpers/libCodePatterns-Helpers-debug.la
@@ -96 +96 @@
         ../Patterns/unittests/stubs/CreatorStub.hpp
 nodist_CreatorUnitTest_SOURCES = \
-        ../Patterns/Creator.hpp
+        $(top_srcdir)/src/CodePatterns/Creator.hpp
 CreatorUnitTest_LDADD = \
         ../Helpers/libCodePatterns-Helpers-debug.la
@@ -109 +109 @@
         ../Patterns/unittests/stubs/FactoryStub.cpp
 nodist_FactoryUnitTest_SOURCES = \
-        ../Patterns/Factory.hpp \
-        ../Patterns/FactoryTypeList.hpp \
-        ../Patterns/Factory_impl.hpp
+        $(top_srcdir)/src/CodePatterns/Factory.hpp \
+        $(top_srcdir)/src/CodePatterns/FactoryTypeList.hpp \
+        $(top_srcdir)/src/CodePatterns/Factory_impl.hpp
 FactoryUnitTest_LDADD = \
         ../Helpers/libCodePatterns-Helpers-debug.la
@@ -123 +123 @@
         ../Patterns/unittests/stubs/ManipulableCloneStub.hpp
 nodist_ManipulableCloneUnitTest_SOURCES = \
-        ../Patterns/ManipulableClone.hpp
+        $(top_srcdir)/src/CodePatterns/ManipulableClone.hpp
 ManipulableCloneUnitTest_LDADD = \
         ../Helpers/libCodePatterns-Helpers-debug.la
@@ -137 +137 @@
         ../Patterns/unittests/stubs/ManipulablePrototypeFactoryStub.cpp
 nodist_ManipulablePrototypeFactoryUnitTest_SOURCES = \
-        ../Patterns/ManipulablePrototypeFactory.hpp \
-        ../Patterns/FactoryTypeList.hpp \
-        ../Patterns/ManipulablePrototypeFactory_impl.hpp
+        $(top_srcdir)/src/CodePatterns/ManipulablePrototypeFactory.hpp \
+        $(top_srcdir)/src/CodePatterns/FactoryTypeList.hpp \
+        $(top_srcdir)/src/CodePatterns/ManipulablePrototypeFactory_impl.hpp
 ManipulablePrototypeFactoryUnitTest_LDADD = \
         ../Helpers/libCodePatterns-Helpers-debug.la
@@ -153 +153 @@
         ../Patterns/unittests/stubs/PrototypeFactoryStub.cpp
 nodist_PrototypeFactoryUnitTest_SOURCES = \
-        ../Patterns/PrototypeFactory.hpp \
-        ../Patterns/FactoryTypeList.hpp \
-        ../Patterns/PrototypeFactory_impl.hpp
+        $(top_srcdir)/src/CodePatterns/PrototypeFactory.hpp \
+        $(top_srcdir)/src/CodePatterns/FactoryTypeList.hpp \
+        $(top_srcdir)/src/CodePatterns/PrototypeFactory_impl.hpp
 PrototypeFactoryUnitTest_LDADD = \
         ../Helpers/libCodePatterns-Helpers-debug.la
@@ -167 +167 @@
         ../Patterns/unittests/stubs/RegistryStub.hpp
 nodist_RegistryUnitTest_SOURCES = \
-        ../Patterns/unittests/Registry.hpp \
-        ../Patterns/unittests/Registry_impl.hpp
+        $(top_srcdir)/src/CodePatterns/Registry.hpp \
+        $(top_srcdir)/src/CodePatterns/Registry_impl.hpp
 RegistryUnitTest_LDADD = \
         ../Helpers/libCodePatterns-Helpers-debug.la