6 files changed, 53 insertions, 262 deletions
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index 03af4bf4a0d0..2377b1df89d0 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -1,10 +1,6 @@
-AUX cppcheck-1.88-ldflags.patch 967 BLAKE2B c88cf4c199e686b6befe353c25d1507969c3c48d9f30e6a0e6bf18389f28acf4c6b62a0f6a6521da453090140ed77dd86102811b296918dde238e928ff0c8cac SHA512 62f8bd8ed415bafd57cd204d51d29de73832e2510f329e57e51d19605d4df1681cbf2c1813b88681cb3b203d093ef0ec0edf44c45b7bbdb610bde7406e400035
-AUX cppcheck-1.88-tinyxml2.patch 4689 BLAKE2B a4ad83cfa7e9edf7c52493ae78c72f730dea604be12ef8ae885c82b65fcbd5dc1a3b36c154da0c2c691a0f445b44a256f48de74f00daba7d544fd14d8237ee77 SHA512 2d8a90d2698607abfedcbeda806ad6e0589fd637c2b5b755cab2f6ba99f144ff11dce05162fa6a2b4b753f7814a3fc1cc83510bbbd5ed8811b6353ed30c27d5f
 AUX cppcheck-2.4.1-limits.patch 317 BLAKE2B a85978e5c6f5cdadcb8603719075f6982a739a4e8549f7cec1b64113889329a5bc75c321317797d8aceb6f12165c774bebcc5bd64724cbe07e78240eaecb1345 SHA512 dd56acfc19031cb380c8d0b04989f0a8aae5c9c47b9c22c3212cd0fa633455b87982ec9317fe05adf210f34c04e4edbbea0e64a751339d3dd3522705328cadcd
-DIST cppcheck-1.88.tar.gz 2364053 BLAKE2B b688974ff83019422cc5b2ec575d9838bdff4ada17d71fb3d436f07eea50429490c222659163b845667d98c0ec186b3288464827894e379fd017dd0c3fea645f SHA512 fa4ede0665546341af0ba3dae09a00b6efae09ec7838c616c580be01ff6902594d61168a059539779be0c78e1708d2bd9c8e7987dd0bb67dc8fa332a10d1de6a
-DIST cppcheck-2.2.tar.gz 3561406 BLAKE2B e436de4bec5412a18f013c8557a966c28c14edcd07fbb80eb53a897848d15f32afc180798ea1a074742f896b15d4020755c104b87dc8f82252121b58a92b92dc SHA512 d766187a69d6aa839e072e3c0ed44009621ca8492504257288ca2f49774f705a1ebcf2957f0801ac6eab2ffbdd845e9237f1213f85c6d0fcdbf16b1e7c690327
 DIST cppcheck-2.4.1.tar.gz 3761646 BLAKE2B 4c791088621f989e2529c92de38a73676fc3394e8cac72822596f7a75594283d0983693d693aa903a3ffb80bc0e1e20e71b55db5682d4d01c135ed77b2fc2e3c SHA512 8fb1ed5faa0071fc69405b7eb5b41e9f94b77d097158ea0d4f5e4da8a5087b9d1ab7bf37f8dc73d00096d3d2494aeb431af8029f0d4f1e2085f5b9b72bdc2d09
