From e49763b14f2b4a5e9ada8a4e55e9e6d655815464 Mon Sep 17 00:00:00 2001
From: Felix Geyer <debfx@fobos.de>
Date: Sun, 19 Jun 2011 20:56:12 +0300
Subject: [PATCH] Ticket: #2823 (cppcheck fails to build with system tinymxl
 and -Wl,--as-needed)

---
 Makefile        | 10 +++++-----
 tools/dmake.cpp | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 778399960..e46c6179a 100644
--- a/Makefile
+++ b/Makefile
@@ -9,10 +9,10 @@ endif
 
 ifeq ($(HAVE_RULES),yes)
     CXXFLAGS += -DHAVE_RULES
-    ifdef LDFLAGS
-        LDFLAGS += -lpcre
+    ifdef LIBS
+        LIBS += -lpcre
     else
-        LDFLAGS=-lpcre
+        LIBS=-lpcre
     endif
 endif
 
@@ -128,12 +128,12 @@ EXTOBJ += $(TINYXML)
 ###### Targets
 
 cppcheck: $(LIBOBJ) $(CLIOBJ) $(EXTOBJ)
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o cppcheck $(CLIOBJ) $(LIBOBJ) $(EXTOBJ) $(LDFLAGS)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o cppcheck $(CLIOBJ) $(LIBOBJ) $(EXTOBJ) $(LIBS)
 
 all:	cppcheck testrunner
 
 testrunner: $(TESTOBJ) $(LIBOBJ) $(EXTOBJ) cli/threadexecutor.o cli/cmdlineparser.o cli/cppcheckexecutor.o cli/filelister.o cli/pathmatch.o
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o testrunner $(TESTOBJ) $(LIBOBJ) $(EXTOBJ) cli/threadexecutor.o cli/cppcheckexecutor.o cli/cmdlineparser.o cli/filelister.o cli/pathmatch.o $(LDFLAGS)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o testrunner $(TESTOBJ) $(LIBOBJ) cli/threadexecutor.o cli/cppcheckexecutor.o cli/cmdlineparser.o cli/filelister.o cli/pathmatch.o $(EXTOBJ) $(LIBS)
 
 test:	all
 	./testrunner
diff --git a/tools/dmake.cpp b/tools/dmake.cpp
index 472741d3b..1225e6602 100644
--- a/tools/dmake.cpp
+++ b/tools/dmake.cpp
@@ -249,10 +249,10 @@ int main(int argc, char **argv)
 
     fout << "ifeq ($(HAVE_RULES),yes)\n"
          << "    CXXFLAGS += -DHAVE_RULES\n"
-         << "    ifdef LDFLAGS\n"
-         << "        LDFLAGS += -lpcre\n"
+         << "    ifdef LIBS\n"
+         << "        LIBS += -lpcre\n"
          << "    else\n"
-         << "        LDFLAGS=-lpcre\n"
+         << "        LIBS=-lpcre\n"
          << "    endif\n"
          << "endif\n\n";
 
@@ -286,10 +286,10 @@ int main(int argc, char **argv)
 
     fout << "\n###### Targets\n\n";
     fout << "cppcheck: $(LIBOBJ) $(CLIOBJ) $(EXTOBJ)\n";
-    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o cppcheck $(CLIOBJ) $(LIBOBJ) $(EXTOBJ) $(LDFLAGS)\n\n";
+    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o cppcheck $(CLIOBJ) $(LIBOBJ) $(EXTOBJ) $(LIBS)\n\n";
     fout << "all:\tcppcheck testrunner\n\n";
     fout << "testrunner: $(TESTOBJ) $(LIBOBJ) $(EXTOBJ) cli/threadexecutor.o cli/cmdlineparser.o cli/cppcheckexecutor.o cli/filelister.o cli/pathmatch.o\n";
-    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o testrunner $(TESTOBJ) $(LIBOBJ) $(EXTOBJ) cli/threadexecutor.o cli/cppcheckexecutor.o cli/cmdlineparser.o cli/filelister.o cli/pathmatch.o $(LDFLAGS)\n\n";
+    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o testrunner $(TESTOBJ) $(LIBOBJ) cli/threadexecutor.o cli/cppcheckexecutor.o cli/cmdlineparser.o cli/filelister.o cli/pathmatch.o $(EXTOBJ) $(LIBS)\n\n";
     fout << "test:\tall\n";
     fout << "\t./testrunner\n\n";
     fout << "check:\tall\n";