From 3930f2d6bc607ed6afd1511d65ef03e37ecca904 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= <matthias.krueger@famsik.de>
Date: Wed, 24 May 2017 00:24:06 +0200
Subject: [PATCH] try to fix "make" target (was broken due to missing
 comment-char).

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

diff --git a/Makefile b/Makefile
index 8f76e247a..2e25f27c2 100644
--- a/Makefile
+++ b/Makefile
@@ -125,14 +125,6 @@ DB2MAN?=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
 XP=xsltproc -''-nonet -''-param man.charmap.use.subset "0"
 MAN_SOURCE=man/cppcheck.1.xml
 
-Validation of library files:
-ConfigFiles := $(wildcard cfg/*.cfg)
-ConfigFilesCHECKED := $(patsubst %.cfg,%.checked,$(ConfigFiles))
-.PHONY: validateCFG
-%.checked:%.cfg
-	xmllint --noout --relaxng cfg/cppcheck-cfg.rng $<
-validateCFG: ${ConfigFilesCHECKED}
-
 
 ###### Object Files
 
@@ -305,6 +297,14 @@ ifdef CFGDIR
 	install -m 644 cfg/* ${DESTDIR}${CFGDIR}
 endif
 
+# Validation of library files:
+ConfigFiles := $(wildcard cfg/*.cfg)
+ConfigFilesCHECKED := $(patsubst %.cfg,%.checked,$(ConfigFiles))
+.PHONY: validateCFG
+%.checked:%.cfg
+	xmllint --noout --relaxng cfg/cppcheck-cfg.rng $<
+validateCFG: ${ConfigFilesCHECKED}
+
 
 ###### Build
 
diff --git a/tools/dmake.cpp b/tools/dmake.cpp
index 737304657..84dbe9868 100644
--- a/tools/dmake.cpp
+++ b/tools/dmake.cpp
@@ -346,15 +346,6 @@ int main(int argc, char **argv)
     fout << "XP=xsltproc -''-nonet -''-param man.charmap.use.subset \"0\"\n";
     fout << "MAN_SOURCE=man/cppcheck.1.xml\n\n";
 
-	fout << "Validation of library files:\n";
-    fout << "ConfigFiles := $(wildcard cfg/*.cfg)\n";
-    fout << "ConfigFilesCHECKED := $(patsubst %.cfg,%.checked,$(ConfigFiles))\n";
-    fout << ".PHONY: validateCFG\n";
-    fout << "%.checked:%.cfg\n";
-    fout << "\txmllint --noout --relaxng cfg/cppcheck-cfg.rng $<\n";
-    fout << "validateCFG: ${ConfigFilesCHECKED}\n\n";
-
-
     fout << "\n###### Object Files\n\n";
     fout << "LIBOBJ =      " << objfile(libfiles[0]);
     for (size_t i = 1; i < libfiles.size(); ++i)
@@ -409,6 +400,14 @@ int main(int argc, char **argv)
     fout << "\tinstall -d ${DESTDIR}${CFGDIR}\n";
     fout << "\tinstall -m 644 cfg/* ${DESTDIR}${CFGDIR}\n";
     fout << "endif\n\n";
+    fout << "# Validation of library files:\n";
+    fout << "ConfigFiles := $(wildcard cfg/*.cfg)\n";
+    fout << "ConfigFilesCHECKED := $(patsubst %.cfg,%.checked,$(ConfigFiles))\n";
+    fout << ".PHONY: validateCFG\n";
+    fout << "%.checked:%.cfg\n";
+    fout << "\txmllint --noout --relaxng cfg/cppcheck-cfg.rng $<\n";
+    fout << "validateCFG: ${ConfigFilesCHECKED}\n\n";
+
 
     fout << "\n###### Build\n\n";