From 0ecd09c3e1d1ed47c940541c41b79815b16bd627 Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Sun, 3 Apr 2016 14:51:48 +1000
Subject: Add LUFA DMBS extension modules, use DMBS in project makefiles.

---
 LUFA/makefile | 43 +++++++++++++++----------------------------
 1 file changed, 15 insertions(+), 28 deletions(-)

(limited to 'LUFA/makefile')

diff --git a/LUFA/makefile b/LUFA/makefile
index 14571ea29..a7f0b1192 100644
--- a/LUFA/makefile
+++ b/LUFA/makefile
@@ -9,45 +9,32 @@
 #  Makefile for the LUFA library itself.
 # ---------------------------------------
 
-LUFA_VERSION_NUM         = $(shell grep LUFA_VERSION_STRING $(LUFA_PATH)/Version.h | cut -d'"' -f2)
-EXCLUDE_FROM_EXPORT     := Documentation DoxygenPages CodeTemplates Build StudioIntegration doxyfile *.tar *.o *.d *.lss *.lst *.hex *.elf *.hex *.eep *.map *.bin
+LUFA_VERSION_NUM := $(shell grep LUFA_VERSION_STRING $(LUFA_PATH)/Version.h | cut -d'"' -f2)
 
 # Default target - no default action when attempting to build the core directly
 all:
 
-# Export the library core as a TAR archive for importing into an IDE
-export_tar:
-	@echo Exporting LUFA library to a TAR archive...
-	@tar -cf LUFA_$(LUFA_VERSION_NUM).tar --directory=. $(EXCLUDE_FROM_EXPORT:%=--exclude=%) *
-	@tar -cf LUFA_$(LUFA_VERSION_NUM)_Code_Templates.tar CodeTemplates
-	@echo Export LUFA_$(LUFA_VERSION_NUM).tar complete.
-
 # Display the LUFA version of this library copy
 version:
 	@echo "LUFA $(LUFA_VERSION_NUM)"
 
-# Check if this is being included from a legacy or non LUFA build system makefile
-ifneq ($(LUFA_PATH),)
-  LUFA_ROOT_PATH = $(patsubst %/,%,$(LUFA_PATH))/LUFA/
-
-  include $(patsubst %/,%,$(LUFA_PATH))/LUFA/Build/lufa_sources.mk
-else
-  LUFA_BUILD_MODULES     += MASTER
-  LUFA_BUILD_TARGETS     += export_tar version
+LUFA_PATH               := .
+ARCH                    := {AVR8,UC3,XMEGA}
+DOXYGEN_OVERRIDE_PARAMS := QUIET=YES PROJECT_NUMBER=$(LUFA_VERSION_NUM)
 
-  LUFA_PATH               = .
-  ARCH                    = {AVR8,UC3,XMEGA}
-  DOXYGEN_OVERRIDE_PARAMS = QUIET=YES PROJECT_NUMBER=$(LUFA_VERSION_NUM)
-
-  # Remove all object and associated files from the LUFA library core
-  clean:
+# Remove all object and associated files from the LUFA library core
+clean:
 	rm -f $(LUFA_SRC_ALL_FILES:%.c=%.o)
 	rm -f $(LUFA_SRC_ALL_FILES:%.c=%.d)
 	rm -f $(LUFA_SRC_ALL_FILES:%.c=%.lst)
 
-  include Build/lufa_core.mk
-  include Build/lufa_sources.mk
-  include Build/lufa_doxygen.mk
-endif
+# Include LUFA-specific DMBS extension modules
+DMBS_LUFA_PATH ?= $(LUFA_PATH)/Build/LUFA
+include $(DMBS_LUFA_PATH)/lufa-sources.mk
+
+# Include common DMBS build system modules
+DMBS_PATH      ?= $(LUFA_PATH)/Build/DMBS/DMBS
+include $(DMBS_PATH)/core.mk
+include $(DMBS_PATH)/doxygen.mk
 
-.PHONY: all export_tar version clean
+.PHONY: all version
-- 
cgit v1.2.3