Correct BuildTest makefiles to use LUFA_PATH rather than LUFA_ROOT_PATH.

pull/1469/head
Dean Camera 13 years ago
parent c7344c22ac
commit 60a2147a51

@ -11,8 +11,8 @@
# possible board targets using their respective # possible board targets using their respective
# compiler. # compiler.
# Path to the root of the LUFA tree to scan # Path to the LUFA library core
LUFA_ROOT_PATH = ../.. LUFA_PATH = ../../LUFA/
all: begin makeboardlist testboards clean end all: begin makeboardlist testboards clean end
@ -26,7 +26,7 @@ end:
@echo @echo
makeboardlist: 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: testboards:
@echo "buildtest:" > BuildMakefile @echo "buildtest:" > BuildMakefile
@ -63,4 +63,4 @@ clean:
.PHONY: all begin end makeboardlist testboards clean .PHONY: all begin end makeboardlist testboards clean
# Include LUFA build script makefiles # Include LUFA build script makefiles
include $(LUFA_ROOT_PATH)/LUFA/Build/lufa.core.in include $(LUFA_PATH)/Build/lufa.core.in

@ -10,8 +10,8 @@
# test attempts to build all the bootloaders # test attempts to build all the bootloaders
# with all supported device configurations. # with all supported device configurations.
# Path to the root of the LUFA tree to scan # Path to the LUFA library core
LUFA_ROOT_PATH = ../.. LUFA_PATH = ../../LUFA/
all: begin testbootloaders clean end 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 "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@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; \ fi; \
done < BootloaderDeviceMap.cfg done < BootloaderDeviceMap.cfg
@ -58,4 +58,4 @@ clean:
.PHONY: all begin end testbootloaders clean .PHONY: all begin end testbootloaders clean
# Include LUFA build script makefiles # Include LUFA build script makefiles
include $(LUFA_ROOT_PATH)/LUFA/Build/lufa.core.in include $(LUFA_PATH)/Build/lufa.core.in

@ -12,6 +12,8 @@
# all module headers in a simple C and C++ # all module headers in a simple C and C++
# application. # application.
# Path to the LUFA library core
LUFA_PATH = ../../LUFA/
# List of device families per architecture, one device per architecture sub-family # List of device families per architecture, one device per architecture sub-family
AVR8_FAMILIES = at90usb1287 at90usb1286 atmega16u4 atmega16u2 at90usb162 AVR8_FAMILIES = at90usb1287 at90usb1286 atmega16u4 atmega16u2 at90usb162
@ -55,4 +57,4 @@ clean:
.PHONY: all arch_avr8 arch_xmega arch_uc3 begin end .PHONY: all arch_avr8 arch_xmega arch_uc3 begin end
# Include LUFA build script makefiles # Include LUFA build script makefiles
include $(LUFA_ROOT_PATH)/LUFA/Build/lufa.core.in include $(LUFA_PATH)/Build/lufa.core.in

@ -12,6 +12,9 @@
# all module headers in a simple C and C++ # all module headers in a simple C and C++
# application. # application.
# Path to the LUFA library core
LUFA_PATH = ../../LUFA/
all: begin compile clean end all: begin compile clean end
begin: begin:
@ -41,4 +44,4 @@ clean:
.PHONY: begin end compile clean .PHONY: begin end compile clean
# Include LUFA build script makefiles # Include LUFA build script makefiles
include $(LUFA_ROOT_PATH)/LUFA/Build/lufa.core.in include $(LUFA_PATH)/Build/lufa.core.in

@ -8,14 +8,15 @@
# Static anlysis of the entire LUFA source tree, using the free cross-platform "cppcheck" tool. # 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/ \ CPPCHECK_EXCLUDES = FATFs/ \
PetiteFATFs/ \ PetiteFATFs/ \
uip/ uip/
CPPCHECK_INCLUDES = $(LUFA_ROOT_PATH)/LUFA/CodeTemplates/ \ CPPCHECK_INCLUDES = $(patsubst %/,%,$(LUFA_PATH))/CodeTemplates/ \
$(LUFA_ROOT_PATH)/Projects/AVRISP-MKII/ $(patsubst %/,%,$(LUFA_PATH))/../Projects/AVRISP-MKII/
CPPCHECK_PATH = $(LUFA_ROOT_PATH) CPPCHECK_PATH = $(patsubst %/,%,$(LUFA_PATH))/..
all: begin cppcheck-config cppcheck end all: begin cppcheck-config cppcheck end
@ -32,5 +33,5 @@ end:
.PHONY: all begin end .PHONY: all begin end
# Include LUFA build script makefiles # Include LUFA build script makefiles
include $(LUFA_ROOT_PATH)/LUFA/Build/lufa.core.in include $(LUFA_PATH)/Build/lufa.core.in
include $(LUFA_ROOT_PATH)/LUFA/Build/lufa.cppcheck.in include $(LUFA_PATH)/Build/lufa.cppcheck.in
Loading…
Cancel
Save