Changeset 315a1e for src/Patterns

Timestamp:

Oct 30, 2015, 11:44:33 AM (10 years ago)

Author:

Frederik Heber <heber@…>

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)

Message:

FIX: Fixed several lintian warnings when making debian package.

• library name is now lower case, package name is now libcodepatterns.
• external libs are now added to LDFLAGS instead of LIBADD.

Location:

src/Patterns

Files:

• Makefile.am (modified) (2 diffs)
• unittests/Makefile.am (modified) (10 diffs)

src/Patterns/Makefile.am

@@ -30 +30 @@
 PATTERNDEBUGHEADER =
 
-noinst_LTLIBRARIES = libCodePatterns-Patterns.la libCodePatterns-Patterns-debug.la
-libCodePatterns_Patterns_la_includedir = $(includedir)/CodePatterns/
-libCodePatterns_Patterns_debug_la_includedir = $(includedir)/CodePatterns/
-libCodePatterns_Patterns_la_LDFLAGS = \
-        $(BOOST_THREAD_LDFLAGS)
-libCodePatterns_Patterns_debug_la_LDFLAGS = \
-        $(BOOST_THREAD_LDFLAGS)
-libCodePatterns_Patterns_la_LIBADD = \
+noinst_LTLIBRARIES = libcodepatterns-Patterns.la libcodepatterns-Patterns-debug.la
+libcodepatterns_Patterns_la_includedir = $(includedir)/CodePatterns/
+libcodepatterns_Patterns_debug_la_includedir = $(includedir)/CodePatterns/
+libcodepatterns_Patterns_la_LDFLAGS = \
+        $(AM_LDFLAGS) \
+        $(BOOST_THREAD_LDFLAGS) \
         $(BOOST_THREAD_LIBS)
-libCodePatterns_Patterns_debug_la_LIBADD = \
+libcodepatterns_Patterns_la_LIBADD =
+libcodepatterns_Patterns_debug_la_LDFLAGS = \
+        $(AM_LDFLAGS) \
+        $(BOOST_THREAD_LDFLAGS) \
         $(BOOST_THREAD_LIBS)
+libcodepatterns_Patterns_debug_la_LIBADD =
 
-libCodePatterns_Patterns_la_CPPFLAGS = -DNDEBUG -DNO_MEMDEBUG $(AM_CPPFLAGS)
-libCodePatterns_Patterns_debug_la_CPPFLAGS = -DMEMDEBUG -DLOG_OBSERVER $(AM_CPPFLAGS)
+libcodepatterns_Patterns_la_CPPFLAGS = -DNDEBUG -DNO_MEMDEBUG $(AM_CPPFLAGS)
+libcodepatterns_Patterns_debug_la_CPPFLAGS = -DMEMDEBUG -DLOG_OBSERVER $(AM_CPPFLAGS)
 
-libCodePatterns_Patterns_la_include_HEADERS = $(PATTERNHEADER)
-libCodePatterns_Patterns_debug_la_include_HEADERS = $(PATTERNDEBUGHEADER)
+libcodepatterns_Patterns_la_include_HEADERS = $(PATTERNHEADER)
+libcodepatterns_Patterns_debug_la_include_HEADERS = $(PATTERNDEBUGHEADER)
 
 ## 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
 ## which are already listed elsewhere in a _HEADERS variable assignment.
-libCodePatterns_Patterns_la_SOURCES = $(PATTERNSOURCE)
-libCodePatterns_Patterns_debug_la_SOURCES = $(PATTERNDEBUGSOURCE)
+libcodepatterns_Patterns_la_SOURCES = $(PATTERNSOURCE)
+libcodepatterns_Patterns_debug_la_SOURCES = $(PATTERNDEBUGSOURCE)
 
 #Observer/all.hpp: FORCE

src/Patterns/unittests/Makefile.am

@@ -81 +81 @@
         $(top_srcdir)/src/CodePatterns/Observer/ObserverIterator.hpp
 CacheableUnitTest_LDADD = \
