Merge remote-tracking branch 'upstream/master'

2 files changed, 0 insertions, 46 deletions

diff --git a/lib/lufa b/lib/lufa
new file mode 160000
+Subproject ce10f7642b0459e409839b23cc91498945119b4
diff --git a/lib/lufa/Demos/Device/ClassDriver/makefile b/lib/lufa/Demos/Device/ClassDriver/makefile
deleted file mode 100644
index a713c9d4c..000000000
--- a/lib/lufa/Demos/Device/ClassDriver/makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-#             LUFA Library
-#     Copyright (C) Dean Camera, 2017.
-#
-#  dean [at] fourwalledcubicle [dot] com
-#           www.lufa-lib.org
-#
-
-# Makefile to build all the LUFA Device Demos. Call with "make all" to
-# rebuild all Device demos.
-
-# Projects are pre-cleaned before each one is built, to ensure any
-# custom LUFA library build options are reflected in the compiled
-# code.
-
-PROJECT_DIRECTORIES := $(shell ls -d */)
-
-# This makefile is potentially infinitely recursive if something really bad
-# happens when determining the set of project directories - hard-abort if
-# more than 10 levels deep to avoid angry emails.
-ifeq ($(MAKELEVEL), 10)
-   $(error EMERGENCY ABORT: INFINITE RECURSION DETECTED)
-endif
-
-# Need to special-case building without a per-project object directory
-ifeq ($(OBJDIR),)
-   # If no target specified, force "clean all" and disallow parallel build
-   ifeq ($(MAKECMDGOALS),)
-      MAKECMDGOALS := clean all
-      .NOTPARALLEL:
-   endif
-
-   # If one of the targets is to build, force "clean" beforehand and disallow parallel build
-   ifneq ($(findstring all, $(MAKECMDGOALS)),)
-      MAKECMDGOALS := clean $(MAKECMDGOALS)
-      .NOTPARALLEL:
-   endif
-endif
-
-%: $(PROJECT_DIRECTORIES)
-	@echo . > /dev/null
-
-$(PROJECT_DIRECTORIES):
-	@$(MAKE) -C $@ $(MAKECMDGOALS)
-
-.PHONY: $(PROJECT_DIRECTORIES)