Description: Link cppcheck and cppcheck-gui with the system tinyxml
Author: Joachim Reichel <reichel@debian.org>

Index: cppcheck-1.90/Makefile
===================================================================
--- cppcheck-1.90.orig/Makefile
+++ cppcheck-1.90/Makefile
@@ -124,7 +124,7 @@ endif
 ifeq ($(HAVE_RULES),yes)
     override CXXFLAGS += -DHAVE_RULES -DTIXML_USE_STL $(shell pcre-config --cflags)
     ifdef LIBS
-        LIBS += $(shell pcre-config --libs)
+        override LIBS += $(shell pcre-config --libs)
     else
         LIBS=$(shell pcre-config --libs)
     endif
@@ -135,15 +135,15 @@ ifndef PREFIX
 endif
 
 ifndef INCLUDE_FOR_LIB
-    INCLUDE_FOR_LIB=-Ilib -isystem externals -isystem externals/simplecpp -isystem externals/tinyxml
+    INCLUDE_FOR_LIB=-Ilib -isystem externals -isystem externals/simplecpp
 endif
 
 ifndef INCLUDE_FOR_CLI
-    INCLUDE_FOR_CLI=-Ilib -isystem externals/simplecpp -isystem externals/tinyxml
+    INCLUDE_FOR_CLI=-Ilib -isystem externals/simplecpp
 endif
 
 ifndef INCLUDE_FOR_TEST
-    INCLUDE_FOR_TEST=-Ilib -Icli -isystem externals/simplecpp -isystem externals/tinyxml
+    INCLUDE_FOR_TEST=-Ilib -Icli -isystem externals/simplecpp
 endif
 
 BIN=$(DESTDIR)$(PREFIX)/bin
@@ -207,8 +207,7 @@ LIBOBJ =      $(libcppdir)/analyzerinfo.
               $(libcppdir)/tokenlist.o \
               $(libcppdir)/valueflow.o
 
-EXTOBJ =      externals/simplecpp/simplecpp.o \
-              externals/tinyxml/tinyxml2.o
+EXTOBJ =      externals/simplecpp/simplecpp.o
 
 CLIOBJ =      cli/cmdlineparser.o \
               cli/cppcheckexecutor.o \
@@ -307,7 +306,7 @@ run-dmake: dmake
 	./dmake
 
 generate_cfg_tests: tools/generate_cfg_tests.o $(EXTOBJ)
-	g++ -isystem externals/tinyxml -o generate_cfg_tests tools/generate_cfg_tests.o $(EXTOBJ)
+	g++ -o generate_cfg_tests tools/generate_cfg_tests.o $(EXTOBJ)
 clean:
 	rm -f build/*.o lib/*.o cli/*.o test/*.o tools/*.o externals/*/*.o testrunner dmake cppcheck cppcheck.exe cppcheck.1
 
Index: cppcheck-1.90/gui/gui.pro
===================================================================
--- cppcheck-1.90.orig/gui/gui.pro
+++ cppcheck-1.90/gui/gui.pro
@@ -14,7 +14,7 @@ contains(LINKCORE, [yY][eE][sS]) {
     LIBS += -l../bin/cppcheck-core
     DEFINES += CPPCHECKLIB_IMPORT
 }
-LIBS += -L$$PWD/../externals
+LIBS += -ltinyxml2
 
 DESTDIR = .
 RCC_DIR = temp
Index: cppcheck-1.90/externals/externals.pri
===================================================================
--- cppcheck-1.90.orig/externals/externals.pri
+++ cppcheck-1.90/externals/externals.pri
@@ -1,9 +1,6 @@
 INCLUDEPATH += $${PWD} \
-               $${PWD}/simplecpp \
-               $${PWD}/tinyxml
+               $${PWD}/simplecpp
 
-HEADERS += $${PWD}/simplecpp/simplecpp.h \
-           $${PWD}/tinyxml/tinyxml2.h
+HEADERS += $${PWD}/simplecpp/simplecpp.h
 
-SOURCES += $${PWD}/simplecpp/simplecpp.cpp \
-           $${PWD}/tinyxml/tinyxml2.cpp
+SOURCES += $${PWD}/simplecpp/simplecpp.cpp