-EBUILD cppcheck-1.88.ebuild 2355 BLAKE2B 1d7c21225df4b3af7621842680af021da76f3b456d57f0ca28d00a6ef76b5be33da435839b1282fb33686de88897f2c4ac6f4a839d2e926fab04e45fa42c41f2 SHA512 7a6ab26533ae9f26abc95893460c6dd634bc9a12a871c745a0fc1ca8d2f4d1fa72d5924eda57a97d626a1015f3d38d755516c424d7b9e5cc613c9cc3e74e3070
-EBUILD cppcheck-2.2.ebuild 1701 BLAKE2B 989310dbe5d76b981327a4c6c0a581bd150c8dc30712e275b2bf1eb5869c8a97b42ce7989387a129e131f4d494880b88364f08db9dec8c5e6b20a0d8b60ec2b2 SHA512 c438b70fe8d172eeb1e9aceb300b0826dacc6fe1129d0d3328652e7a602201b479c0b57ce3fcfa3f60ad4d7ac12a9a892f62afe9f05b30b9027a28ac6f30f5af
-EBUILD cppcheck-2.4.1.ebuild 1763 BLAKE2B bab2a339284ad16718284d9678c4a4e86a1571827705ed8c96edf03d442e6adefe7b9b011e82157ae32dc8581fa743a9e8fdb022c49b6ae01632fc7fbeaf253e SHA512 afee27069cf89942a8084301ea31b1399e05725172468ade746960b01689da87f8c1913eda367d63bb66e7b6ff4b28fb7735e4f234d31e930e949d91599c3c8c
+DIST cppcheck-2.6.2.tar.gz 3880239 BLAKE2B 63abba752ed0e4bef1bf7be4eb3f1a0dfcd1bab286db41e7fd787969674f59354f1c2a0b4477bb1d0cc7ca71306bc6a3375cebade1c60416a21010f7b313d20c SHA512 f1b1b0d6d46712147984bf907519eaaef04b41f02979d371d836aa8668fbdaa0f18b503a76d809abcedf9a0e7b7666be910714ca411d289aa921d0204585f47f
+EBUILD cppcheck-2.4.1.ebuild 1789 BLAKE2B 3b2c61a7535c3684982f22d10b64c44f64c2b96f2319df386c5899f21a3efe7710f59b7ddf4cb2301cd9b36674bb11de84fd89e4319ff866fd151ddbb8e632b7 SHA512 5e19b9ab507695836ebbdbccec1b7e94704b2c3c9eb7814a60fc40698216efeb6ed35439178092cf29ed5da12289e9ffdc01c8e3455d4b224119bdc69b187994
+EBUILD cppcheck-2.6.2.ebuild 2005 BLAKE2B 2650d77fa1c3e1cdae45fa0b2bb9ed12b215c382ff92a59cc465638205ed0965f3648d28f1a841aa84945d91ad4330c5c1179dc57039ae18054ac6ad134d78d1 SHA512 ee111591fcb301230fef997797ae32a68d7a39c4bfade5f09485f44cb1a0238f464e39c696d39ef44b5198c26406d1153280f83dfaabf5e88ea7d0d8571fff4c
 MISC metadata.xml 491 BLAKE2B 614ff2cfa86224be3c758dc12d61d6bd7b6609652eee3917a97fe0ee54accee769d0c5227458e38152083d1b8f555bda2f3d23cd918eda59bd28b7c24ae07dd3 SHA512 3f4519bcce00dd2d9a05c05959db1a961d44fb899bf083600d9ba4a3af24fd9e52da4a8a6127fc1597103fe10427eeb2dcee5e227307cb564fe3fd14b33f3a07
