From 60a2147a511e5ed9719d43d2570ba66335745de4 Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Sun, 3 Jun 2012 20:06:21 +0000
Subject: [PATCH] Correct BuildTest makefiles to use LUFA_PATH rather than
LUFA_ROOT_PATH.
---
BuildTests/BoardDriverTest/makefile | 8 ++++----
BuildTests/BootloaderTest/makefile | 8 ++++----
BuildTests/ModuleTest/makefile | 4 +++-
BuildTests/SingleUSBModeTest/makefile | 5 ++++-
BuildTests/StaticAnalysisTest/makefile | 13 +++++++------
5 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/BuildTests/BoardDriverTest/makefile b/BuildTests/BoardDriverTest/makefile
index 252b3f880..54afa5755 100644
--- a/BuildTests/BoardDriverTest/makefile
+++ b/BuildTests/BoardDriverTest/makefile
@@ -11,8 +11,8 @@
# possible board targets using their respective
# compiler.
-# Path to the root of the LUFA tree to scan
-LUFA_ROOT_PATH = ../..
+# Path to the LUFA library core
+LUFA_PATH = ../../LUFA/
all: begin makeboardlist testboards clean end
@@ -26,7 +26,7 @@ end:
@echo
makeboardlist:
- @grep "BOARD_" $(LUFA_ROOT_PATH)/LUFA/Common/BoardTypes.h | cut -d'#' -f2 | cut -d' ' -f2 | grep "BOARD_" > BoardList.txt
+ @grep "BOARD_" $(patsubst %/,%,$(LUFA_PATH))/Common/BoardTypes.h | cut -d'#' -f2 | cut -d' ' -f2 | grep "BOARD_" > BoardList.txt
testboards:
@echo "buildtest:" > BuildMakefile
@@ -63,4 +63,4 @@ clean:
.PHONY: all begin end makeboardlist testboards clean
# Include LUFA build script makefiles
-include $(LUFA_ROOT_PATH)/LUFA/Build/lufa.core.in
+include $(LUFA_PATH)/Build/lufa.core.in
diff --git a/BuildTests/BootloaderTest/makefile b/BuildTests/BootloaderTest/makefile
index 635c5c690..bc59bc46e 100644
--- a/BuildTests/BootloaderTest/makefile
+++ b/BuildTests/BootloaderTest/makefile
@@ -10,8 +10,8 @@
# test attempts to build all the bootloaders
# with all supported device configurations.
-# Path to the root of the LUFA tree to scan
-LUFA_ROOT_PATH = ../..
+# Path to the LUFA library core
+LUFA_PATH = ../../LUFA/
all: begin testbootloaders clean end
@@ -44,7 +44,7 @@ testbootloaders:
printf "Found bootloader configuration for bootloader '%s' (FLASH: %3s KB | BOOT: %3s KB | MCU: %12s / %4s)\n" $$build_bootloader $$build_flashsize $$build_bootsize $$build_mcu $$build_arch; \
\
printf "\t@echo Building bootloader %s - %s - FLASH: %s KB, BOOT: %s KB\n" $$build_bootloader $$build_mcu $$build_flashsize $$build_bootsize >> BuildMakefile; \
- printf "\t$(MAKE) -s -C $(LUFA_ROOT_PATH)/Bootloaders/%s/ clean elf ARCH=%s MCU=%s BOARD=%s FLASH_SIZE_KB=%s BOOT_SECTION_SIZE_KB=%s\n\n" $$build_bootloader $$build_arch $$build_mcu $$build_board $$build_flashsize $$build_bootsize >> BuildMakefile; \
+ printf "\t$(MAKE) -s -C $(patsubst %/,%,$(LUFA_PATH))/../Bootloaders/%s/ clean elf ARCH=%s MCU=%s BOARD=%s FLASH_SIZE_KB=%s BOOT_SECTION_SIZE_KB=%s\n\n" $$build_bootloader $$build_arch $$build_mcu $$build_board $$build_flashsize $$build_bootsize >> BuildMakefile; \
fi; \
done < BootloaderDeviceMap.cfg
@@ -58,4 +58,4 @@ clean:
.PHONY: all begin end testbootloaders clean
# Include LUFA build script makefiles
-include $(LUFA_ROOT_PATH)/LUFA/Build/lufa.core.in
+include $(LUFA_PATH)/Build/lufa.core.in
diff --git a/BuildTests/ModuleTest/makefile b/BuildTests/ModuleTest/makefile
index 6cdd575b0..a756c309c 100644
--- a/BuildTests/ModuleTest/makefile
+++ b/BuildTests/ModuleTest/makefile
@@ -12,6 +12,8 @@
# all module headers in a simple C and C++
# application.
+# Path to the LUFA library core
+LUFA_PATH = ../../LUFA/
# List of device families per architecture, one device per architecture sub-family
AVR8_FAMILIES = at90usb1287 at90usb1286 atmega16u4 atmega16u2 at90usb162
@@ -55,4 +57,4 @@ clean:
.PHONY: all arch_avr8 arch_xmega arch_uc3 begin end
# Include LUFA build script makefiles
-include $(LUFA_ROOT_PATH)/LUFA/Build/lufa.core.in
+include $(LUFA_PATH)/Build/lufa.core.in
diff --git a/BuildTests/SingleUSBModeTest/makefile b/BuildTests/SingleUSBModeTest/makefile
index 98e2d25f3..096d4b3d1 100644
--- a/BuildTests/SingleUSBModeTest/makefile
+++ b/BuildTests/SingleUSBModeTest/makefile
@@ -12,6 +12,9 @@
# all module headers in a simple C and C++
# application.
+# Path to the LUFA library core
+LUFA_PATH = ../../LUFA/
+
all: begin compile clean end
begin:
@@ -41,4 +44,4 @@ clean:
.PHONY: begin end compile clean
# Include LUFA build script makefiles
-include $(LUFA_ROOT_PATH)/LUFA/Build/lufa.core.in
+include $(LUFA_PATH)/Build/lufa.core.in
diff --git a/BuildTests/StaticAnalysisTest/makefile b/BuildTests/StaticAnalysisTest/makefile
index 6f138af89..aecb67792 100644
--- a/BuildTests/StaticAnalysisTest/makefile
+++ b/BuildTests/StaticAnalysisTest/makefile
@@ -8,14 +8,15 @@
# Static anlysis of the entire LUFA source tree, using the free cross-platform "cppcheck" tool.
-LUFA_ROOT_PATH = ../..
+# Path to the LUFA library core
+LUFA_PATH = ../../LUFA/
CPPCHECK_EXCLUDES = FATFs/ \
PetiteFATFs/ \
uip/
-CPPCHECK_INCLUDES = $(LUFA_ROOT_PATH)/LUFA/CodeTemplates/ \
- $(LUFA_ROOT_PATH)/Projects/AVRISP-MKII/
-CPPCHECK_PATH = $(LUFA_ROOT_PATH)
+CPPCHECK_INCLUDES = $(patsubst %/,%,$(LUFA_PATH))/CodeTemplates/ \
+ $(patsubst %/,%,$(LUFA_PATH))/../Projects/AVRISP-MKII/
+CPPCHECK_PATH = $(patsubst %/,%,$(LUFA_PATH))/..
all: begin cppcheck-config cppcheck end
@@ -32,5 +33,5 @@ end:
.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
+include $(LUFA_PATH)/Build/lufa.core.in
+include $(LUFA_PATH)/Build/lufa.cppcheck.in
\ No newline at end of file
--
GitLab