Changeset 315a1e for src/Helpers

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/Helpers

Files:

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

src/Helpers/Makefile.am

@@ -34 +34 @@
 HELPERDEBUGHEADER =
 
-noinst_LTLIBRARIES = libCodePatterns-Helpers.la libCodePatterns-Helpers-debug.la
-libCodePatterns_Helpers_la_includedir = $(includedir)/CodePatterns/
-libCodePatterns_Helpers_debug_la_includedir = $(includedir)/CodePatterns/
-libCodePatterns_Helpers_la_LDFLAGS = \
-        $(BOOST_THREAD_LDFLAGS)
-libCodePatterns_Helpers_debug_la_LDFLAGS = \
-        $(BOOST_THREAD_LDFLAGS)
-libCodePatterns_Helpers_la_LIBADD = \
+noinst_LTLIBRARIES = libcodepatterns-Helpers.la libcodepatterns-Helpers-debug.la
+libcodepatterns_Helpers_la_includedir = $(includedir)/CodePatterns/
+libcodepatterns_Helpers_debug_la_includedir = $(includedir)/CodePatterns/
+libcodepatterns_Helpers_la_LDFLAGS = \
+        $(AM_LDFLAGS) \
+        $(BOOST_THREAD_LDFLAGS) \
         $(LIBRT) \
         $(BOOST_THREAD_LIBS)
-libCodePatterns_Helpers_debug_la_LIBADD = \
+libcodepatterns_Helpers_debug_la_LDFLAGS = \
+        $(AM_LDFLAGS) \
+        $(BOOST_THREAD_LDFLAGS) \
         $(LIBRT) \
         $(BOOST_THREAD_LIBS)
 
-libCodePatterns_Helpers_la_CPPFLAGS = -DNDEBUG -DNO_MEMDEBUG $(AM_CPPFLAGS)
-libCodePatterns_Helpers_debug_la_CPPFLAGS = -DMEMDEBUG -DLOG_HELPER $(AM_CPPFLAGS)
+libcodepatterns_Helpers_la_CPPFLAGS = -DNDEBUG -DNO_MEMDEBUG $(AM_CPPFLAGS)
+libcodepatterns_Helpers_debug_la_CPPFLAGS = -DMEMDEBUG -DLOG_HELPER $(AM_CPPFLAGS)
 
-libCodePatterns_Helpers_la_include_HEADERS = $(HELPERHEADER)
-libCodePatterns_Helpers_debug_la_include_HEADERS = $(HELPERDEBUGHEADER)
+libcodepatterns_Helpers_la_include_HEADERS = $(HELPERHEADER)
+libcodepatterns_Helpers_debug_la_include_HEADERS = $(HELPERDEBUGHEADER)
 
 ## 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
 ## which are already listed elsewhere in a _HEADERS variable assignment.
-libCodePatterns_Helpers_la_SOURCES = $(HELPERSOURCE)
-libCodePatterns_Helpers_debug_la_SOURCES = $(HELPERDEBUGSOURCE)
+libcodepatterns_Helpers_la_SOURCES = $(HELPERSOURCE)
+libcodepatterns_Helpers_debug_la_SOURCES = $(HELPERDEBUGSOURCE)

src/Helpers/unittests/Makefile.am

@@ -34 +34 @@
 #nodist_AssertUnitTest_SOURCES =
 AssertUnitTest_LDADD = \
-        ../Helpers/libCodePatterns-Helpers-debug.la
+        ../Helpers/libcodepatterns-Helpers-debug.la
         
 ChronosUnitTest_SOURCES = UnitTestMain.cpp \
@@ -46 +46 @@
         $(top_srcdir)/src/CodePatterns/Info.hpp
 ChronosUnitTest_LDADD = \
-        ../Helpers/libCodePatterns-Helpers-debug.la \
+        ../Helpers/libcodepatterns-Helpers-debug.la \
         $(LIBRT)
 
@@ -65 +65 @@
         $(top_srcdir)/src/CodePatterns/MemDebug.hpp
 InfoUnitTest_LDADD = \
-        ../Helpers/libCodePatterns-Helpers-debug.la
+        ../Helpers/libcodepatterns-Helpers-debug.la
 
 IteratorAdaptorsUnitTest_SOURCES = UnitTestMain.cpp \
@@ -73 +73 @@
         $(top_srcdir)/src/CodePatterns/IteratorAdaptors.hpp
 IteratorAdaptorsUnitTest_LDADD = \
-        ../Helpers/libCodePatterns-Helpers-debug.la
+        ../Helpers/libcodepatterns-Helpers-debug.la
 
 LogUnitTest_SOURCES = UnitTestMain.cpp \
@@ -85 +85 @@
         $(top_srcdir)/src/CodePatterns/MemDebug.hpp
 LogUnitTest_LDADD = \
-        ../Helpers/libCodePatterns-Helpers-debug.la
+        ../Helpers/libcodepatterns-Helpers-debug.la
 
 RangeUnitTest_SOURCES = UnitTestMain.cpp \
@@ -92 +92 @@
 #nodist_RangeUnitTest_SOURCES =
 RangeUnitTest_LDADD = \
-        ../Helpers/libCodePatterns-Helpers-debug.la
+        ../Helpers/libcodepatterns-Helpers-debug.la