diff --git a/dev-util/cppcheck/cppcheck-1.88.ebuild b/dev-util/cppcheck/cppcheck-1.88.ebuild
deleted file mode 100644
index 09857bcc74b6..000000000000
--- a/dev-util/cppcheck/cppcheck-1.88.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
-inherit distutils-r1 qmake-utils toolchain-funcs
-
-DESCRIPTION="Static analyzer of C/C++ code"
-HOMEPAGE="https://github.com/danmar/cppcheck"
-SRC_URI="https://github.com/danmar/cppcheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 sparc x86"
-IUSE="htmlreport pcre qt5"
-
-RDEPEND="
-	dev-libs/tinyxml2:=
-	htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
-	pcre? ( dev-libs/libpcre )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.88-tinyxml2.patch
-	"${FILESDIR}"/${PN}-1.88-ldflags.patch
-)
-
-src_prepare() {
-	default
-
-	rm -r externals/tinyxml || die
-}
-
-src_configure() {
-	tc-export CXX PKG_CONFIG
-	export LIBS="$(${PKG_CONFIG} --libs tinyxml2)"
-
-	emake dmake
-	./dmake || die
-
-	if use pcre ; then
-		sed -e '/HAVE_RULES=/s:=no:=yes:' \
-			-i Makefile || die
-	fi
-
-	if use qt5 ; then
-		pushd gui || die
-		eqmake5
-		popd || die
-	fi
-}
-
-src_compile() {
-	emake ${PN} man \
-		CFGDIR="${EROOT}/usr/share/${PN}/cfg" \
-		DB2MAN="${EROOT}/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
-
-	if use qt5 ; then
-		pushd gui || die
-		emake
-		popd || die
-	fi
-
-	if use htmlreport ; then
-		pushd htmlreport || die
-		distutils-r1_src_compile
-		popd || die
-	fi
-}
-
-src_test() {
-	# safe final version
-	mv -v ${PN}{,.final} || die
-	mv -v lib/library.o{,.final} || die
-	mv -v cli/cppcheckexecutor.o{,.final} || die
-	#trigger recompile with CFGDIR inside ${S}
-	emake check CFGDIR="${S}/cfg"
-	# restore
-	mv -v ${PN}{.final,} || die
-	mv -v lib/library.o{.final,} || die
-	mv -v cli/cppcheckexecutor.o{.final,} || die
-}
-
-src_install() {
-	# it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
-	emake install DESTDIR="${ED}"
-
-	insinto "/usr/share/${PN}/cfg"
-	doins cfg/*.cfg
-	if use qt5 ; then
-		dobin gui/${PN}-gui
-		dodoc gui/{projectfile.txt,gui.${PN}}
-	fi
-	if use htmlreport ; then
-		pushd htmlreport || die
-		distutils-r1_src_install
-		popd || die
-		find "${D}" -name "*.egg-info" -delete
-	else
-		rm "${ED}/usr/bin/cppcheck-htmlreport" || die
-	fi
-	doman ${PN}.1
-	dodoc -r tools/triage
-}
diff --git a/dev-util/cppcheck/cppcheck-2.4.1.ebuild b/dev-util/cppcheck/cppcheck-2.4.1.ebuild
index 9130c7d88401..d7892faae5db 100644
--- a/dev-util/cppcheck/cppcheck-2.4.1.ebuild
+++ b/dev-util/cppcheck/cppcheck-2.4.1.ebuild
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
-inherit distutils-r1 toolchain-funcs cmake
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 cmake
 
 DESCRIPTION="Static analyzer of C/C++ code"
 HOMEPAGE="https://github.com/danmar/cppcheck"
@@ -28,8 +29,10 @@ DEPEND="${RDEPEND}
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
 	virtual/pkgconfig
+	qt5? ( dev-qt/linguist-tools:5 )
 	z3? ( sci-mathematics/z3 )
 "
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.4.1-limits.patch
 )
@@ -39,12 +42,11 @@ src_prepare() {
 }
 
 src_configure() {
-
 	local mycmakeargs=(
 		-DHAVE_RULES="$(usex pcre)"
 		-DBUILD_GUI="$(usex qt5)"
 		-DUSE_Z3="$(usex z3)"
-		-DFILESDIR="${EROOT}/usr/share/${PN}/"
+		-DFILESDIR="${EPREFIX}/usr/share/${PN}/"
 		-DENABLE_OSS_FUZZ=OFF
 	)
 	cmake_src_configure
@@ -63,7 +65,7 @@ src_compile() {
 src_install() {
 	# it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
 	emake install DESTDIR="${ED}" \
-		FILESDIR="${EROOT}/usr/share/${PN}/"
+		FILESDIR="${EPREFIX}/usr/share/${PN}/"
 
 	insinto "/usr/share/${PN}/cfg"
 	doins cfg/*.cfg
@@ -75,7 +77,7 @@ src_install() {
 		pushd htmlreport || die
 		distutils-r1_src_install
 		popd || die
-		find "${D}" -name "*.egg-info" -delete
+		find "${D}" -name "*.egg-info" -delete || die
 	else
 		rm "${ED}/usr/bin/cppcheck-htmlreport" || die
 	fi
diff --git a/dev-util/cppcheck/cppcheck-2.2.ebuild b/dev-util/cppcheck/cppcheck-2.6.2.ebuild
index 175f33dd4bce..a934618d7ad9 100644
--- a/dev-util/cppcheck/cppcheck-2.2.ebuild
+++ b/dev-util/cppcheck/cppcheck-2.6.2.ebuild
@@ -2,20 +2,27 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
-inherit distutils-r1 toolchain-funcs cmake
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=manual
+inherit distutils-r1 cmake
 
 DESCRIPTION="Static analyzer of C/C++ code"
 HOMEPAGE="https://github.com/danmar/cppcheck"
-SRC_URI="https://github.com/danmar/cppcheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/danmar/cppcheck/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 sparc x86"
-IUSE="htmlreport pcre qt5 +z3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+IUSE="htmlreport pcre qt5 test +z3"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
-	htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
+	dev-libs/tinyxml2:=
+	htmlreport? (
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
 	pcre? ( dev-libs/libpcre )
 	qt5? (
 		dev-qt/qtcore:5
@@ -23,12 +30,17 @@ RDEPEND="
 		dev-qt/qthelp
 		dev-qt/qtprintsupport:5
 	)
+	z3? ( sci-mathematics/z3 )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
 	virtual/pkgconfig
-	z3? ( sci-mathematics/z3 )
+	qt5? ( dev-qt/linguist-tools:5 )
+	test? (
+		htmlreport? ( dev-python/unittest-or-fail[${PYTHON_USEDEP}] )
+	)
 "
 
 src_prepare() {
@@ -36,14 +48,16 @@ src_prepare() {
 }
 
 src_configure() {
-
 	local mycmakeargs=(
 		-DHAVE_RULES="$(usex pcre)"
 		-DBUILD_GUI="$(usex qt5)"
 		-DUSE_Z3="$(usex z3)"
-		-DFILESDIR="${EROOT}/usr/share/${PN}/"
+		-DFILESDIR="${EPREFIX}/usr/share/${PN}/"
 		-DENABLE_OSS_FUZZ=OFF
+		-DUSE_BUNDLED_TINYXML2=OFF
+		-DBUILD_TESTS="$(usex test)"
 	)
+
 	cmake_src_configure
 }
 
@@ -57,24 +71,36 @@ src_compile() {
 	fi
 }
 
+src_test() {
+	cmake_src_test
+
+	# TODO: Needs some hackery to find the right binary
+	#if use htmlreport ; then
+	#	distutils-r1_src_test
+	#fi
+}
+
+python_test() {
+	pushd htmlreport || die
+	eunittest
+	popd || die
+}
+
 src_install() {
-	# it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
-	emake install DESTDIR="${ED}" \
-		FILESDIR="${EROOT}/usr/share/${PN}/"
+	cmake_src_install
 
 	insinto "/usr/share/${PN}/cfg"
 	doins cfg/*.cfg
+
 	if use qt5 ; then
 		dobin "${WORKDIR}/${P}_build/bin/${PN}-gui"
 		dodoc gui/{projectfile.txt,gui.${PN}}
 	fi
+
 	if use htmlreport ; then
 		pushd htmlreport || die
 		distutils-r1_src_install
 		popd || die
-		find "${D}" -name "*.egg-info" -delete
-	else
-		rm "${ED}/usr/bin/cppcheck-htmlreport" || die
 	fi
 
 	dodoc -r tools/triage
diff --git a/dev-util/cppcheck/files/cppcheck-1.88-ldflags.patch b/dev-util/cppcheck/files/cppcheck-1.88-ldflags.patch
deleted file mode 100644
index ef7e01212a3f..000000000000
--- a/dev-util/cppcheck/files/cppcheck-1.88-ldflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/tools/dmake.cpp b/tools/dmake.cpp
-index c3afd26..5c3a0a6 100644
---- a/tools/dmake.cpp
-+++ b/tools/dmake.cpp
-@@ -370,10 +370,10 @@ int main(int argc, char **argv)
-     fout << ".PHONY: run-dmake tags\n\n";
-     fout << "\n###### Targets\n\n";
-     fout << "cppcheck: $(LIBOBJ) $(CLIOBJ) $(EXTOBJ)\n";
--    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n";
-+    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(RDYNAMIC) $(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\n";
--    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n";
-+    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(RDYNAMIC) $(LIBS)\n\n";
-     fout << "test:\tall\n";
-     fout << "\t./testrunner\n\n";
-     fout << "check:\tall\n";
diff --git a/dev-util/cppcheck/files/cppcheck-1.88-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-1.88-tinyxml2.patch
deleted file mode 100644
index 0ad79ebf4d0d..000000000000
--- a/dev-util/cppcheck/files/cppcheck-1.88-tinyxml2.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff --git a/gui/gui.pro b/gui/gui.pro
-index 0cbaebf..cb381dd 100644
---- a/gui/gui.pro
-+++ b/gui/gui.pro
-@@ -15,6 +15,7 @@ contains(LINKCORE, [yY][eE][sS]) {
-     DEFINES += CPPCHECKLIB_IMPORT
- }
- LIBS += -L$$PWD/../externals
-+LIBS += $(shell $(PKG_CONFIG) --libs tinyxml2)
- 
- DESTDIR = .
- RCC_DIR = temp
-diff --git a/tools/dmake.cpp b/tools/dmake.cpp
-index 298cb98..c3afd26 100644
---- a/tools/dmake.cpp
-+++ b/tools/dmake.cpp
-@@ -122,7 +122,6 @@ int main(int argc, char **argv)
- 
-     std::vector<std::string> extfiles;
-     extfiles.push_back("externals/simplecpp/simplecpp.cpp");
--    extfiles.push_back("externals/tinyxml/tinyxml2.cpp");
- 
-     std::vector<std::string> clifiles;
-     getCppFiles(clifiles, "cli/", false);
-@@ -171,7 +170,6 @@ int main(int argc, char **argv)
-         std::ofstream fout1("test/testfiles.pri");
-         if (fout1.is_open()) {
-             fout1 << "# no manual edits - this file is autogenerated by dmake\n\n";
--            fout1 << "INCLUDEPATH += ../externals/tinyxml\n";
-             fout1 << "\n\nSOURCES += ";
-             for (unsigned int i = 0; i < testfiles.size(); ++i) {
-                 const std::string filename(testfiles[i].substr(5));
-@@ -341,9 +339,9 @@ int main(int argc, char **argv)
-          << "endif\n\n";
- 
-     makeConditionalVariable(fout, "PREFIX", "/usr");
--    makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -isystem externals -isystem externals/simplecpp -isystem externals/tinyxml");
--    makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -isystem externals/simplecpp -isystem externals/tinyxml");
--    makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -isystem externals/simplecpp -isystem externals/tinyxml");
-+    makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -isystem externals -isystem externals/simplecpp");
-+    makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -isystem externals/simplecpp");
-+    makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -isystem externals/simplecpp");
- 
-     fout << "BIN=$(DESTDIR)$(PREFIX)/bin\n\n";
-     fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml on Linux\n";
-diff --git a/oss-fuzz/Makefile b/oss-fuzz/Makefile
-index 81cf654..26f9da9 100644
---- a/oss-fuzz/Makefile
-+++ b/oss-fuzz/Makefile
-@@ -6,8 +6,8 @@
- # make CXX=clang++-6.0 CXXFLAGS="-fsanitize=address" fuzz-client
- 
- CPPCHECK_DIR=..
--INCLUDE_DIR=-I ${CPPCHECK_DIR}/lib -I ${CPPCHECK_DIR}/externals/simplecpp -I ${CPPCHECK_DIR}/externals/tinyxml -I ${CPPCHECK_DIR}/externals
--SRC_FILES=main.cpp type2.cpp ${CPPCHECK_DIR}/externals/simplecpp/simplecpp.cpp ${CPPCHECK_DIR}/externals/tinyxml/tinyxml2.cpp ${CPPCHECK_DIR}/lib/*.cpp
-+INCLUDE_DIR=-I ${CPPCHECK_DIR}/lib -I ${CPPCHECK_DIR}/externals/simplecpp -I ${CPPCHECK_DIR}/externals
-+SRC_FILES=main.cpp type2.cpp ${CPPCHECK_DIR}/externals/simplecpp/simplecpp.cpp ${CPPCHECK_DIR}/lib/*.cpp
- 
- all:	oss-fuzz-client	translate
- 
-diff --git a/Makefile b/Makefile
-index 372647e..9d65717 100644
---- a/Makefile
-+++ b/Makefile
-@@ -179,8 +179,7 @@ LIBOBJ =      $(libcppdir)/analyzerinfo.o \
-               $(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 \
-@@ -689,9 +688,6 @@ test/testvarid.o: test/testvarid.cpp lib/platform.h lib/config.h lib/settings.h
- externals/simplecpp/simplecpp.o: externals/simplecpp/simplecpp.cpp externals/simplecpp/simplecpp.h
- 	$(CXX)  $(CPPFLAGS) $(CFG) $(CXXFLAGS) -w $(UNDEF_STRICT_ANSI) -c -o externals/simplecpp/simplecpp.o externals/simplecpp/simplecpp.cpp
- 
--externals/tinyxml/tinyxml2.o: externals/tinyxml/tinyxml2.cpp externals/tinyxml/tinyxml2.h
--	$(CXX)  $(CPPFLAGS) $(CFG) $(CXXFLAGS) -w $(UNDEF_STRICT_ANSI) -c -o externals/tinyxml/tinyxml2.o externals/tinyxml/tinyxml2.cpp
--
- tools/clang-ast.o: tools/clang-ast.cpp
- 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CFG) $(CXXFLAGS) $(UNDEF_STRICT_ANSI) -c -o tools/clang-ast.o tools/clang-ast.cpp
- 
-diff --git a/externals/externals.pri b/externals/externals.pri
-index 7f0be8d..b1e94e0 100644
---- a/externals/externals.pri
-+++ b/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