From c7344c22ac700dacf55a8dc729111dd7781c5fed Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Sun, 3 Jun 2012 19:44:15 +0000
Subject: [PATCH] Switch StaticAnalysisTest build test to use the new build
 system CPPCHECK module. Update additional build tests to all include the core
 build system module.

---
 BuildTests/BoardDriverTest/makefile    |  6 ++++-
 BuildTests/BootloaderTest/makefile     |  6 ++++-
 BuildTests/ModuleTest/makefile         |  6 ++++-
 BuildTests/SingleUSBModeTest/makefile  |  6 ++++-
 BuildTests/StaticAnalysisTest/makefile | 37 +++++++++-----------------
 5 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/BuildTests/BoardDriverTest/makefile b/BuildTests/BoardDriverTest/makefile
index 1d1be8687c..252b3f880c 100644
--- a/BuildTests/BoardDriverTest/makefile
+++ b/BuildTests/BoardDriverTest/makefile
@@ -59,4 +59,8 @@ clean:
 	$(MAKE) -s -f makefile.test clean ARCH=UC3
 
 %:
-	
\ No newline at end of file
+
+.PHONY: all begin end makeboardlist testboards clean
+
+# Include LUFA build script makefiles
+include $(LUFA_ROOT_PATH)/LUFA/Build/lufa.core.in
diff --git a/BuildTests/BootloaderTest/makefile b/BuildTests/BootloaderTest/makefile
index 08b7590b3f..635c5c6900 100644
--- a/BuildTests/BootloaderTest/makefile
+++ b/BuildTests/BootloaderTest/makefile
@@ -54,4 +54,8 @@ clean:
 	rm -f BuildMakefile
 
 %:
-	
\ No newline at end of file
+
+.PHONY: all begin end testbootloaders clean
+
+# Include LUFA build script makefiles
+include $(LUFA_ROOT_PATH)/LUFA/Build/lufa.core.in
diff --git a/BuildTests/ModuleTest/makefile b/BuildTests/ModuleTest/makefile
index 170c930142..6cdd575b08 100644
--- a/BuildTests/ModuleTest/makefile
+++ b/BuildTests/ModuleTest/makefile
@@ -51,4 +51,8 @@ clean:
 	$(MAKE) -s -f makefile.test clean ARCH=UC3
 
 %:
-	
\ No newline at end of file
+
+.PHONY: all arch_avr8 arch_xmega arch_uc3 begin end
+
+# Include LUFA build script makefiles
+include $(LUFA_ROOT_PATH)/LUFA/Build/lufa.core.in
diff --git a/BuildTests/SingleUSBModeTest/makefile b/BuildTests/SingleUSBModeTest/makefile
index 93027d9805..98e2d25f32 100644
--- a/BuildTests/SingleUSBModeTest/makefile
+++ b/BuildTests/SingleUSBModeTest/makefile
@@ -37,4 +37,8 @@ clean:
 	$(MAKE) -s -f makefile.test clean ARCH=UC3
 
 %:
-	
\ No newline at end of file
+
+.PHONY: begin end compile clean
+
+# Include LUFA build script makefiles
+include $(LUFA_ROOT_PATH)/LUFA/Build/lufa.core.in
diff --git a/BuildTests/StaticAnalysisTest/makefile b/BuildTests/StaticAnalysisTest/makefile
index 1578412f9e..6f138af892 100644
--- a/BuildTests/StaticAnalysisTest/makefile
+++ b/BuildTests/StaticAnalysisTest/makefile
@@ -8,30 +8,16 @@
 
 # Static anlysis of the entire LUFA source tree, using the free cross-platform "cppcheck" tool.
 
-# Path to the root of the LUFA tree to scan
-LUFA_ROOT_PATH    = ../..
+LUFA_ROOT_PATH = ../..
 
-# Filenames or directories (including fragments) to exclude from the analysis
-EXCLUDE_LIST      = FATFs/            \
+CPPCHECK_EXCLUDES = FATFs/            \
                     PetiteFATFs/      \
                     uip/
+CPPCHECK_INCLUDES = $(LUFA_ROOT_PATH)/LUFA/CodeTemplates/   \
+                    $(LUFA_ROOT_PATH)/Projects/AVRISP-MKII/
+CPPCHECK_PATH     = $(LUFA_ROOT_PATH)
 
-# Output message template for found warnings and errors
-MESSAGE_TEMPLATE  = "{file}:{line}: {severity} ({id}): {message}"
-
-# Checks to suppress so that generated warnings are discarded
-SUPPRESS_WARNINGS = variableScope     \
-                    missingInclude
-
-# Extra paths to search for include files
-INCLUDE_PATHS     = $(LUFA_ROOT_PATH)/LUFA/CodeTemplates/      \
-					$(LUFA_ROOT_PATH)/Projects/AVRISP-MKII/
-
-# Configuration options to pass to cppcheck
-CPPCHECK_OPTIONS  = --template=$(MESSAGE_TEMPLATE) $(INCLUDE_PATHS:%=-I%) $(EXCLUDE_LIST:%=-i%) --inline-suppr --force --error-exitcode=1 --std=c99
-
-
-all: begin staticcheck end
+all: begin cppcheck-config cppcheck end
 
 begin:
 	@echo Executing build test "StaticAnalysisTest".
@@ -41,9 +27,10 @@ end:
 	@echo Build test "StaticAnalysisTest" complete.
 	@echo
 
-staticcheck:
-	cppcheck --quiet $(CPPCHECK_OPTIONS) --check-config $(LUFA_ROOT_PATH)
-	cppcheck --quiet $(CPPCHECK_OPTIONS) --enable=all $(SUPPRESS_WARNINGS:%=--suppress=%) $(LUFA_ROOT_PATH)
-
 %:
-	
\ No newline at end of file
+
+.PHONY: all begin end
+
+# Include LUFA build script makefiles
+include $(LUFA_ROOT_PATH)/LUFA/Build/lufa.core.in
+include $(LUFA_ROOT_PATH)/LUFA/Build/lufa.cppcheck.in
\ No newline at end of file