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

Index: cppcheck-1.88/Makefile
===================================================================
--- cppcheck-1.88.orig/Makefile
+++ cppcheck-1.88/Makefile
@@ -99,7 +99,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
@@ -179,8 +179,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 \
Index: cppcheck-1.88/gui/gui.pro
===================================================================
--- cppcheck-1.88.orig/gui/gui.pro
+++ cppcheck-1.88/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.88/externals/externals.pri
===================================================================
--- cppcheck-1.88.orig/externals/externals.pri
+++ cppcheck-1.88/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
