Applied patch #2807259: lib -ldl... should be in LDADD instead of LDFLAGS

7 files changed, 29 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index 254ff2c..c45ec56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-11-23 Baptiste Lepilleur <blep@users.sourceforge.net>
+
+    * src/DllPlugInTester/Makefile.am:
+    * examples/cppunittest/Makefile.am:
+    * examples/money/Makefile.am:
+    * examples/simple/Makefile.am:
+    * examples/hierarchy/Makefile.am: Applied patch #2807259
+      contributed by Jan Echternach. LIBADD_DL contains a list of libraries
+      like "-ldl". Thus, it should be in LDADD instead of LDFLAGS in case
+      one of the libraries depends on a path set in LDFLAGS.
+
 2008-02-21  Steve M. Robbins  <smr@sumost.ca>
 	* examples/cppunittest/OrthodoxTest.h:
 	* examples/cppunittest/XMLOutputterTest.cpp:
diff --git a/NEWS b/NEWS
index 9548315..87b3f7d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+Applied patch #2807259
+      contributed by Jan Echternach. LIBADD_DL contains a list of libraries
+      like "-ldl". Thus, it should be in LDADD instead of LDFLAGS in case
+      one of the libraries depends on a path set in LDFLAGS.
+      
+
   New in CppUnit 1.12.1:
   ----------------------
 
diff --git a/examples/cppunittest/Makefile.am b/examples/cppunittest/Makefile.am
index 3060a6c..4b93173 100644
--- a/examples/cppunittest/Makefile.am
+++ b/examples/cppunittest/Makefile.am
@@ -76,8 +76,5 @@ cppunittestmain_SOURCES = \
 	XmlUniformiserTest.cpp
 
 cppunittestmain_LDADD= \
-  $(top_builddir)/src/cppunit/libcppunit.la 
-
-cppunittestmain_LDFLAGS = $(LIBADD_DL)
-
-
+  $(top_builddir)/src/cppunit/libcppunit.la \
+  $(LIBADD_DL)
diff --git a/examples/hierarchy/Makefile.am b/examples/hierarchy/Makefile.am
index 03d4a5b..821efda 100644
--- a/examples/hierarchy/Makefile.am
+++ b/examples/hierarchy/Makefile.am
@@ -16,6 +16,5 @@ hierarchy_SOURCES= BoardGame.cpp \
                    ChessTest.h
 
 hierarchy_LDADD= \
-  $(top_builddir)/src/cppunit/libcppunit.la 
-
-hierarchy_LDFLAGS = $(LIBADD_DL)
+  $(top_builddir)/src/cppunit/libcppunit.la \
+  $(LIBADD_DL)
diff --git a/examples/money/Makefile.am b/examples/money/Makefile.am
index 414e65b..86bb680 100644
--- a/examples/money/Makefile.am
+++ b/examples/money/Makefile.am
@@ -15,7 +15,5 @@ check_PROGRAMS = $(TESTS)
 MoneyApp_SOURCES = Money.h MoneyTest.h MoneyTest.cpp MoneyApp.cpp StdAfx.h
 MoneyApp_CXXFLAGS = $(CPPUNIT_CFLAGS)
 MoneyApp_LDADD= \
-  $(top_builddir)/src/cppunit/libcppunit.la 
-
-MoneyApp_LDFLAGS = $(CPPUNIT_LIBS) $(LIBADD_DL)
-
+  $(top_builddir)/src/cppunit/libcppunit.la \
+  $(CPPUNIT_LIBS) $(LIBADD_DL)
diff --git a/examples/simple/Makefile.am b/examples/simple/Makefile.am
index 8bf4eed..79ea56d 100644
--- a/examples/simple/Makefile.am
+++ b/examples/simple/Makefile.am
@@ -7,6 +7,5 @@ noinst_PROGRAMS=simple
 simple_SOURCES= ExampleTestCase.cpp Main.cpp  ExampleTestCase.h
 
 simple_LDADD= \
-  $(top_builddir)/src/cppunit/libcppunit.la 
-
-simple_LDFLAGS = $(LIBADD_DL)
+  $(top_builddir)/src/cppunit/libcppunit.la \
+  $(LIBADD_DL)
diff --git a/src/DllPlugInTester/Makefile.am b/src/DllPlugInTester/Makefile.am
index b4f7f6f..0f7c438 100644
--- a/src/DllPlugInTester/Makefile.am
+++ b/src/DllPlugInTester/Makefile.am
@@ -12,9 +12,8 @@ DllPlugInTester_SOURCES= DllPlugInTester.cpp \
 	CommandLineParser.cpp
 
 DllPlugInTester_LDADD= \
-  $(top_builddir)/src/cppunit/libcppunit.la
-
-DllPlugInTester_LDFLAGS = $(LIBADD_DL)
+  $(top_builddir)/src/cppunit/libcppunit.la \
+  $(LIBADD_DL)
 
 DllPlugInTesterTest_SOURCES = DllPlugInTesterTest.cpp \
 	CommandLineParser.cpp \
@@ -23,6 +22,5 @@ DllPlugInTesterTest_SOURCES = DllPlugInTesterTest.cpp \
 	CommandLineParserTest.h
 
 DllPlugInTesterTest_LDADD= \
-  $(top_builddir)/src/cppunit/libcppunit.la
-
-DllPlugInTesterTest_LDFLAGS = $(LIBADD_DL)
+  $(top_builddir)/src/cppunit/libcppunit.la \
+  $(LIBADD_DL)