-        ../Observer/libCodePatterns-Observer-debug.la \
-        ../Patterns/libCodePatterns-Patterns-debug.la \
-        ../Helpers/libCodePatterns-Helpers-debug.la
+        ../Observer/libcodepatterns-Observer-debug.la \
+        ../Patterns/libcodepatterns-Patterns-debug.la \
+        ../Helpers/libcodepatterns-Helpers-debug.la
 
 CloneUnitTest_SOURCES = UnitTestMain.cpp \
@@ -95 +95 @@
         $(top_srcdir)/src/CodePatterns/Clone.hpp
 CloneUnitTest_LDADD = \
-        ../Helpers/libCodePatterns-Helpers-debug.la
+        ../Helpers/libcodepatterns-Helpers-debug.la
 
 CreatorUnitTest_SOURCES = UnitTestMain.cpp \
@@ -106 +106 @@
         $(top_srcdir)/src/CodePatterns/Creator.hpp
 CreatorUnitTest_LDADD = \
-        ../Helpers/libCodePatterns-Helpers-debug.la
+        ../Helpers/libcodepatterns-Helpers-debug.la
 
 FactoryUnitTest_SOURCES = UnitTestMain.cpp \
@@ -121 +121 @@
         $(top_srcdir)/src/CodePatterns/Factory_impl.hpp
 FactoryUnitTest_LDADD = \
-        ../Helpers/libCodePatterns-Helpers-debug.la
+        ../Helpers/libcodepatterns-Helpers-debug.la
 
 ManipulableCloneUnitTest_SOURCES = UnitTestMain.cpp \
@@ -133 +133 @@
         $(top_srcdir)/src/CodePatterns/ManipulableClone.hpp
 ManipulableCloneUnitTest_LDADD = \
-        ../Helpers/libCodePatterns-Helpers-debug.la
+        ../Helpers/libcodepatterns-Helpers-debug.la
 
 ManipulablePrototypeFactoryUnitTest_SOURCES = UnitTestMain.cpp \
@@ -149 +149 @@
         $(top_srcdir)/src/CodePatterns/ManipulablePrototypeFactory_impl.hpp
 ManipulablePrototypeFactoryUnitTest_LDADD = \
-        ../Helpers/libCodePatterns-Helpers-debug.la
+        ../Helpers/libcodepatterns-Helpers-debug.la
 
 ObservedValueUnitTest_SOURCES = UnitTestMain.cpp \
@@ -160 +160 @@
         $(top_srcdir)/src/CodePatterns/Observer/Observer.hpp
 ObservedValueUnitTest_LDADD = \
-        ../Observer/libCodePatterns-Observer-debug.la \
-        ../Patterns/libCodePatterns-Patterns-debug.la \
-        ../Helpers/libCodePatterns-Helpers-debug.la
+        ../Observer/libcodepatterns-Observer-debug.la \
+        ../Patterns/libcodepatterns-Patterns-debug.la \
+        ../Helpers/libcodepatterns-Helpers-debug.la
 
 PrototypeFactoryUnitTest_SOURCES = UnitTestMain.cpp \
@@ -178 +178 @@
         $(top_srcdir)/src/CodePatterns/PrototypeFactory_impl.hpp
 PrototypeFactoryUnitTest_LDADD = \
-        ../Helpers/libCodePatterns-Helpers-debug.la
+        ../Helpers/libcodepatterns-Helpers-debug.la
 
 RegistryUnitTest_SOURCES = UnitTestMain.cpp \
@@ -191 +191 @@
         $(top_srcdir)/src/CodePatterns/Registry_impl.hpp
 RegistryUnitTest_LDADD = \
-        ../Helpers/libCodePatterns-Helpers-debug.la
+        ../Helpers/libcodepatterns-Helpers-debug.la
 
 SingletonUnitTest_SOURCES = UnitTestMain.cpp \
@@ -198 +198 @@
 #nodist_SingletonUnitTest_SOURCES =
 SingletonUnitTest_LDADD = \
-        ../Helpers/libCodePatterns-Helpers-debug.la
+        ../Helpers/libcodepatterns-Helpers-debug.la
 
 #AUTOMAKE_OPTIONS = parallel-tests