From c1083213298faf8d6172cf15b4a5722fe1e45288 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Mon, 3 Mar 2014 12:09:21 +0100 Subject: [PATCH 1/2] dmake: when building cppcheck. do not include "externals" dir, there are no files in there (only the tinyxml dir which is already handled via -Iexternals/tinyxml). --- tools/dmake.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/dmake.cpp b/tools/dmake.cpp index bf8aefc77..06c644925 100644 --- a/tools/dmake.cpp +++ b/tools/dmake.cpp @@ -334,9 +334,9 @@ int main(int argc, char **argv) makeConditionalVariable(fout, "CXX", "g++"); makeConditionalVariable(fout, "PREFIX", "/usr"); - makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -Iexternals -Iexternals/tinyxml"); - makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -Iexternals -Iexternals/tinyxml"); - makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -Iexternals -Iexternals/tinyxml"); + makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -Iexternals/tinyxml"); + makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -Iexternals/tinyxml"); + makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -Iexternals/tinyxml"); fout << "BIN=$(DESTDIR)$(PREFIX)/bin\n\n"; fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml on Linux\n"; From ebb6dc33885624c4ab411ec6ec0143452afd2adb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Mon, 3 Mar 2014 12:32:19 +0100 Subject: [PATCH 2/2] update Makefile with dmake. --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 8be8e160a..cc4c16e82 100644 --- a/Makefile +++ b/Makefile @@ -81,15 +81,15 @@ ifndef PREFIX endif ifndef INCLUDE_FOR_LIB - INCLUDE_FOR_LIB=-Ilib -Iexternals -Iexternals/tinyxml + INCLUDE_FOR_LIB=-Ilib -Iexternals/tinyxml endif ifndef INCLUDE_FOR_CLI - INCLUDE_FOR_CLI=-Ilib -Iexternals -Iexternals/tinyxml + INCLUDE_FOR_CLI=-Ilib -Iexternals/tinyxml endif ifndef INCLUDE_FOR_TEST - INCLUDE_FOR_TEST=-Ilib -Icli -Iexternals -Iexternals/tinyxml + INCLUDE_FOR_TEST=-Ilib -Icli -Iexternals/tinyxml endif BIN=$(DESTDIR)$(PREFIX)/bin