Seperated out OTG, Device and Host mode demos into seperate folders for clarity. Adjusted makefiles so that the path to the LUFA library can be set in one place.

author: Dean Camera <dean@fourwalledcubicle.com> 2009-03-20 06:34:41 +0000
committer: Dean Camera <dean@fourwalledcubicle.com> 2009-03-20 06:34:41 +0000
commit: ed031c1df2f5b053b9cd9f48c63e66a42b7c049e (patch)
tree: 8e49d639484d53a6e00700b20e2b804e9775242f /Demos
parent: ecf7538430c01b95104682f0f7493e57b9168125 (diff)
download: lufa-ed031c1df2f5b053b9cd9f48c63e66a42b7c049e.tar.gz
lufa-ed031c1df2f5b053b9cd9f48c63e66a42b7c049e.tar.bz2
lufa-ed031c1df2f5b053b9cd9f48c63e66a42b7c049e.zip
209 files changed, 522 insertions, 372 deletions
diff --git a/Demos/AudioInput/AudioInput.aps b/Demos/Device/AudioInput/AudioInput.aps
index aed850ae3..aed850ae3 100644
--- a/Demos/AudioInput/AudioInput.aps
+++ b/Demos/Device/AudioInput/AudioInput.aps
diff --git a/Demos/AudioInput/AudioInput.c b/Demos/Device/AudioInput/AudioInput.c
index f41306f3b..f41306f3b 100644
--- a/Demos/AudioInput/AudioInput.c
+++ b/Demos/Device/AudioInput/AudioInput.c
diff --git a/Demos/AudioInput/AudioInput.h b/Demos/Device/AudioInput/AudioInput.h
index 02c838039..02c838039 100644
--- a/Demos/AudioInput/AudioInput.h
+++ b/Demos/Device/AudioInput/AudioInput.h
diff --git a/Demos/AudioInput/AudioInput.txt b/Demos/Device/AudioInput/AudioInput.txt
index 36e71e975..36e71e975 100644
--- a/Demos/AudioInput/AudioInput.txt
+++ b/Demos/Device/AudioInput/AudioInput.txt
diff --git a/Demos/AudioInput/Descriptors.c b/Demos/Device/AudioInput/Descriptors.c
index 7a3e42883..7a3e42883 100644
--- a/Demos/AudioInput/Descriptors.c
+++ b/Demos/Device/AudioInput/Descriptors.c
diff --git a/Demos/AudioInput/Descriptors.h b/Demos/Device/AudioInput/Descriptors.h
index cc0074980..cc0074980 100644
--- a/Demos/AudioInput/Descriptors.h
+++ b/Demos/Device/AudioInput/Descriptors.h
diff --git a/Demos/AudioInput/Doxygen.conf b/Demos/Device/AudioInput/Doxygen.conf
index f84efb7ba..f84efb7ba 100644
--- a/Demos/AudioInput/Doxygen.conf
+++ b/Demos/Device/AudioInput/Doxygen.conf
diff --git a/Demos/AudioInput/makefile b/Demos/Device/AudioInput/makefile
index ff2d83f93..95297d798 100644
--- a/Demos/AudioInput/makefile
+++ b/Demos/Device/AudioInput/makefile
@@ -118,18 +118,23 @@ TARGET = AudioInput
 OBJDIR = .
 
 
+# Path to the LUFA library
+LUFA_PATH = ../../..
+
+
 # List C source files here. (C dependencies are automatically generated.)
-SRC = $(TARGET).c                                          \
-	  Descriptors.c                                        \
-	  ../../LUFA/Scheduler/Scheduler.c                     \
-	  ../../LUFA/Drivers/USB/LowLevel/LowLevel.c           \
-	  ../../LUFA/Drivers/USB/LowLevel/Endpoint.c           \
-	  ../../LUFA/Drivers/USB/LowLevel/DevChapter9.c        \
-	  ../../LUFA/Drivers/USB/HighLevel/USBTask.c           \
-	  ../../LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
-	  ../../LUFA/Drivers/USB/HighLevel/Events.c            \
-	  ../../LUFA/Drivers/USB/HighLevel/StdDescriptors.c    \
-	  
+SRC = $(TARGET).c                                                 \
+	  Descriptors.c                                               \
+	  $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c                     \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c        \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/StdDescriptors.c    \
+
+
 # List C++ source files here. (C dependencies are automatically generated.)
 CPPSRC = 
 
@@ -161,7 +166,7 @@ DEBUG = dwarf-2
 #     Each directory must be seperated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
-EXTRAINCDIRS = ../../
+EXTRAINCDIRS = $(LUFA_PATH)/
 
 
 # Compiler flag to set the C Standard level.
diff --git a/Demos/AudioOutput/AudioOutput.aps b/Demos/Device/AudioOutput/AudioOutput.aps
index a01ba8f1a..a01ba8f1a 100644
--- a/Demos/AudioOutput/AudioOutput.aps
+++ b/Demos/Device/AudioOutput/AudioOutput.aps
diff --git a/Demos/AudioOutput/AudioOutput.c b/Demos/Device/AudioOutput/AudioOutput.c
index 0f390f001..0f390f001 100644
--- a/Demos/AudioOutput/AudioOutput.c
+++ b/Demos/Device/AudioOutput/AudioOutput.c
diff --git a/Demos/AudioOutput/AudioOutput.h b/Demos/Device/AudioOutput/AudioOutput.h
index 0ad9e5bf9..0ad9e5bf9 100644
--- a/Demos/AudioOutput/AudioOutput.h
+++ b/Demos/Device/AudioOutput/AudioOutput.h
diff --git a/Demos/AudioOutput/AudioOutput.txt b/Demos/Device/AudioOutput/AudioOutput.txt
index 0638c47f9..0638c47f9 100644
--- a/Demos/AudioOutput/AudioOutput.txt
+++ b/Demos/Device/AudioOutput/AudioOutput.txt
diff --git a/Demos/AudioOutput/Descriptors.c b/Demos/Device/AudioOutput/Descriptors.c
index 169e534ba..169e534ba 100644
--- a/Demos/AudioOutput/Descriptors.c
+++ b/Demos/Device/AudioOutput/Descriptors.c
diff --git a/Demos/AudioOutput/Descriptors.h b/Demos/Device/AudioOutput/Descriptors.h
index 99f10d648..99f10d648 100644
--- a/Demos/AudioOutput/Descriptors.h
+++ b/Demos/Device/AudioOutput/Descriptors.h
diff --git a/Demos/AudioOutput/Doxygen.conf b/Demos/Device/AudioOutput/Doxygen.conf
index 114137e19..114137e19 100644
--- a/Demos/AudioOutput/Doxygen.conf
+++ b/Demos/Device/AudioOutput/Doxygen.conf
diff --git a/Demos/AudioOutput/makefile b/Demos/Device/AudioOutput/makefile
index af99358f5..7ecd9009c 100644
--- a/Demos/AudioOutput/makefile
+++ b/Demos/Device/AudioOutput/makefile
@@ -118,18 +118,23 @@ TARGET = AudioOutput
 OBJDIR = .
 
 
+# Path to the LUFA library
+LUFA_PATH = ../../..
+
+
 # List C source files here. (C dependencies are automatically generated.)
-SRC = $(TARGET).c                                          \
-	  Descriptors.c                                        \
-	  ../../LUFA/Scheduler/Scheduler.c                     \
-	  ../../LUFA/Drivers/USB/LowLevel/LowLevel.c           \
-	  ../../LUFA/Drivers/USB/LowLevel/Endpoint.c           \
-	  ../../LUFA/Drivers/USB/LowLevel/DevChapter9.c        \
-	  ../../LUFA/Drivers/USB/HighLevel/USBTask.c           \
-	  ../../LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
-	  ../../LUFA/Drivers/USB/HighLevel/Events.c            \
-	  ../../LUFA/Drivers/USB/HighLevel/StdDescriptors.c    \
-	  
+SRC = $(TARGET).c                                                 \
+	  Descriptors.c                                               \
+	  $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c                     \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c        \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/StdDescriptors.c    \
+
+
 # List C++ source files here. (C dependencies are automatically generated.)
 CPPSRC = 
 
@@ -161,7 +166,7 @@ DEBUG = dwarf-2
 #     Each directory must be seperated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
-EXTRAINCDIRS = ../../
+EXTRAINCDIRS = $(LUFA_PATH)/
 
 
 # Compiler flag to set the C Standard level.
diff --git a/Demos/CDC/CDC.aps b/Demos/Device/CDC/CDC.aps
index 83dde595d..83dde595d 100644
--- a/Demos/CDC/CDC.aps
+++ b/Demos/Device/CDC/CDC.aps
diff --git a/Demos/CDC/CDC.c b/Demos/Device/CDC/CDC.c
index 6e933d581..6e933d581 100644
--- a/Demos/CDC/CDC.c
+++ b/Demos/Device/CDC/CDC.c
diff --git a/Demos/CDC/CDC.h b/Demos/Device/CDC/CDC.h
index d953303f7..d953303f7 100644
--- a/Demos/CDC/CDC.h
+++ b/Demos/Device/CDC/CDC.h
diff --git a/Demos/CDC/CDC.txt b/Demos/Device/CDC/CDC.txt
index 8e13b55b4..8e13b55b4 100644
--- a/Demos/CDC/CDC.txt
+++ b/Demos/Device/CDC/CDC.txt
diff --git a/Demos/CDC/Descriptors.c b/Demos/Device/CDC/Descriptors.c
index fa0c79da0..fa0c79da0 100644
--- a/Demos/CDC/Descriptors.c
+++ b/Demos/Device/CDC/Descriptors.c
diff --git a/Demos/USBtoSerial/Descriptors.h b/Demos/Device/CDC/Descriptors.h
index bec5e40d4..bec5e40d4 100644
--- a/Demos/USBtoSerial/Descriptors.h
+++ b/Demos/Device/CDC/Descriptors.h
diff --git a/Demos/CDC/Doxygen.conf b/Demos/Device/CDC/Doxygen.conf
index 3493347c5..3493347c5 100644
--- a/Demos/CDC/Doxygen.conf
+++ b/Demos/Device/CDC/Doxygen.conf
diff --git a/Demos/CDC/LUFA CDC.inf b/Demos/Device/CDC/LUFA CDC.inf
index d9d9ed63a..d9d9ed63a 100644
--- a/Demos/CDC/LUFA CDC.inf
+++ b/Demos/Device/CDC/LUFA CDC.inf
diff --git a/Demos/CDC/makefile b/Demos/Device/CDC/makefile
index 6547dc807..6f27fb926 100644
--- a/Demos/CDC/makefile
+++ b/Demos/Device/CDC/makefile
@@ -118,18 +118,23 @@ TARGET = CDC
 OBJDIR = .
 
 
+# Path to the LUFA library
+LUFA_PATH = ../../..
+
+
 # List C source files here. (C dependencies are automatically generated.)
-SRC = $(TARGET).c                                          \
-	  Descriptors.c                                        \
-	  ../../LUFA/Scheduler/Scheduler.c                     \
-	  ../../LUFA/Drivers/USB/LowLevel/LowLevel.c           \
-	  ../../LUFA/Drivers/USB/LowLevel/Endpoint.c           \
-	  ../../LUFA/Drivers/USB/LowLevel/DevChapter9.c        \
-	  ../../LUFA/Drivers/USB/HighLevel/USBTask.c           \
-	  ../../LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
-	  ../../LUFA/Drivers/USB/HighLevel/Events.c            \
-	  ../../LUFA/Drivers/USB/HighLevel/StdDescriptors.c    \
-	  
+SRC = $(TARGET).c                                                 \
+	  Descriptors.c                                               \
+	  $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c                     \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c        \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/StdDescriptors.c    \
+
+
 # List C++ source files here. (C dependencies are automatically generated.)
 CPPSRC = 
 
@@ -161,7 +166,7 @@ DEBUG = dwarf-2
 #     Each directory must be seperated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
-EXTRAINCDIRS = ../../
+EXTRAINCDIRS = $(LUFA_PATH)/
 
 
 # Compiler flag to set the C Standard level.
diff --git a/Demos/DualCDC/Descriptors.c b/Demos/Device/DualCDC/Descriptors.c
index 4f74b138b..4f74b138b 100644
--- a/Demos/DualCDC/Descriptors.c
+++ b/Demos/Device/DualCDC/Descriptors.c
diff --git a/Demos/DualCDC/Descriptors.h b/Demos/Device/DualCDC/Descriptors.h
index 7bbe52fe3..7bbe52fe3 100644
--- a/Demos/DualCDC/Descriptors.h
+++ b/Demos/Device/DualCDC/Descriptors.h
diff --git a/Demos/DualCDC/Doxygen.conf b/Demos/Device/DualCDC/Doxygen.conf
index 7b3b74176..7b3b74176 100644
--- a/Demos/DualCDC/Doxygen.conf
+++ b/Demos/Device/DualCDC/Doxygen.conf
diff --git a/Demos/DualCDC/DualCDC.aps b/Demos/Device/DualCDC/DualCDC.aps
index 276e74356..276e74356 100644
--- a/Demos/DualCDC/DualCDC.aps
+++ b/Demos/Device/DualCDC/DualCDC.aps
diff --git a/Demos/DualCDC/DualCDC.c b/Demos/Device/DualCDC/DualCDC.c
index 3c598da42..3c598da42 100644
--- a/Demos/DualCDC/DualCDC.c
+++ b/Demos/Device/DualCDC/DualCDC.c
diff --git a/Demos/DualCDC/DualCDC.h b/Demos/Device/DualCDC/DualCDC.h
index 4c62abf9d..4c62abf9d 100644
--- a/Demos/DualCDC/DualCDC.h
+++ b/Demos/Device/DualCDC/DualCDC.h
diff --git a/Demos/DualCDC/DualCDC.txt b/Demos/Device/DualCDC/DualCDC.txt
index 6e086029b..6e086029b 100644
--- a/Demos/DualCDC/DualCDC.txt
+++ b/Demos/Device/DualCDC/DualCDC.txt
diff --git a/Demos/DualCDC/LUFA DualCDC.inf b/Demos/Device/DualCDC/LUFA DualCDC.inf
index 10ba560f8..10ba560f8 100644
--- a/Demos/DualCDC/LUFA DualCDC.inf
+++ b/Demos/Device/DualCDC/LUFA DualCDC.inf
diff --git a/Demos/DualCDC/makefile b/Demos/Device/DualCDC/makefile
index 084331302..b2a8d9e04 100644
--- a/Demos/DualCDC/makefile
+++ b/Demos/Device/DualCDC/makefile
@@ -118,18 +118,23 @@ TARGET = DualCDC
 OBJDIR = .
 
 
+# Path to the LUFA library
+LUFA_PATH = ../../..
+
+
 # List C source files here. (C dependencies are automatically generated.)
-SRC = $(TARGET).c                                          \
-	  Descriptors.c                                        \
-	  ../../LUFA/Scheduler/Scheduler.c                     \
-	  ../../LUFA/Drivers/USB/LowLevel/LowLevel.c           \
-	  ../../LUFA/Drivers/USB/LowLevel/Endpoint.c           \
-	  ../../LUFA/Drivers/USB/LowLevel/DevChapter9.c        \
-	  ../../LUFA/Drivers/USB/HighLevel/USBTask.c           \
-	  ../../LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
-	  ../../LUFA/Drivers/USB/HighLevel/Events.c            \
-	  ../../LUFA/Drivers/USB/HighLevel/StdDescriptors.c    \
-	  
+SRC = $(TARGET).c                                                 \
+	  Descriptors.c                                               \
+	  $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c                     \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c        \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/StdDescriptors.c    \
+
+
 # List C++ source files here. (C dependencies are automatically generated.)
 CPPSRC = 
 
@@ -161,7 +166,7 @@ DEBUG = dwarf-2
 #     Each directory must be seperated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
-EXTRAINCDIRS = ../../
+EXTRAINCDIRS = $(LUFA_PATH)/
 
 
 # Compiler flag to set the C Standard level.
diff --git a/Demos/Joystick/Descriptors.c b/Demos/Device/Joystick/Descriptors.c
index 36e644c26..36e644c26 100644
--- a/Demos/Joystick/Descriptors.c
+++ b/Demos/Device/Joystick/Descriptors.c
diff --git a/Demos/Joystick/Descriptors.h b/Demos/Device/Joystick/Descriptors.h
index 3463d9623..3463d9623 100644
--- a/Demos/Joystick/Descriptors.h
+++ b/Demos/Device/Joystick/Descriptors.h
diff --git a/Demos/Joystick/Doxygen.conf b/Demos/Device/Joystick/Doxygen.conf
index 2af5ce68e..2af5ce68e 100644
--- a/Demos/Joystick/Doxygen.conf
+++ b/Demos/Device/Joystick/Doxygen.conf
diff --git a/Demos/Joystick/Joystick.aps b/Demos/Device/Joystick/Joystick.aps
index 245245daa..245245daa 100644
--- a/Demos/Joystick/Joystick.aps
+++ b/Demos/Device/Joystick/Joystick.aps
diff --git a/Demos/Joystick/Joystick.c b/Demos/Device/Joystick/Joystick.c
index cd8822705..cd8822705 100644
--- a/Demos/Joystick/Joystick.c
+++ b/Demos/Device/Joystick/Joystick.c
diff --git a/Demos/Joystick/Joystick.h b/Demos/Device/Joystick/Joystick.h
index 79c7e498f..79c7e498f 100644
--- a/Demos/Joystick/Joystick.h
+++ b/Demos/Device/Joystick/Joystick.h
diff --git a/Demos/Joystick/Joystick.txt b/Demos/Device/Joystick/Joystick.txt
index 7d47ae92f..7d47ae92f 100644
--- a/Demos/Joystick/Joystick.txt
+++ b/Demos/Device/Joystick/Joystick.txt
diff --git a/Demos/Joystick/makefile b/Demos/Device/Joystick/makefile
index e29a3a509..8c645747d 100644
--- a/Demos/Joystick/makefile
+++ b/Demos/Device/Joystick/makefile
@@ -118,18 +118,23 @@ TARGET = Joystick
 OBJDIR = .
 
 
+# Path to the LUFA library
+LUFA_PATH = ../../..
+
+
 # List C source files here. (C dependencies are automatically generated.)
-SRC = $(TARGET).c                                          \
-	  Descriptors.c                                        \
-	  ../../LUFA/Scheduler/Scheduler.c                     \
-	  ../../LUFA/Drivers/USB/LowLevel/LowLevel.c           \
-	  ../../LUFA/Drivers/USB/LowLevel/Endpoint.c           \
-	  ../../LUFA/Drivers/USB/LowLevel/DevChapter9.c        \
-	  ../../LUFA/Drivers/USB/HighLevel/USBTask.c           \
-	  ../../LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
-	  ../../LUFA/Drivers/USB/HighLevel/Events.c            \
-	  ../../LUFA/Drivers/USB/HighLevel/StdDescriptors.c    \
-	  
+SRC = $(TARGET).c                                                 \
+	  Descriptors.c                                               \
+	  $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c                     \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c        \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/StdDescriptors.c    \
+
+
 # List C++ source files here. (C dependencies are automatically generated.)
 CPPSRC = 
 
@@ -161,7 +166,7 @@ DEBUG = dwarf-2
 #     Each directory must be seperated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
-EXTRAINCDIRS = ../../
+EXTRAINCDIRS = $(LUFA_PATH)/
 
 
 # Compiler flag to set the C Standard level.
diff --git a/Demos/Keyboard/Descriptors.c b/Demos/Device/Keyboard/Descriptors.c
index 1f383ab08..1f383ab08 100644
--- a/Demos/Keyboard/Descriptors.c
+++ b/Demos/Device/Keyboard/Descriptors.c
diff --git a/Demos/Keyboard/Descriptors.h b/Demos/Device/Keyboard/Descriptors.h
index aa1bf05b6..aa1bf05b6 100644
--- a/Demos/Keyboard/Descriptors.h
+++ b/Demos/Device/Keyboard/Descriptors.h
diff --git a/Demos/Keyboard/Doxygen.conf b/Demos/Device/Keyboard/Doxygen.conf
index 79a300aed..79a300aed 100644
--- a/Demos/Keyboard/Doxygen.conf
+++ b/Demos/Device/Keyboard/Doxygen.conf
diff --git a/Demos/Keyboard/Keyboard.aps b/Demos/Device/Keyboard/Keyboard.aps
index 541c17503..541c17503 100644
--- a/Demos/Keyboard/Keyboard.aps
+++ b/Demos/Device/Keyboard/Keyboard.aps
diff --git a/Demos/Keyboard/Keyboard.c b/Demos/Device/Keyboard/Keyboard.c
index d6b254ffb..d6b254ffb 100644
--- a/Demos/Keyboard/Keyboard.c
+++ b/Demos/Device/Keyboard/Keyboard.c
diff --git a/Demos/Keyboard/Keyboard.h b/Demos/Device/Keyboard/Keyboard.h
index 143ffc654..143ffc654 100644
--- a/Demos/Keyboard/Keyboard.h
+++ b/Demos/Device/Keyboard/Keyboard.h
diff --git a/Demos/Keyboard/Keyboard.txt b/Demos/Device/Keyboard/Keyboard.txt
index a09d83507..a09d83507 100644
--- a/Demos/Keyboard/Keyboard.txt
+++ b/Demos/Device/Keyboard/Keyboard.txt
diff --git a/Demos/Keyboard/makefile b/Demos/Device/Keyboard/makefile
index fde8ce0a1..9f738ce08 100644
--- a/Demos/Keyboard/makefile
+++ b/Demos/Device/Keyboard/makefile
@@ -118,18 +118,23 @@ TARGET = Keyboard
 OBJDIR = .
 
 
+# Path to the LUFA library
+LUFA_PATH = ../../..
+
+
 # List C source files here. (C dependencies are automatically generated.)
-SRC = $(TARGET).c                                          \
-	  Descriptors.c                                        \
-	  ../../LUFA/Scheduler/Scheduler.c                     \
-	  ../../LUFA/Drivers/USB/LowLevel/LowLevel.c           \
-	  ../../LUFA/Drivers/USB/LowLevel/Endpoint.c           \
-	  ../../LUFA/Drivers/USB/LowLevel/DevChapter9.c        \
-	  ../../LUFA/Drivers/USB/HighLevel/USBTask.c           \
-	  ../../LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
-	  ../../LUFA/Drivers/USB/HighLevel/Events.c            \
-	  ../../LUFA/Drivers/USB/HighLevel/StdDescriptors.c    \
-	  
+SRC = $(TARGET).c                                                 \
+	  Descriptors.c                                               \
+	  $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c                     \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c        \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/StdDescriptors.c    \
+
+
 # List C++ source files here. (C dependencies are automatically generated.)
 CPPSRC = 
 
@@ -161,7 +166,7 @@ DEBUG = dwarf-2
 #     Each directory must be seperated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
-EXTRAINCDIRS = ../../
+EXTRAINCDIRS = $(LUFA_PATH)/
 
 
 # Compiler flag to set the C Standard level.
diff --git a/Demos/KeyboardMouse/Descriptors.c b/Demos/Device/KeyboardMouse/Descriptors.c
index c9d91039b..c9d91039b 100644
--- a/Demos/KeyboardMouse/Descriptors.c
+++ b/Demos/Device/KeyboardMouse/Descriptors.c
diff --git a/Demos/KeyboardMouse/Descriptors.h b/Demos/Device/KeyboardMouse/Descriptors.h
index 59495425c..59495425c 100644
--- a/Demos/KeyboardMouse/Descriptors.h
+++ b/Demos/Device/KeyboardMouse/Descriptors.h
diff --git a/Demos/KeyboardMouse/Doxygen.conf b/Demos/Device/KeyboardMouse/Doxygen.conf
index 12916856b..12916856b 100644
--- a/Demos/KeyboardMouse/Doxygen.conf
+++ b/Demos/Device/KeyboardMouse/Doxygen.conf
diff --git a/Demos/KeyboardMouse/KeyboardMouse.aps b/Demos/Device/KeyboardMouse/KeyboardMouse.aps
index eb54f1d4d..eb54f1d4d 100644
--- a/Demos/KeyboardMouse/KeyboardMouse.aps
+++ b/Demos/Device/KeyboardMouse/KeyboardMouse.aps
diff --git a/Demos/KeyboardMouse/KeyboardMouse.c b/Demos/Device/KeyboardMouse/KeyboardMouse.c
index 3ee101b8d..3ee101b8d 100644
--- a/Demos/KeyboardMouse/KeyboardMouse.c
+++ b/Demos/Device/KeyboardMouse/KeyboardMouse.c
diff --git a/Demos/KeyboardMouse/KeyboardMouse.h b/Demos/Device/KeyboardMouse/KeyboardMouse.h
index 9794159fc..9794159fc 100644
--- a/Demos/KeyboardMouse/KeyboardMouse.h
+++ b/Demos/Device/KeyboardMouse/KeyboardMouse.h
diff --git a/Demos/KeyboardMouse/KeyboardMouse.txt b/Demos/Device/KeyboardMouse/KeyboardMouse.txt
index 6388e9803..6388e9803 100644
--- a/Demos/KeyboardMouse/KeyboardMouse.txt
+++ b/Demos/Device/KeyboardMouse/KeyboardMouse.txt
diff --git a/Demos/KeyboardMouse/makefile b/Demos/Device/KeyboardMouse/makefile
index d411fc4aa..59d676f09 100644
--- a/Demos/KeyboardMouse/makefile
+++ b/Demos/Device/KeyboardMouse/makefile
@@ -118,18 +118,23 @@ TARGET = KeyboardMouse
 OBJDIR = .
 
 
+# Path to the LUFA library
+LUFA_PATH = ../../..
+
+
 # List C source files here. (C dependencies are automatically generated.)
-SRC = $(TARGET).c                                          \
-	  Descriptors.c                                        \
-	  ../../LUFA/Scheduler/Scheduler.c                     \
-	  ../../LUFA/Drivers/USB/LowLevel/LowLevel.c           \
-	  ../../LUFA/Drivers/USB/LowLevel/Endpoint.c           \
-	  ../../LUFA/Drivers/USB/LowLevel/DevChapter9.c        \
-	  ../../LUFA/Drivers/USB/HighLevel/USBTask.c           \
-	  ../../LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
-	  ../../LUFA/Drivers/USB/HighLevel/Events.c            \
-	  ../../LUFA/Drivers/USB/HighLevel/StdDescriptors.c    \
-	  
+SRC = $(TARGET).c                                                 \
+	  Descriptors.c                                               \
+	  $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c                     \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c        \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/StdDescriptors.c    \
+
+
 # List C++ source files here. (C dependencies are automatically generated.)
 CPPSRC = 
 
@@ -161,7 +166,7 @@ DEBUG = dwarf-2
 #     Each directory must be seperated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
-EXTRAINCDIRS = ../../
+EXTRAINCDIRS = $(LUFA_PATH)/
 
 
 # Compiler flag to set the C Standard level.
diff --git a/Demos/MIDI/Descriptors.c b/Demos/Device/MIDI/Descriptors.c
index 1dbc1d915..1dbc1d915 100644
--- a/Demos/MIDI/Descriptors.c
+++ b/Demos/Device/MIDI/Descriptors.c
diff --git a/Demos/MIDI/Descriptors.h b/Demos/Device/MIDI/Descriptors.h
index f80e58b20..f80e58b20 100644
--- a/Demos/MIDI/Descriptors.h
+++ b/Demos/Device/MIDI/Descriptors.h
diff --git a/Demos/MIDI/Doxygen.conf b/Demos/Device/MIDI/Doxygen.conf
index 7d36de8ed..7d36de8ed 100644
--- a/Demos/MIDI/Doxygen.conf
+++ b/Demos/Device/MIDI/Doxygen.conf
diff --git a/Demos/MIDI/MIDI.aps b/Demos/Device/MIDI/MIDI.aps
index e61e77012..e61e77012 100644
--- a/Demos/MIDI/MIDI.aps
+++ b/Demos/Device/MIDI/MIDI.aps
diff --git a/Demos/MIDI/MIDI.c b/Demos/Device/MIDI/MIDI.c
index c0e4f9df9..c0e4f9df9 100644
--- a/Demos/MIDI/MIDI.c
+++ b/Demos/Device/MIDI/MIDI.c
diff --git a/Demos/MIDI/MIDI.h b/Demos/Device/MIDI/MIDI.h
index 733a7baed..733a7baed 100644
--- a/Demos/MIDI/MIDI.h
+++ b/Demos/Device/MIDI/MIDI.h
diff --git a/Demos/MIDI/MIDI.txt b/Demos/Device/MIDI/MIDI.txt
index 3eb60cdc6..3eb60cdc6 100644
--- a/Demos/MIDI/MIDI.txt
+++ b/Demos/Device/MIDI/MIDI.txt
diff --git a/Demos/MIDI/makefile b/Demos/Device/MIDI/makefile
index ecd4215c1..09bd0c28f 100644
--- a/Demos/MIDI/makefile
+++ b/Demos/Device/MIDI/makefile
@@ -118,18 +118,23 @@ TARGET = MIDI
 OBJDIR = .
 
 
+# Path to the LUFA library
+LUFA_PATH = ../../..
+
+
 # List C source files here. (C dependencies are automatically generated.)
-SRC = $(TARGET).c                                          \
-	  Descriptors.c                                        \
-	  ../../LUFA/Scheduler/Scheduler.c                     \
-	  ../../LUFA/Drivers/USB/LowLevel/LowLevel.c           \
-	  ../../LUFA/Drivers/USB/LowLevel/Endpoint.c           \
-	  ../../LUFA/Drivers/USB/LowLevel/DevChapter9.c        \
-	  ../../LUFA/Drivers/USB/HighLevel/USBTask.c           \
-	  ../../LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
-	  ../../LUFA/Drivers/USB/HighLevel/Events.c            \
-	  ../../LUFA/Drivers/USB/HighLevel/StdDescriptors.c    \
-	  
+SRC = $(TARGET).c                                                 \
+	  Descriptors.c                                               \
+	  $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c                     \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c        \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/StdDescriptors.c    \
+
+
 # List C++ source files here. (C dependencies are automatically generated.)
 CPPSRC = 
 
@@ -161,7 +166,7 @@ DEBUG = dwarf-2
 #     Each directory must be seperated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
-EXTRAINCDIRS = ../../
+EXTRAINCDIRS = $(LUFA_PATH)/
 
 
 # Compiler flag to set the C Standard level.
diff --git a/Demos/MassStorage/DataflashManager.c b/Demos/Device/MassStorage/DataflashManager.c
index 7b02ed6c8..7b02ed6c8 100644
--- a/Demos/MassStorage/DataflashManager.c
+++ b/Demos/Device/MassStorage/DataflashManager.c
diff --git a/Demos/MassStorage/DataflashManager.h b/Demos/Device/MassStorage/DataflashManager.h
index 1332fd3a3..1332fd3a3 100644
--- a/Demos/MassStorage/DataflashManager.h
+++ b/Demos/Device/MassStorage/DataflashManager.h
diff --git a/Demos/MassStorage/Descriptors.c b/Demos/Device/MassStorage/Descriptors.c
index a6173156a..a6173156a 100644
--- a/Demos/MassStorage/Descriptors.c
+++ b/Demos/Device/MassStorage/Descriptors.c
diff --git a/Demos/MassStorage/Descriptors.h b/Demos/Device/MassStorage/Descriptors.h
index a64d72e92..a64d72e92 100644
--- a/Demos/MassStorage/Descriptors.h
+++ b/Demos/Device/MassStorage/Descriptors.h
diff --git a/Demos/MassStorage/Doxygen.conf b/Demos/Device/MassStorage/Doxygen.conf
index a7b900160..a7b900160 100644
--- a/Demos/MassStorage/Doxygen.conf
+++ b/Demos/Device/MassStorage/Doxygen.conf
diff --git a/Demos/MassStorage/MassStorage.aps b/Demos/Device/MassStorage/MassStorage.aps
index 483bc4cab..483bc4cab 100644
--- a/Demos/MassStorage/MassStorage.aps
+++ b/Demos/Device/MassStorage/MassStorage.aps
diff --git a/Demos/MassStorage/MassStorage.c b/Demos/Device/MassStorage/MassStorage.c
index 92e33073c..92e33073c 100644
--- a/Demos/MassStorage/MassStorage.c
+++ b/Demos/Device/MassStorage/MassStorage.c
diff --git a/Demos/MassStorage/MassStorage.h b/Demos/Device/MassStorage/MassStorage.h
index a30e7f746..a30e7f746 100644
--- a/Demos/MassStorage/MassStorage.h
+++ b/Demos/Device/MassStorage/MassStorage.h
diff --git a/Demos/MassStorage/MassStorage.txt b/Demos/Device/MassStorage/MassStorage.txt
index 4e8adadbc..4e8adadbc 100644
--- a/Demos/MassStorage/MassStorage.txt
+++ b/Demos/Device/MassStorage/MassStorage.txt
diff --git a/Demos/MassStorage/SCSI.c b/Demos/Device/MassStorage/SCSI.c
index d9c552691..d9c552691 100644
--- a/Demos/MassStorage/SCSI.c
+++ b/Demos/Device/MassStorage/SCSI.c
diff --git a/Demos/MassStorage/SCSI.h b/Demos/Device/MassStorage/SCSI.h
index a0be39001..a0be39001 100644
--- a/Demos/MassStorage/SCSI.h
+++ b/Demos/Device/MassStorage/SCSI.h
diff --git a/Demos/MassStorageHost/SCSI_Codes.h b/Demos/Device/MassStorage/SCSI_Codes.h
index 2b2213de2..2b2213de2 100644
--- a/Demos/MassStorageHost/SCSI_Codes.h
+++ b/Demos/Device/MassStorage/SCSI_Codes.h
diff --git a/Demos/MassStorage/makefile b/Demos/Device/MassStorage/makefile
index 65285253d..a25c2335d 100644
--- a/Demos/MassStorage/makefile
+++ b/Demos/Device/MassStorage/makefile
@@ -118,20 +118,25 @@ TARGET = MassStorage
 OBJDIR = .
 
 
+# Path to the LUFA library
+LUFA_PATH = ../../..
+
+
 # List C source files here. (C dependencies are automatically generated.)
-SRC = $(TARGET).c                                          \
-	  Descriptors.c                                        \
-	  SCSI.c                                               \
-	  DataflashManager.c                                   \
-	  ../../LUFA/Scheduler/Scheduler.c                     \
-	  ../../LUFA/Drivers/USB/LowLevel/LowLevel.c           \
-	  ../../LUFA/Drivers/USB/LowLevel/Endpoint.c           \
-	  ../../LUFA/Drivers/USB/LowLevel/DevChapter9.c        \
-	  ../../LUFA/Drivers/USB/HighLevel/USBTask.c           \
-	  ../../LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
-	  ../../LUFA/Drivers/USB/HighLevel/Events.c            \
-	  ../../LUFA/Drivers/USB/HighLevel/StdDescriptors.c    \
-	  
+SRC = $(TARGET).c                                                 \
+	  Descriptors.c                                               \
+	  SCSI.c                                                      \
+	  DataflashManager.c                                          \
+	  $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c                     \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c        \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/StdDescriptors.c    \
+
+
 # List C++ source files here. (C dependencies are automatically generated.)
 CPPSRC = 
 
@@ -163,7 +168,7 @@ DEBUG = dwarf-2
 #     Each directory must be seperated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
-EXTRAINCDIRS = ../../
+EXTRAINCDIRS = $(LUFA_PATH)/
 
 
 # Compiler flag to set the C Standard level.
diff --git a/Demos/Mouse/Descriptors.c b/Demos/Device/Mouse/Descriptors.c
index dac048b97..dac048b97 100644
--- a/Demos/Mouse/Descriptors.c
+++ b/Demos/Device/Mouse/Descriptors.c
diff --git a/Demos/Mouse/Descriptors.h b/Demos/Device/Mouse/Descriptors.h
index 1fcee7212..1fcee7212 100644
--- a/Demos/Mouse/Descriptors.h
+++ b/Demos/Device/Mouse/Descriptors.h
diff --git a/Demos/Mouse/Doxygen.conf b/Demos/Device/Mouse/Doxygen.conf
index 62c4db110..62c4db110 100644
--- a/Demos/Mouse/Doxygen.conf
+++ b/Demos/Device/Mouse/Doxygen.conf
diff --git a/Demos/Mouse/Mouse.aps b/Demos/Device/Mouse/Mouse.aps
index 3ae163797..3ae163797 100644
--- a/Demos/Mouse/Mouse.aps
+++ b/Demos/Device/Mouse/Mouse.aps
diff --git a/Demos/Mouse/Mouse.c b/Demos/Device/Mouse/Mouse.c
index c066d424a..c066d424a 100644
--- a/Demos/Mouse/Mouse.c
+++ b/Demos/Device/Mouse/Mouse.c
diff --git a/Demos/Mouse/Mouse.h b/Demos/Device/Mouse/Mouse.h
index c9854a8f9..c9854a8f9 100644
--- a/Demos/Mouse/Mouse.h
+++ b/Demos/Device/Mouse/Mouse.h
diff --git a/Demos/Mouse/Mouse.txt b/Demos/Device/Mouse/Mouse.txt
index 6764275ce..6764275ce 100644
--- a/Demos/Mouse/Mouse.txt
+++ b/Demos/Device/Mouse/Mouse.txt
diff --git a/Demos/Mouse/makefile b/Demos/Device/Mouse/makefile
index 27ca1d809..1dc0c663f 100644
--- a/Demos/Mouse/makefile
+++ b/Demos/Device/Mouse/makefile
@@ -118,18 +118,23 @@ TARGET = Mouse
 OBJDIR = .
 
 
+# Path to the LUFA library
+LUFA_PATH = ../../..
+
+
 # List C source files here. (C dependencies are automatically generated.)
-SRC = $(TARGET).c                                          \
-	  Descriptors.c                                        \
-	  ../../LUFA/Scheduler/Scheduler.c                     \
-	  ../../LUFA/Drivers/USB/LowLevel/LowLevel.c           \
-	  ../../LUFA/Drivers/USB/LowLevel/Endpoint.c           \
-	  ../../LUFA/Drivers/USB/LowLevel/DevChapter9.c        \
-	  ../../LUFA/Drivers/USB/HighLevel/USBTask.c           \
-	  ../../LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
-	  ../../LUFA/Drivers/USB/HighLevel/Events.c            \
-	  ../../LUFA/Drivers/USB/HighLevel/StdDescriptors.c    \
-	  
+SRC = $(TARGET).c                                                 \
+	  Descriptors.c                                               \
+	  $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c                     \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c        \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/StdDescriptors.c    \
+
+
 # List C++ source files here. (C dependencies are automatically generated.)
 CPPSRC = 
 
@@ -161,7 +166,7 @@ DEBUG = dwarf-2
 #     Each directory must be seperated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
-EXTRAINCDIRS = ../../
+EXTRAINCDIRS = $(LUFA_PATH)/
 
 
 # Compiler flag to set the C Standard level.
diff --git a/Demos/RNDISEthernet/ARP.c b/Demos/Device/RNDISEthernet/ARP.c
index 3560403f4..3560403f4 100644
--- a/Demos/RNDISEthernet/ARP.c
+++ b/Demos/Device/RNDISEthernet/ARP.c
diff --git a/Demos/RNDISEthernet/ARP.h b/Demos/Device/RNDISEthernet/ARP.h
index 8551df85b..8551df85b 100644
--- a/Demos/RNDISEthernet/ARP.h
+++ b/Demos/Device/RNDISEthernet/ARP.h
diff --git a/Demos/RNDISEthernet/DHCP.c b/Demos/Device/RNDISEthernet/DHCP.c
index 7f220c423..7f220c423 100644
--- a/Demos/RNDISEthernet/DHCP.c
+++ b/Demos/Device/RNDISEthernet/DHCP.c
diff --git a/Demos/RNDISEthernet/DHCP.h b/Demos/Device/RNDISEthernet/DHCP.h
index f1e14e196..f1e14e196 100644
--- a/Demos/RNDISEthernet/DHCP.h
+++ b/Demos/Device/RNDISEthernet/DHCP.h
diff --git a/Demos/RNDISEthernet/Descriptors.c b/Demos/Device/RNDISEthernet/Descriptors.c
index 1994c601c..1994c601c 100644
--- a/Demos/RNDISEthernet/Descriptors.c
+++ b/Demos/Device/RNDISEthernet/Descriptors.c
diff --git a/Demos/RNDISEthernet/Descriptors.h b/Demos/Device/RNDISEthernet/Descriptors.h
index 070c118d6..070c118d6 100644
--- a/Demos/RNDISEthernet/Descriptors.h
+++ b/Demos/Device/RNDISEthernet/Descriptors.h
diff --git a/Demos/RNDISEthernet/Doxygen.conf b/Demos/Device/RNDISEthernet/Doxygen.conf
index 9d7973b78..9d7973b78 100644
--- a/Demos/RNDISEthernet/Doxygen.conf
+++ b/Demos/Device/RNDISEthernet/Doxygen.conf
diff --git a/Demos/RNDISEthernet/Ethernet.c b/Demos/Device/RNDISEthernet/Ethernet.c
index b8d561509..b8d561509 100644
--- a/Demos/RNDISEthernet/Ethernet.c
+++ b/Demos/Device/RNDISEthernet/Ethernet.c
diff --git a/Demos/RNDISEthernet/Ethernet.h b/Demos/Device/RNDISEthernet/Ethernet.h
index 23fc325a5..23fc325a5 100644
--- a/Demos/RNDISEthernet/Ethernet.h
+++ b/Demos/Device/RNDISEthernet/Ethernet.h
diff --git a/Demos/RNDISEthernet/EthernetProtocols.h b/Demos/Device/RNDISEthernet/EthernetProtocols.h
index 3ff3433ae..3ff3433ae 100644
--- a/Demos/RNDISEthernet/EthernetProtocols.h
+++ b/Demos/Device/RNDISEthernet/EthernetProtocols.h
diff --git a/Demos/RNDISEthernet/ICMP.c b/Demos/Device/RNDISEthernet/ICMP.c
index a15564059..a15564059 100644
--- a/Demos/RNDISEthernet/ICMP.c
+++ b/Demos/Device/RNDISEthernet/ICMP.c
diff --git a/Demos/RNDISEthernet/ICMP.h b/Demos/Device/RNDISEthernet/ICMP.h
index b20a557e9..b20a557e9 100644
--- a/Demos/RNDISEthernet/ICMP.h
+++ b/Demos/Device/RNDISEthernet/ICMP.h
diff --git a/Demos/RNDISEthernet/IP.c b/Demos/Device/RNDISEthernet/IP.c
index 65875bb0a..65875bb0a 100644
--- a/Demos/RNDISEthernet/IP.c
+++ b/Demos/Device/RNDISEthernet/IP.c
diff --git a/Demos/RNDISEthernet/IP.h b/Demos/Device/RNDISEthernet/IP.h
index 119d219e2..119d219e2 100644
--- a/Demos/RNDISEthernet/IP.h
+++ b/Demos/Device/RNDISEthernet/IP.h
diff --git a/Demos/RNDISEthernet/LUFA RNDIS.inf b/Demos/Device/RNDISEthernet/LUFA RNDIS.inf
index a124afec1..a124afec1 100644
--- a/Demos/RNDISEthernet/LUFA RNDIS.inf
+++ b/Demos/Device/RNDISEthernet/LUFA RNDIS.inf
diff --git a/Demos/RNDISEthernet/ProtocolDecoders.c b/Demos/Device/RNDISEthernet/ProtocolDecoders.c
index f0e6ebba8..f0e6ebba8 100644
--- a/Demos/RNDISEthernet/ProtocolDecoders.c
+++ b/Demos/Device/RNDISEthernet/ProtocolDecoders.c
diff --git a/Demos/RNDISEthernet/ProtocolDecoders.h b/Demos/Device/RNDISEthernet/ProtocolDecoders.h
index 06e4c0ad4..06e4c0ad4 100644
--- a/Demos/RNDISEthernet/ProtocolDecoders.h
+++ b/Demos/Device/RNDISEthernet/ProtocolDecoders.h
diff --git a/Demos/RNDISEthernet/RNDIS.c b/Demos/Device/RNDISEthernet/RNDIS.c
index ee0c8c34b..ee0c8c34b 100644
--- a/Demos/RNDISEthernet/RNDIS.c
+++ b/Demos/Device/RNDISEthernet/RNDIS.c
diff --git a/Demos/RNDISEthernet/RNDIS.h b/Demos/Device/RNDISEthernet/RNDIS.h
index 7c75875cf..7c75875cf 100644
--- a/Demos/RNDISEthernet/RNDIS.h
+++ b/Demos/Device/RNDISEthernet/RNDIS.h
diff --git a/Demos/RNDISEthernet/RNDISConstants.h b/Demos/Device/RNDISEthernet/RNDISConstants.h
index 91a7e898d..91a7e898d 100644
--- a/Demos/RNDISEthernet/RNDISConstants.h
+++ b/Demos/Device/RNDISEthernet/RNDISConstants.h
diff --git a/Demos/RNDISEthernet/RNDISEthernet.aps b/Demos/Device/RNDISEthernet/RNDISEthernet.aps
index b5d21c1f9..b5d21c1f9 100644
--- a/Demos/RNDISEthernet/RNDISEthernet.aps
+++ b/Demos/Device/RNDISEthernet/RNDISEthernet.aps
diff --git a/Demos/RNDISEthernet/RNDISEthernet.c b/Demos/Device/RNDISEthernet/RNDISEthernet.c
index 3f9bb187a..3f9bb187a 100644
--- a/Demos/RNDISEthernet/RNDISEthernet.c
+++ b/Demos/Device/RNDISEthernet/RNDISEthernet.c
diff --git a/Demos/RNDISEthernet/RNDISEthernet.h b/Demos/Device/RNDISEthernet/RNDISEthernet.h
index 83e49ce84..83e49ce84 100644
--- a/Demos/RNDISEthernet/RNDISEthernet.h
+++ b/Demos/Device/RNDISEthernet/RNDISEthernet.h
diff --git a/Demos/RNDISEthernet/RNDISEthernet.txt b/Demos/Device/RNDISEthernet/RNDISEthernet.txt
index 306cf8526..306cf8526 100644
--- a/Demos/RNDISEthernet/RNDISEthernet.txt
+++ b/Demos/Device/RNDISEthernet/RNDISEthernet.txt
diff --git a/Demos/RNDISEthernet/TCP.c b/Demos/Device/RNDISEthernet/TCP.c
index b4a65344c..b4a65344c 100644
--- a/Demos/RNDISEthernet/TCP.c
+++ b/Demos/Device/RNDISEthernet/TCP.c
diff --git a/Demos/RNDISEthernet/TCP.h b/Demos/Device/RNDISEthernet/TCP.h
index 21254859e..21254859e 100644
--- a/Demos/RNDISEthernet/TCP.h
+++ b/Demos/Device/RNDISEthernet/TCP.h
diff --git a/Demos/RNDISEthernet/UDP.c b/Demos/Device/RNDISEthernet/UDP.c
index 3e1f9395b..3e1f9395b 100644
--- a/Demos/RNDISEthernet/UDP.c
+++ b/Demos/Device/RNDISEthernet/UDP.c
diff --git a/Demos/RNDISEthernet/UDP.h b/Demos/Device/RNDISEthernet/UDP.h
index 60bbe2185..60bbe2185 100644
--- a/Demos/RNDISEthernet/UDP.h
+++ b/Demos/Device/RNDISEthernet/UDP.h
diff --git a/Demos/RNDISEthernet/Webserver.c b/Demos/Device/RNDISEthernet/Webserver.c
index c07f2c8bd..c07f2c8bd 100644
--- a/Demos/RNDISEthernet/Webserver.c
+++ b/Demos/Device/RNDISEthernet/Webserver.c
diff --git a/Demos/RNDISEthernet/Webserver.h b/Demos/Device/RNDISEthernet/Webserver.h
index b2193ad1f..b2193ad1f 100644
--- a/Demos/RNDISEthernet/Webserver.h
+++ b/Demos/Device/RNDISEthernet/Webserver.h
diff --git a/Demos/RNDISEthernet/makefile b/Demos/Device/RNDISEthernet/makefile
index 8e2c781a9..1a068a033 100644
--- a/Demos/RNDISEthernet/makefile
+++ b/Demos/Device/RNDISEthernet/makefile
@@ -118,30 +118,35 @@ TARGET = RNDISEthernet
 OBJDIR = .
 
 
+# Path to the LUFA library
+LUFA_PATH = ../../..
+
+
 # List C source files here. (C dependencies are automatically generated.)
-SRC = $(TARGET).c                                          \
-      Descriptors.c                                        \
-      RNDIS.c                                              \
-	  Ethernet.c                                           \
-	  ProtocolDecoders.c                                   \
-	  ICMP.c                                               \
-	  TCP.c                                                \
-	  UDP.c                                                \
-	  DHCP.c                                               \
-	  ARP.c                                                \
-	  IP.c                                                 \
-	  Webserver.c                                          \
-      ../../LUFA/Scheduler/Scheduler.c                     \
-      ../../LUFA/Drivers/USB/LowLevel/LowLevel.c           \
-      ../../LUFA/Drivers/USB/LowLevel/Endpoint.c           \
-      ../../LUFA/Drivers/USB/LowLevel/DevChapter9.c        \
-      ../../LUFA/Drivers/USB/HighLevel/USBTask.c           \
-      ../../LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
-      ../../LUFA/Drivers/USB/HighLevel/Events.c            \
-      ../../LUFA/Drivers/USB/HighLevel/StdDescriptors.c    \
-      ../../LUFA/Drivers/AT90USBXXX/Serial_Stream.c        \
-      ../../LUFA/Drivers/AT90USBXXX/Serial.c               \
-	  
+SRC = $(TARGET).c                                                 \
+      Descriptors.c                                               \
+      RNDIS.c                                                     \
+	  Ethernet.c                                                  \
+	  ProtocolDecoders.c                                          \
+	  ICMP.c                                                      \
+	  TCP.c                                                       \
+	  UDP.c                                                       \
+	  DHCP.c                                                      \
+	  ARP.c                                                       \
+	  IP.c                                                        \
+	  Webserver.c                                                 \
+      $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c                     \
+      $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \
+      $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \
+      $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c        \
+      $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \
+      $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
+      $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \
+      $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/StdDescriptors.c    \
+      $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c        \
+      $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c               \
+
+
 # List C++ source files here. (C dependencies are automatically generated.)
 CPPSRC = 
 
@@ -173,7 +178,7 @@ DEBUG = dwarf-2
 #     Each directory must be seperated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
-EXTRAINCDIRS = ../../
+EXTRAINCDIRS = $(LUFA_PATH)/
 
 
 # Compiler flag to set the C Standard level.
diff --git a/Demos/USBtoSerial/Descriptors.c b/Demos/Device/USBtoSerial/Descriptors.c
index 03d4ed9e4..03d4ed9e4 100644
--- a/Demos/USBtoSerial/Descriptors.c
+++ b/Demos/Device/USBtoSerial/Descriptors.c
diff --git a/Demos/CDC/Descriptors.h b/Demos/Device/USBtoSerial/Descriptors.h
index bec5e40d4..bec5e40d4 100644
--- a/Demos/CDC/Descriptors.h
+++ b/Demos/Device/USBtoSerial/Descriptors.h
diff --git a/Demos/USBtoSerial/Doxygen.conf b/Demos/Device/USBtoSerial/Doxygen.conf
index 1eb8c5432..1eb8c5432 100644
--- a/Demos/USBtoSerial/Doxygen.conf
+++ b/Demos/Device/USBtoSerial/Doxygen.conf
diff --git a/Demos/USBtoSerial/LUFA USBtoSerial.inf b/Demos/Device/USBtoSerial/LUFA USBtoSerial.inf
index bd9c8bf14..bd9c8bf14 100644
--- a/Demos/USBtoSerial/LUFA USBtoSerial.inf
+++ b/Demos/Device/USBtoSerial/LUFA USBtoSerial.inf
diff --git a/Demos/USBtoSerial/RingBuff.c b/Demos/Device/USBtoSerial/RingBuff.c
index 1f477f17a..1f477f17a 100644
--- a/Demos/USBtoSerial/RingBuff.c
+++ b/Demos/Device/USBtoSerial/RingBuff.c
diff --git a/Demos/USBtoSerial/RingBuff.h b/Demos/Device/USBtoSerial/RingBuff.h
index 4b6bfde66..4b6bfde66 100644
--- a/Demos/USBtoSerial/RingBuff.h
+++ b/Demos/Device/USBtoSerial/RingBuff.h
diff --git a/Demos/USBtoSerial/USBtoSerial.aps b/Demos/Device/USBtoSerial/USBtoSerial.aps
index 2db4f97be..2db4f97be 100644
--- a/Demos/USBtoSerial/USBtoSerial.aps
+++ b/Demos/Device/USBtoSerial/USBtoSerial.aps
diff --git a/Demos/USBtoSerial/USBtoSerial.c b/Demos/Device/USBtoSerial/USBtoSerial.c
index c7c9e4b04..c7c9e4b04 100644
--- a/Demos/USBtoSerial/USBtoSerial.c
+++ b/Demos/Device/USBtoSerial/USBtoSerial.c
diff --git a/Demos/USBtoSerial/USBtoSerial.h b/Demos/Device/USBtoSerial/USBtoSerial.h
index 3fb6d7d9f..3fb6d7d9f 100644
--- a/Demos/USBtoSerial/USBtoSerial.h
+++ b/Demos/Device/USBtoSerial/USBtoSerial.h
diff --git a/Demos/USBtoSerial/USBtoSerial.txt b/Demos/Device/USBtoSerial/USBtoSerial.txt
index e33467217..e33467217 100644
--- a/Demos/USBtoSerial/USBtoSerial.txt
+++ b/Demos/Device/USBtoSerial/USBtoSerial.txt
diff --git a/Demos/USBtoSerial/makefile b/Demos/Device/USBtoSerial/makefile
index 1e820a614..62939ab60 100644
--- a/Demos/USBtoSerial/makefile
+++ b/Demos/Device/USBtoSerial/makefile
@@ -118,20 +118,25 @@ TARGET = USBtoSerial
 OBJDIR = .
 
 
+# Path to the LUFA library
+LUFA_PATH = ../../..
+
+
 # List C source files here. (C dependencies are automatically generated.)
-SRC = $(TARGET).c                                          \
-	  Descriptors.c                                        \
-	  RingBuff.c                                           \
-	  ../../LUFA/Scheduler/Scheduler.c                     \
-	  ../../LUFA/Drivers/AT90USBXXX/Serial.c               \
-	  ../../LUFA/Drivers/USB/LowLevel/LowLevel.c           \
-	  ../../LUFA/Drivers/USB/LowLevel/Endpoint.c           \
-	  ../../LUFA/Drivers/USB/LowLevel/DevChapter9.c        \
-	  ../../LUFA/Drivers/USB/HighLevel/USBTask.c           \
-	  ../../LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
-	  ../../LUFA/Drivers/USB/HighLevel/Events.c            \
-	  ../../LUFA/Drivers/USB/HighLevel/StdDescriptors.c    \
-	  
+SRC = $(TARGET).c                                                 \
+	  Descriptors.c                                               \
+	  RingBuff.c                                                  \
+	  $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c                     \
+	  $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c               \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c        \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/StdDescriptors.c    \
+
+
 # List C++ source files here. (C dependencies are automatically generated.)
 CPPSRC = 
 
@@ -163,7 +168,7 @@ DEBUG = dwarf-2
 #     Each directory must be seperated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
-EXTRAINCDIRS = ../../
+EXTRAINCDIRS = $(LUFA_PATH)/
 
 
 # Compiler flag to set the C Standard level.
diff --git a/Demos/Device/makefile b/Demos/Device/makefile
new file mode 100644
index 000000000..825825f81
--- /dev/null
+++ b/Demos/Device/makefile
@@ -0,0 +1,65 @@
+#
+#             LUFA Library
+#     Copyright (C) Dean Camera, 2009.
+#              
+#  dean [at] fourwalledcubicle [dot] com
+#      www.fourwalledcubicle.com
+#
+
+# 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.
+
+all:
+	make -C AudioInput clean
+	make -C AudioInput all
+
+	make -C AudioOutput clean
+	make -C AudioOutput all
+
+	make -C CDC clean
+	make -C CDC all
+
+	make -C DualCDC clean
+	make -C DualCDC all
+
+	make -C Joystick clean
+	make -C Joystick all
+
+	make -C Keyboard clean
+	make -C Keyboard all
+
+	make -C KeyboardMouse clean
+	make -C KeyboardMouse all
+
+	make -C MassStorage clean
+	make -C MassStorage all
+
+	make -C MIDI clean
+	make -C MIDI all
+
+	make -C Mouse clean
+	make -C Mouse all
+
+	make -C RNDISEthernet clean
+	make -C RNDISEthernet all
+
+	make -C USBtoSerial clean
+	make -C USBtoSerial all
+
+%:
+	make -C AudioInput $@
+	make -C AudioOutput $@
+	make -C CDC $@
+	make -C DualCDC $@
+	make -C Joystick $@
+	make -C Keyboard $@
+	make -C KeyboardMouse $@
+	make -C MassStorage $@
+	make -C MIDI $@
+	make -C Mouse $@
+	make -C RNDISEthernet $@
+	make -C USBtoSerial $@
diff --git a/Demos/CDCHost/CDCHost.aps b/Demos/Host/CDCHost/CDCHost.aps
index b68991cae..b68991cae 100644
--- a/Demos/CDCHost/CDCHost.aps
+++ b/Demos/Host/CDCHost/CDCHost.aps
diff --git a/Demos/CDCHost/CDCHost.c b/Demos/Host/CDCHost/CDCHost.c
index 1f05ecb1f..1f05ecb1f 100644
--- a/Demos/CDCHost/CDCHost.c
+++ b/Demos/Host/CDCHost/CDCHost.c
diff --git a/Demos/CDCHost/CDCHost.h b/Demos/Host/CDCHost/CDCHost.h
index 21b9d67ed..21b9d67ed 100644
--- a/Demos/CDCHost/CDCHost.h
+++ b/Demos/Host/CDCHost/CDCHost.h
diff --git a/Demos/CDCHost/CDCHost.txt b/Demos/Host/CDCHost/CDCHost.txt
index 39e2357ba..39e2357ba 100644
--- a/Demos/CDCHost/CDCHost.txt
+++ b/Demos/Host/CDCHost/CDCHost.txt
diff --git a/Demos/CDCHost/ConfigDescriptor.c b/Demos/Host/CDCHost/ConfigDescriptor.c
index eb80ec3ea..eb80ec3ea 100644
--- a/Demos/CDCHost/ConfigDescriptor.c
+++ b/Demos/Host/CDCHost/ConfigDescriptor.c
diff --git a/Demos/CDCHost/ConfigDescriptor.h b/Demos/Host/CDCHost/ConfigDescriptor.h
index 04d71aade..04d71aade 100644
--- a/Demos/CDCHost/ConfigDescriptor.h
+++ b/Demos/Host/CDCHost/ConfigDescriptor.h
diff --git a/Demos/CDCHost/Doxygen.conf b/Demos/Host/CDCHost/Doxygen.conf
index 320951a5f..320951a5f 100644
--- a/Demos/CDCHost/Doxygen.conf
+++ b/Demos/Host/CDCHost/Doxygen.conf
diff --git a/Demos/CDCHost/makefile b/Demos/Host/CDCHost/makefile
index 926b6967c..80b986ad5 100644
--- a/Demos/CDCHost/makefile
+++ b/Demos/Host/CDCHost/makefile
@@ -118,21 +118,26 @@ TARGET = CDCHost
 OBJDIR = .
 
 
+# Path to the LUFA library
+LUFA_PATH = ../../..
+
+
 # List C source files here. (C dependencies are automatically generated.)
-SRC = $(TARGET).c                                          \
-	  ConfigDescriptor.c                                   \
-	  ../../LUFA/Scheduler/Scheduler.c                     \
-	  ../../LUFA/Drivers/AT90USBXXX/Serial_Stream.c        \
-	  ../../LUFA/Drivers/AT90USBXXX/Serial.c               \
-	  ../../LUFA/Drivers/USB/LowLevel/LowLevel.c           \
-	  ../../LUFA/Drivers/USB/LowLevel/Pipe.c               \
-	  ../../LUFA/Drivers/USB/LowLevel/Host.c               \
-	  ../../LUFA/Drivers/USB/LowLevel/HostChapter9.c       \
-	  ../../LUFA/Drivers/USB/HighLevel/USBTask.c           \
-	  ../../LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
-	  ../../LUFA/Drivers/USB/HighLevel/Events.c            \
-	  ../../LUFA/Drivers/USB/Class/ConfigDescriptor.c      \
-	  
+SRC = $(TARGET).c                                                 \
+	  ConfigDescriptor.c                                          \
+	  $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c                     \
+	  $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c        \
+	  $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c               \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c               \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c               \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/HostChapter9.c       \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/Class/ConfigDescriptor.c      \
+
+
 # List C++ source files here. (C dependencies are automatically generated.)
 CPPSRC = 
 
@@ -164,7 +169,7 @@ DEBUG = dwarf-2
 #     Each directory must be seperated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
-EXTRAINCDIRS = ../../
+EXTRAINCDIRS = $(LUFA_PATH)/
 
 
 # Compiler flag to set the C Standard level.
diff --git a/Demos/KeyboardHost/ConfigDescriptor.c b/Demos/Host/KeyboardHost/ConfigDescriptor.c
index 9d1a630ad..9d1a630ad 100644
--- a/Demos/KeyboardHost/ConfigDescriptor.c
+++ b/Demos/Host/KeyboardHost/ConfigDescriptor.c
diff --git a/Demos/KeyboardHost/ConfigDescriptor.h b/Demos/Host/KeyboardHost/ConfigDescriptor.h
index 1d168b453..1d168b453 100644
--- a/Demos/KeyboardHost/ConfigDescriptor.h
+++ b/Demos/Host/KeyboardHost/ConfigDescriptor.h
diff --git a/Demos/KeyboardHost/Doxygen.conf b/Demos/Host/KeyboardHost/Doxygen.conf
index 3bdbc95ee..3bdbc95ee 100644
--- a/Demos/KeyboardHost/Doxygen.conf
+++ b/Demos/Host/KeyboardHost/Doxygen.conf
diff --git a/Demos/KeyboardHost/KeyboardHost.aps b/Demos/Host/KeyboardHost/KeyboardHost.aps
index f80c86dc0..f80c86dc0 100644
--- a/Demos/KeyboardHost/KeyboardHost.aps
+++ b/Demos/Host/KeyboardHost/KeyboardHost.aps
diff --git a/Demos/KeyboardHost/KeyboardHost.c b/Demos/Host/KeyboardHost/KeyboardHost.c
index 6249e5291..6249e5291 100644
--- a/Demos/KeyboardHost/KeyboardHost.c
+++ b/Demos/Host/KeyboardHost/KeyboardHost.c
diff --git a/Demos/KeyboardHost/KeyboardHost.h b/Demos/Host/KeyboardHost/KeyboardHost.h
index 8c1a70915..8c1a70915 100644
--- a/Demos/KeyboardHost/KeyboardHost.h
+++ b/Demos/Host/KeyboardHost/KeyboardHost.h
diff --git a/Demos/KeyboardHost/KeyboardHost.txt b/Demos/Host/KeyboardHost/KeyboardHost.txt
index 6d536fb86..6d536fb86 100644
--- a/Demos/KeyboardHost/KeyboardHost.txt
+++ b/Demos/Host/KeyboardHost/KeyboardHost.txt
diff --git a/Demos/KeyboardHost/makefile b/Demos/Host/KeyboardHost/makefile
index 41ce5c7a1..cb720f2bf 100644
--- a/Demos/KeyboardHost/makefile
+++ b/Demos/Host/KeyboardHost/makefile
@@ -118,21 +118,26 @@ TARGET = KeyboardHost
 OBJDIR = .
 
 
+# Path to the LUFA library
+LUFA_PATH = ../../..
+
+
 # List C source files here. (C dependencies are automatically generated.)
-SRC = $(TARGET).c                                          \
-	  ConfigDescriptor.c                                   \
-	  ../../LUFA/Scheduler/Scheduler.c                     \
-	  ../../LUFA/Drivers/AT90USBXXX/Serial_Stream.c        \
-	  ../../LUFA/Drivers/AT90USBXXX/Serial.c               \
-	  ../../LUFA/Drivers/USB/LowLevel/LowLevel.c           \
-	  ../../LUFA/Drivers/USB/LowLevel/Pipe.c               \
-	  ../../LUFA/Drivers/USB/LowLevel/Host.c               \
-	  ../../LUFA/Drivers/USB/LowLevel/HostChapter9.c       \
-	  ../../LUFA/Drivers/USB/HighLevel/USBTask.c           \
-	  ../../LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
-	  ../../LUFA/Drivers/USB/HighLevel/Events.c            \
-	  ../../LUFA/Drivers/USB/Class/ConfigDescriptor.c      \
-	  
+SRC = $(TARGET).c                                                 \
+	  ConfigDescriptor.c                                          \
+	  $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c                     \
+	  $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c        \
+	  $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c               \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c               \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c               \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/HostChapter9.c       \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/Class/ConfigDescriptor.c      \
+
+
 # List C++ source files here. (C dependencies are automatically generated.)
 CPPSRC = 
 
@@ -164,7 +169,7 @@ DEBUG = dwarf-2
 #     Each directory must be seperated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
-EXTRAINCDIRS = ../../
+EXTRAINCDIRS = $(LUFA_PATH)/
 
 
 # Compiler flag to set the C Standard level.
diff --git a/Demos/KeyboardHostWithParser/ConfigDescriptor.c b/Demos/Host/KeyboardHostWithParser/ConfigDescriptor.c
index 2c962cbcb..2c962cbcb 100644
--- a/Demos/KeyboardHostWithParser/ConfigDescriptor.c
+++ b/Demos/Host/KeyboardHostWithParser/ConfigDescriptor.c
diff --git a/Demos/KeyboardHostWithParser/ConfigDescriptor.h b/Demos/Host/KeyboardHostWithParser/ConfigDescriptor.h
index e007a942a..e007a942a 100644
--- a/Demos/KeyboardHostWithParser/ConfigDescriptor.h
+++ b/Demos/Host/KeyboardHostWithParser/ConfigDescriptor.h
diff --git a/Demos/KeyboardHostWithParser/Doxygen.conf b/Demos/Host/KeyboardHostWithParser/Doxygen.conf
index 6c6db18fa..6c6db18fa 100644
--- a/Demos/KeyboardHostWithParser/Doxygen.conf
+++ b/Demos/Host/KeyboardHostWithParser/Doxygen.conf
diff --git a/Demos/KeyboardHostWithParser/HIDReport.c b/Demos/Host/KeyboardHostWithParser/HIDReport.c
index 89bd1c866..89bd1c866 100644
--- a/Demos/KeyboardHostWithParser/HIDReport.c
+++ b/Demos/Host/KeyboardHostWithParser/HIDReport.c
diff --git a/Demos/KeyboardHostWithParser/HIDReport.h b/Demos/Host/KeyboardHostWithParser/HIDReport.h
index 5e18313f6..5e18313f6 100644
--- a/Demos/KeyboardHostWithParser/HIDReport.h
+++ b/Demos/Host/KeyboardHostWithParser/HIDReport.h
diff --git a/Demos/KeyboardHostWithParser/KeyboardHostWithParser.aps b/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.aps
index 3a51668be..3a51668be 100644
--- a/Demos/KeyboardHostWithParser/KeyboardHostWithParser.aps
+++ b/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.aps
diff --git a/Demos/KeyboardHostWithParser/KeyboardHostWithParser.c b/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.c
index f7a0087e7..f7a0087e7 100644
--- a/Demos/KeyboardHostWithParser/KeyboardHostWithParser.c
+++ b/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.c
diff --git a/Demos/KeyboardHostWithParser/KeyboardHostWithParser.h b/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.h
index fece67971..fece67971 100644
--- a/Demos/KeyboardHostWithParser/KeyboardHostWithParser.h
+++ b/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.h
diff --git a/Demos/KeyboardHostWithParser/KeyboardHostWithParser.txt b/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.txt
index cd3670673..cd3670673 100644
--- a/Demos/KeyboardHostWithParser/KeyboardHostWithParser.txt
+++ b/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.txt
diff --git a/Demos/KeyboardHostWithParser/makefile b/Demos/Host/KeyboardHostWithParser/makefile
index d3de1d19c..0a2e95eac 100644
--- a/Demos/KeyboardHostWithParser/makefile
+++ b/Demos/Host/KeyboardHostWithParser/makefile
@@ -118,23 +118,28 @@ TARGET = KeyboardHostWithParser
 OBJDIR = .
 
 
+# Path to the LUFA library
+LUFA_PATH = ../../..
+
+
 # List C source files here. (C dependencies are automatically generated.)
-SRC = $(TARGET).c                                          \
-	  ConfigDescriptor.c                                   \
-	  HIDReport.c                                          \
-	  ../../LUFA/Scheduler/Scheduler.c                     \
-	  ../../LUFA/Drivers/AT90USBXXX/Serial_Stream.c        \
-	  ../../LUFA/Drivers/AT90USBXXX/Serial.c               \
-	  ../../LUFA/Drivers/USB/Class/HIDParser.c             \
-	  ../../LUFA/Drivers/USB/Class/ConfigDescriptor.c      \
-	  ../../LUFA/Drivers/USB/LowLevel/LowLevel.c           \
-	  ../../LUFA/Drivers/USB/LowLevel/Pipe.c               \
-	  ../../LUFA/Drivers/USB/LowLevel/Host.c               \
-	  ../../LUFA/Drivers/USB/LowLevel/HostChapter9.c       \
-	  ../../LUFA/Drivers/USB/HighLevel/USBTask.c           \
-	  ../../LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
-	  ../../LUFA/Drivers/USB/HighLevel/Events.c            \
-	  
+SRC = $(TARGET).c                                                 \
+	  ConfigDescriptor.c                                          \
+	  HIDReport.c                                                 \
+	  $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c                     \
+	  $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c        \
+	  $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c               \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/Class/HIDParser.c             \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/Class/ConfigDescriptor.c      \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c               \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c               \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/HostChapter9.c       \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \
+
+
 # List C++ source files here. (C dependencies are automatically generated.)
 CPPSRC = 
 
@@ -166,7 +171,7 @@ DEBUG = dwarf-2
 #     Each directory must be seperated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
-EXTRAINCDIRS = ../../
+EXTRAINCDIRS = $(LUFA_PATH)/
 
 
 # Compiler flag to set the C Standard level.
diff --git a/Demos/MassStorageHost/ConfigDescriptor.c b/Demos/Host/MassStorageHost/ConfigDescriptor.c
index 53e448757..53e448757 100644
--- a/Demos/MassStorageHost/ConfigDescriptor.c
+++ b/Demos/Host/MassStorageHost/ConfigDescriptor.c
diff --git a/Demos/MassStorageHost/ConfigDescriptor.h b/Demos/Host/MassStorageHost/ConfigDescriptor.h
index 908cc2ba5..908cc2ba5 100644
--- a/Demos/MassStorageHost/ConfigDescriptor.h
+++ b/Demos/Host/MassStorageHost/ConfigDescriptor.h
diff --git a/Demos/MassStorageHost/Doxygen.conf b/Demos/Host/MassStorageHost/Doxygen.conf
index b154575bf..b154575bf 100644
--- a/Demos/MassStorageHost/Doxygen.conf
+++ b/Demos/Host/MassStorageHost/Doxygen.conf
diff --git a/Demos/MassStorageHost/MassStorageHost.aps b/Demos/Host/MassStorageHost/MassStorageHost.aps
index 9481b3443..9481b3443 100644
--- a/Demos/MassStorageHost/MassStorageHost.aps
+++ b/Demos/Host/MassStorageHost/MassStorageHost.aps
diff --git a/Demos/MassStorageHost/MassStorageHost.c b/Demos/Host/MassStorageHost/MassStorageHost.c
index d042b78bb..d042b78bb 100644
--- a/Demos/MassStorageHost/MassStorageHost.c
+++ b/Demos/Host/MassStorageHost/MassStorageHost.c
diff --git a/Demos/MassStorageHost/MassStorageHost.h b/Demos/Host/MassStorageHost/MassStorageHost.h
index b130cfed3..b130cfed3 100644
--- a/Demos/MassStorageHost/MassStorageHost.h
+++ b/Demos/Host/MassStorageHost/MassStorageHost.h
diff --git a/Demos/MassStorageHost/MassStorageHost.txt b/Demos/Host/MassStorageHost/MassStorageHost.txt
index 88b42e937..88b42e937 100644
--- a/Demos/MassStorageHost/MassStorageHost.txt
+++ b/Demos/Host/MassStorageHost/MassStorageHost.txt
diff --git a/Demos/MassStorageHost/MassStoreCommands.c b/Demos/Host/MassStorageHost/MassStoreCommands.c
index f4143adcf..f4143adcf 100644
--- a/Demos/MassStorageHost/MassStoreCommands.c
+++ b/Demos/Host/MassStorageHost/MassStoreCommands.c
diff --git a/Demos/MassStorageHost/MassStoreCommands.h b/Demos/Host/MassStorageHost/MassStoreCommands.h
index d3ddfeeb9..d3ddfeeb9 100644
--- a/Demos/MassStorageHost/MassStoreCommands.h
+++ b/Demos/Host/MassStorageHost/MassStoreCommands.h
diff --git a/Demos/MassStorage/SCSI_Codes.h b/Demos/Host/MassStorageHost/SCSI_Codes.h
index 2b2213de2..2b2213de2 100644
--- a/Demos/MassStorage/SCSI_Codes.h
+++ b/Demos/Host/MassStorageHost/SCSI_Codes.h
diff --git a/Demos/MassStorageHost/makefile b/Demos/Host/MassStorageHost/makefile
index de7ee3dc1..5d853e4be 100644
--- a/Demos/MassStorageHost/makefile
+++ b/Demos/Host/MassStorageHost/makefile
@@ -118,22 +118,27 @@ TARGET = MassStorageHost
 OBJDIR = .
 
 
+# Path to the LUFA library
+LUFA_PATH = ../../..
+
+
 # List C source files here. (C dependencies are automatically generated.)
-SRC = $(TARGET).c                                          \
-	  ConfigDescriptor.c                                   \
-	  MassStoreCommands.c                                  \
-	  ../../LUFA/Scheduler/Scheduler.c                     \
-	  ../../LUFA/Drivers/AT90USBXXX/Serial_Stream.c        \
-	  ../../LUFA/Drivers/AT90USBXXX/Serial.c               \
-	  ../../LUFA/Drivers/USB/Class/ConfigDescriptor.c      \
-	  ../../LUFA/Drivers/USB/LowLevel/LowLevel.c           \
-	  ../../LUFA/Drivers/USB/LowLevel/Pipe.c               \
-	  ../../LUFA/Drivers/USB/LowLevel/Host.c               \
-	  ../../LUFA/Drivers/USB/LowLevel/HostChapter9.c       \
-	  ../../LUFA/Drivers/USB/HighLevel/USBTask.c           \
-	  ../../LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
-	  ../../LUFA/Drivers/USB/HighLevel/Events.c            \
-	  
+SRC = $(TARGET).c                                                 \
+	  ConfigDescriptor.c                                          \
+	  MassStoreCommands.c                                         \
+	  $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c                     \
+	  $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c        \
+	  $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c               \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/Class/ConfigDescriptor.c      \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c               \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c               \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/HostChapter9.c       \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \
+
+
 # List C++ source files here. (C dependencies are automatically generated.)
 CPPSRC = 
 
@@ -165,7 +170,7 @@ DEBUG = dwarf-2
 #     Each directory must be seperated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
-EXTRAINCDIRS = ../../
+EXTRAINCDIRS = $(LUFA_PATH)/
 
 
 # Compiler flag to set the C Standard level.
diff --git a/Demos/MouseHost/ConfigDescriptor.c b/Demos/Host/MouseHost/ConfigDescriptor.c
index b45cc6452..b45cc6452 100644
--- a/Demos/MouseHost/ConfigDescriptor.c
+++ b/Demos/Host/MouseHost/ConfigDescriptor.c
diff --git a/Demos/MouseHost/ConfigDescriptor.h b/Demos/Host/MouseHost/ConfigDescriptor.h
index 22e733714..22e733714 100644
--- a/Demos/MouseHost/ConfigDescriptor.h
+++ b/Demos/Host/MouseHost/ConfigDescriptor.h
diff --git a/Demos/MouseHost/Doxygen.conf b/Demos/Host/MouseHost/Doxygen.conf
index 5194af375..5194af375 100644
--- a/Demos/MouseHost/Doxygen.conf
+++ b/Demos/Host/MouseHost/Doxygen.conf
diff --git a/Demos/MouseHost/MouseHost.aps b/Demos/Host/MouseHost/MouseHost.aps
index 1e40b0c6e..1e40b0c6e 100644
--- a/Demos/MouseHost/MouseHost.aps
+++ b/Demos/Host/MouseHost/MouseHost.aps
diff --git a/Demos/MouseHost/MouseHost.c b/Demos/Host/MouseHost/MouseHost.c
index 44f20b43a..44f20b43a 100644
--- a/Demos/MouseHost/MouseHost.c
+++ b/Demos/Host/MouseHost/MouseHost.c
diff --git a/Demos/MouseHost/MouseHost.h b/Demos/Host/MouseHost/MouseHost.h
index b72e09cd2..b72e09cd2 100644
--- a/Demos/MouseHost/MouseHost.h
+++ b/Demos/Host/MouseHost/MouseHost.h
diff --git a/Demos/MouseHost/MouseHost.txt b/Demos/Host/MouseHost/MouseHost.txt
index d36c7313e..d36c7313e 100644
--- a/Demos/MouseHost/MouseHost.txt
+++ b/Demos/Host/MouseHost/MouseHost.txt
diff --git a/Demos/MouseHost/makefile b/Demos/Host/MouseHost/makefile
index bbdb548fe..65c9dd676 100644
--- a/Demos/MouseHost/makefile
+++ b/Demos/Host/MouseHost/makefile
@@ -118,21 +118,26 @@ TARGET = MouseHost
 OBJDIR = .
 
 
+# Path to the LUFA library
+LUFA_PATH = ../../..
+
+
 # List C source files here. (C dependencies are automatically generated.)
-SRC = $(TARGET).c                                          \
-	  ConfigDescriptor.c                                   \
-	  ../../LUFA/Scheduler/Scheduler.c                     \
-	  ../../LUFA/Drivers/AT90USBXXX/Serial_Stream.c        \
-	  ../../LUFA/Drivers/AT90USBXXX/Serial.c               \
-	  ../../LUFA/Drivers/USB/LowLevel/LowLevel.c           \
-	  ../../LUFA/Drivers/USB/LowLevel/Pipe.c               \
-	  ../../LUFA/Drivers/USB/LowLevel/Host.c               \
-	  ../../LUFA/Drivers/USB/LowLevel/HostChapter9.c       \
-	  ../../LUFA/Drivers/USB/HighLevel/USBTask.c           \
-	  ../../LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
-	  ../../LUFA/Drivers/USB/HighLevel/Events.c            \
-	  ../../LUFA/Drivers/USB/Class/ConfigDescriptor.c      \
-	  
+SRC = $(TARGET).c                                                 \
+	  ConfigDescriptor.c                                          \
+	  $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c                     \
+	  $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c        \
+	  $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c               \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c               \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c               \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/HostChapter9.c       \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/Class/ConfigDescriptor.c      \
+
+
 # List C++ source files here. (C dependencies are automatically generated.)
 CPPSRC = 
 
@@ -164,7 +169,7 @@ DEBUG = dwarf-2
 #     Each directory must be seperated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
-EXTRAINCDIRS = ../../
+EXTRAINCDIRS = $(LUFA_PATH)/
 
 
 # Compiler flag to set the C Standard level.
diff --git a/Demos/MouseHostWithParser/ConfigDescriptor.c b/Demos/Host/MouseHostWithParser/ConfigDescriptor.c
index 31e1aa13e..31e1aa13e 100644
--- a/Demos/MouseHostWithParser/ConfigDescriptor.c
+++ b/Demos/Host/MouseHostWithParser/ConfigDescriptor.c
diff --git a/Demos/MouseHostWithParser/ConfigDescriptor.h b/Demos/Host/MouseHostWithParser/ConfigDescriptor.h
index 971bdfeef..971bdfeef 100644
--- a/Demos/MouseHostWithParser/ConfigDescriptor.h
+++ b/Demos/Host/MouseHostWithParser/ConfigDescriptor.h
diff --git a/Demos/MouseHostWithParser/Doxygen.conf b/Demos/Host/MouseHostWithParser/Doxygen.conf
index f3f45e313..f3f45e313 100644
--- a/Demos/MouseHostWithParser/Doxygen.conf
+++ b/Demos/Host/MouseHostWithParser/Doxygen.conf
diff --git a/Demos/MouseHostWithParser/HIDReport.c b/Demos/Host/MouseHostWithParser/HIDReport.c
index 55f250dd9..55f250dd9 100644
--- a/Demos/MouseHostWithParser/HIDReport.c
+++ b/Demos/Host/MouseHostWithParser/HIDReport.c
diff --git a/Demos/MouseHostWithParser/HIDReport.h b/Demos/Host/MouseHostWithParser/HIDReport.h
index 8ebb97da1..8ebb97da1 100644
--- a/Demos/MouseHostWithParser/HIDReport.h
+++ b/Demos/Host/MouseHostWithParser/HIDReport.h
diff --git a/Demos/MouseHostWithParser/MouseHostWithParser.aps b/Demos/Host/MouseHostWithParser/MouseHostWithParser.aps
index 81d82eba8..81d82eba8 100644
--- a/Demos/MouseHostWithParser/MouseHostWithParser.aps
+++ b/Demos/Host/MouseHostWithParser/MouseHostWithParser.aps
diff --git a/Demos/MouseHostWithParser/MouseHostWithParser.c b/Demos/Host/MouseHostWithParser/MouseHostWithParser.c
index 5ccda4912..5ccda4912 100644
--- a/Demos/MouseHostWithParser/MouseHostWithParser.c
+++ b/Demos/Host/MouseHostWithParser/MouseHostWithParser.c
diff --git a/Demos/MouseHostWithParser/MouseHostWithParser.h b/Demos/Host/MouseHostWithParser/MouseHostWithParser.h
index b59ab9a78..b59ab9a78 100644
--- a/Demos/MouseHostWithParser/MouseHostWithParser.h
+++ b/Demos/Host/MouseHostWithParser/MouseHostWithParser.h
diff --git a/Demos/MouseHostWithParser/MouseHostWithParser.txt b/Demos/Host/MouseHostWithParser/MouseHostWithParser.txt
index 3c83341a2..3c83341a2 100644
--- a/Demos/MouseHostWithParser/MouseHostWithParser.txt
+++ b/Demos/Host/MouseHostWithParser/MouseHostWithParser.txt
diff --git a/Demos/MouseHostWithParser/makefile b/Demos/Host/MouseHostWithParser/makefile
index bc5e28d34..bc4ca6ca2 100644
--- a/Demos/MouseHostWithParser/makefile
+++ b/Demos/Host/MouseHostWithParser/makefile
@@ -118,23 +118,28 @@ TARGET = MouseHostWithParser
 OBJDIR = .
 
 
+# Path to the LUFA library
+LUFA_PATH = ../../..
+
+
 # List C source files here. (C dependencies are automatically generated.)
-SRC = $(TARGET).c                                          \
-	  ConfigDescriptor.c                                   \
-	  HIDReport.c                                          \
-	  ../../LUFA/Scheduler/Scheduler.c                     \
-	  ../../LUFA/Drivers/AT90USBXXX/Serial_Stream.c        \
-	  ../../LUFA/Drivers/AT90USBXXX/Serial.c               \
-	  ../../LUFA/Drivers/USB/Class/HIDParser.c             \
-	  ../../LUFA/Drivers/USB/Class/ConfigDescriptor.c      \
-	  ../../LUFA/Drivers/USB/LowLevel/LowLevel.c           \
-	  ../../LUFA/Drivers/USB/LowLevel/Pipe.c               \
-	  ../../LUFA/Drivers/USB/LowLevel/Host.c               \
-	  ../../LUFA/Drivers/USB/LowLevel/HostChapter9.c       \
-	  ../../LUFA/Drivers/USB/HighLevel/USBTask.c           \
-	  ../../LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
-	  ../../LUFA/Drivers/USB/HighLevel/Events.c            \
-	  
+SRC = $(TARGET).c                                                 \
+	  ConfigDescriptor.c                                          \
+	  HIDReport.c                                                 \
+	  $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c                     \
+	  $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c        \
+	  $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c               \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/Class/HIDParser.c             \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/Class/ConfigDescriptor.c      \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c               \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c               \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/HostChapter9.c       \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \
+
+
 # List C++ source files here. (C dependencies are automatically generated.)
 CPPSRC = 
 
@@ -166,7 +171,7 @@ DEBUG = dwarf-2
 #     Each directory must be seperated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
-EXTRAINCDIRS = ../../
+EXTRAINCDIRS = $(LUFA_PATH)/
 
 
 # Compiler flag to set the C Standard level.
diff --git a/Demos/StillImageHost/ConfigDescriptor.c b/Demos/Host/StillImageHost/ConfigDescriptor.c
index a336c1f5e..a336c1f5e 100644
--- a/Demos/StillImageHost/ConfigDescriptor.c
+++ b/Demos/Host/StillImageHost/ConfigDescriptor.c
diff --git a/Demos/StillImageHost/ConfigDescriptor.h b/Demos/Host/StillImageHost/ConfigDescriptor.h
index f791488b1..f791488b1 100644
--- a/Demos/StillImageHost/ConfigDescriptor.h
+++ b/Demos/Host/StillImageHost/ConfigDescriptor.h
diff --git a/Demos/StillImageHost/Doxygen.conf b/Demos/Host/StillImageHost/Doxygen.conf
index d3a494a5f..d3a494a5f 100644
--- a/Demos/StillImageHost/Doxygen.conf
+++ b/Demos/Host/StillImageHost/Doxygen.conf
diff --git a/Demos/StillImageHost/PIMACodes.h b/Demos/Host/StillImageHost/PIMACodes.h
index 38755aba8..38755aba8 100644
--- a/Demos/StillImageHost/PIMACodes.h
+++ b/Demos/Host/StillImageHost/PIMACodes.h
diff --git a/Demos/StillImageHost/StillImageCommands.c b/Demos/Host/StillImageHost/StillImageCommands.c
index 969ff5af6..969ff5af6 100644
--- a/Demos/StillImageHost/StillImageCommands.c
+++ b/Demos/Host/StillImageHost/StillImageCommands.c
diff --git a/Demos/StillImageHost/StillImageCommands.h b/Demos/Host/StillImageHost/StillImageCommands.h
index 5679deae2..5679deae2 100644
--- a/Demos/StillImageHost/StillImageCommands.h
+++ b/Demos/Host/StillImageHost/StillImageCommands.h
diff --git a/Demos/StillImageHost/StillImageHost.aps b/Demos/Host/StillImageHost/StillImageHost.aps
index cf2f1d8ea..cf2f1d8ea 100644
--- a/Demos/StillImageHost/StillImageHost.aps
+++ b/Demos/Host/StillImageHost/StillImageHost.aps
diff --git a/Demos/StillImageHost/StillImageHost.c b/Demos/Host/StillImageHost/StillImageHost.c
index 50b2054df..50b2054df 100644
--- a/Demos/StillImageHost/StillImageHost.c
+++ b/Demos/Host/StillImageHost/StillImageHost.c
diff --git a/Demos/StillImageHost/StillImageHost.h b/Demos/Host/StillImageHost/StillImageHost.h
index 7757b0807..7757b0807 100644
--- a/Demos/StillImageHost/StillImageHost.h
+++ b/Demos/Host/StillImageHost/StillImageHost.h
diff --git a/Demos/StillImageHost/StillImageHost.txt b/Demos/Host/StillImageHost/StillImageHost.txt
index 4cdfe6346..4cdfe6346 100644
--- a/Demos/StillImageHost/StillImageHost.txt
+++ b/Demos/Host/StillImageHost/StillImageHost.txt
diff --git a/Demos/StillImageHost/makefile b/Demos/Host/StillImageHost/makefile
index df81e4842..e34c18f39 100644
--- a/Demos/StillImageHost/makefile
+++ b/Demos/Host/StillImageHost/makefile
@@ -117,22 +117,27 @@ TARGET = StillImageHost
 OBJDIR = .
 
 
+# Path to the LUFA library
+LUFA_PATH = ../../..
+
+
 # List C source files here. (C dependencies are automatically generated.)
-SRC = $(TARGET).c                                          \
-	  ConfigDescriptor.c                                   \
-	  StillImageCommands.c                                 \
-	  ../../LUFA/Scheduler/Scheduler.c                     \
-	  ../../LUFA/Drivers/AT90USBXXX/Serial_Stream.c        \
-	  ../../LUFA/Drivers/AT90USBXXX/Serial.c               \
-	  ../../LUFA/Drivers/USB/LowLevel/LowLevel.c           \
-	  ../../LUFA/Drivers/USB/LowLevel/Pipe.c               \
-	  ../../LUFA/Drivers/USB/LowLevel/Host.c               \
-	  ../../LUFA/Drivers/USB/LowLevel/HostChapter9.c       \
-	  ../../LUFA/Drivers/USB/HighLevel/USBTask.c           \
-	  ../../LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
-	  ../../LUFA/Drivers/USB/HighLevel/Events.c            \
-	  ../../LUFA/Drivers/USB/Class/ConfigDescriptor.c      \
-	  
+SRC = $(TARGET).c                                                 \
+	  ConfigDescriptor.c                                          \
+	  StillImageCommands.c                                        \
+	  $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c                     \
+	  $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c        \
+	  $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c               \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c               \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c               \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/HostChapter9.c       \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/Class/ConfigDescriptor.c      \
+
+
 # List C++ source files here. (C dependencies are automatically generated.)
 CPPSRC = 
 
@@ -164,7 +169,7 @@ DEBUG = dwarf-2
 #     Each directory must be seperated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
-EXTRAINCDIRS = ../../
+EXTRAINCDIRS = $(LUFA_PATH)/
 
 
 # Compiler flag to set the C Standard level.
diff --git a/Demos/Host/makefile b/Demos/Host/makefile
new file mode 100644
index 000000000..6e4313390
--- /dev/null
+++ b/Demos/Host/makefile
@@ -0,0 +1,42 @@
+#
+#             LUFA Library
+#     Copyright (C) Dean Camera, 2009.
+#              
+#  dean [at] fourwalledcubicle [dot] com
+#      www.fourwalledcubicle.com
+#
+
+# Makefile to build all the LUFA Host Demos. Call with "make all" to
+# rebuild all Host demos.
+
+# Projects are pre-cleaned before each one is built, to ensure any
+# custom LUFA library build options are reflected in the compiled
+# code.
+
+all:
+	make -C CDCHost clean
+	make -C CDCHost all	
+
+	make -C KeyboardHost clean
+	make -C KeyboardHostWithParser all	
+
+	make -C MassStorageHost clean
+	make -C MassStorageHost all	
+
+	make -C MouseHost clean
+	make -C MouseHost all	
+
+	make -C MouseHostWithParser clean
+	make -C MouseHostWithParser all	
+
+	make -C StillImageHost clean
+	make -C StillImageHost all	
+
+%:
+	make -C CDCHost $@
+	make -C KeyboardHost $@
+	make -C KeyboardHostWithParser $@
+	make -C MassStorageHost $@
+	make -C MouseHost $@
+	make -C MouseHostWithParser $@
+	make -C StillImageHost $@
diff --git a/Demos/TestApp/Descriptors.c b/Demos/OTG/TestApp/Descriptors.c
index fc56660be..fc56660be 100644
--- a/Demos/TestApp/Descriptors.c
+++ b/Demos/OTG/TestApp/Descriptors.c
diff --git a/Demos/TestApp/Descriptors.h b/Demos/OTG/TestApp/Descriptors.h
index 88c0a5e7e..88c0a5e7e 100644
--- a/Demos/TestApp/Descriptors.h
+++ b/Demos/OTG/TestApp/Descriptors.h
diff --git a/Demos/TestApp/Doxygen.conf b/Demos/OTG/TestApp/Doxygen.conf
index 80e1b7e4a..80e1b7e4a 100644
--- a/Demos/TestApp/Doxygen.conf
+++ b/Demos/OTG/TestApp/Doxygen.conf
diff --git a/Demos/TestApp/TestApp.aps b/Demos/OTG/TestApp/TestApp.aps
index 6939268c9..6939268c9 100644
--- a/Demos/TestApp/TestApp.aps
+++ b/Demos/OTG/TestApp/TestApp.aps
diff --git a/Demos/TestApp/TestApp.c b/Demos/OTG/TestApp/TestApp.c
index a66a728c9..a66a728c9 100644
--- a/Demos/TestApp/TestApp.c
+++ b/Demos/OTG/TestApp/TestApp.c
diff --git a/Demos/TestApp/TestApp.h b/Demos/OTG/TestApp/TestApp.h
index cb262397d..cb262397d 100644
--- a/Demos/TestApp/TestApp.h
+++ b/Demos/OTG/TestApp/TestApp.h
diff --git a/Demos/TestApp/TestApp.txt b/Demos/OTG/TestApp/TestApp.txt
index aef55b761..aef55b761 100644
--- a/Demos/TestApp/TestApp.txt
+++ b/Demos/OTG/TestApp/TestApp.txt
diff --git a/Demos/TestApp/TestEvents.c b/Demos/OTG/TestApp/TestEvents.c
index 8f05b8208..8f05b8208 100644
--- a/Demos/TestApp/TestEvents.c
+++ b/Demos/OTG/TestApp/TestEvents.c
diff --git a/Demos/TestApp/TestEvents.h b/Demos/OTG/TestApp/TestEvents.h
index 6ba06aed8..6ba06aed8 100644
--- a/Demos/TestApp/TestEvents.h
+++ b/Demos/OTG/TestApp/TestEvents.h
diff --git a/Demos/TestApp/makefile b/Demos/OTG/TestApp/makefile
index ac2e6053e..0d1983175 100644
--- a/Demos/TestApp/makefile
+++ b/Demos/OTG/TestApp/makefile
@@ -118,26 +118,31 @@ TARGET = TestApp
 OBJDIR = .
 
 
+# Path to the LUFA library
+LUFA_PATH = ../../..
+
+
 # List C source files here. (C dependencies are automatically generated.)
-SRC = $(TARGET).c                                          \
-	  TestEvents.c                                         \
-	  Descriptors.c                                        \
-	  ../../LUFA/Scheduler/Scheduler.c                     \
-	  ../../LUFA/MemoryAllocator/DynAlloc.c                \
-	  ../../LUFA/Drivers/Board/Temperature.c               \
-	  ../../LUFA/Drivers/AT90USBXXX/Serial_Stream.c        \
-	  ../../LUFA/Drivers/AT90USBXXX/Serial.c               \
-	  ../../LUFA/Drivers/USB/LowLevel/LowLevel.c           \
-	  ../../LUFA/Drivers/USB/LowLevel/Endpoint.c           \
-	  ../../LUFA/Drivers/USB/LowLevel/Pipe.c               \
-	  ../../LUFA/Drivers/USB/LowLevel/DevChapter9.c        \
-	  ../../LUFA/Drivers/USB/LowLevel/HostChapter9.c       \
-	  ../../LUFA/Drivers/USB/LowLevel/Host.c               \
-	  ../../LUFA/Drivers/USB/HighLevel/USBTask.c           \
-	  ../../LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
-	  ../../LUFA/Drivers/USB/HighLevel/Events.c            \
-	  ../../LUFA/Drivers/USB/HighLevel/StdDescriptors.c    \
-	  
+SRC = $(TARGET).c                                                 \
+	  TestEvents.c                                                \
+	  Descriptors.c                                               \
+	  $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c                     \
+	  $(LUFA_PATH)/LUFA/MemoryAllocator/DynAlloc.c                \
+	  $(LUFA_PATH)/LUFA/Drivers/Board/Temperature.c               \
+	  $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c        \
+	  $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c               \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c               \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c        \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/HostChapter9.c       \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c               \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \
+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/StdDescriptors.c    \
+
+
 # List C++ source files here. (C dependencies are automatically generated.)
 CPPSRC = 
 
@@ -169,7 +174,7 @@ DEBUG = dwarf-2
 #     Each directory must be seperated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
-EXTRAINCDIRS = ../../
+EXTRAINCDIRS = $(LUFA_PATH)/
 
 
 # Compiler flag to set the C Standard level.
diff --git a/Demos/OTG/makefile b/Demos/OTG/makefile
new file mode 100644
index 000000000..44596749d
--- /dev/null
+++ b/Demos/OTG/makefile
@@ -0,0 +1,21 @@
+#
+#             LUFA Library
+#     Copyright (C) Dean Camera, 2009.
+#              
+#  dean [at] fourwalledcubicle [dot] com
+#      www.fourwalledcubicle.com
+#
+
+# Makefile to build all the LUFA OTG Demos. Call with "make all" to
+# rebuild all OTG demos.
+
+# Projects are pre-cleaned before each one is built, to ensure any
+# custom LUFA library build options are reflected in the compiled
+# code.
+
+all:
+	make -C TestApp clean
+	make -C TestApp all	
+
+%:
+	make -C TestApp $@
+\ No newline at end of file
diff --git a/Demos/makefile b/Demos/makefile
index 67d1b8cdf..cb624f412 100644
--- a/Demos/makefile
+++ b/Demos/makefile
@@ -13,85 +13,7 @@
 # custom LUFA library build options are reflected in the compiled
 # code.
 
-all:
-	make -C AudioInput clean
-	make -C AudioInput all
-
-	make -C AudioOutput clean
-	make -C AudioOutput all
-
-	make -C CDC clean
-	make -C CDC all
-
-	make -C CDCHost clean
-	make -C CDCHost all
-
-	make -C DualCDC clean
-	make -C DualCDC all
-
-	make -C Joystick clean
-	make -C Joystick all
-
-	make -C KeyboardMouse clean
-	make -C KeyboardMouse all
-
-	make -C Keyboard clean
-	make -C Keyboard all
-
-	make -C KeyboardHost clean
-	make -C KeyboardHost all
-	
-	make -C KeyboardHostWithParser clean
-	make -C KeyboardHostWithParser all
-
-	make -C MassStorage clean
-	make -C MassStorage all
-
-	make -C MassStorageHost clean
-	make -C MassStorageHost all
-
-	make -C MIDI clean
-	make -C MIDI all
-
-	make -C Mouse clean
-	make -C Mouse all
-	
-	make -C MouseHost clean
-	make -C MouseHost all
-
-	make -C MouseHostWithParser clean
-	make -C MouseHostWithParser all
-
-	make -C RNDISEthernet clean
-	make -C RNDISEthernet all
-
-	make -C StillImageHost clean
-	make -C StillImageHost all
-
-	make -C TestApp clean
-	make -C TestApp all
-
-	make -C USBtoSerial clean
-	make -C USBtoSerial all
-
 %:
-	make -C AudioInput $@
-	make -C AudioOutput $@
-	make -C CDC $@
-	make -C CDCHost $@
-	make -C DualCDC $@
-	make -C Joystick $@
-	make -C KeyboardMouse $@
-	make -C Keyboard $@
-	make -C KeyboardHost $@
-	make -C KeyboardHostWithParser $@
-	make -C MassStorage $@
-	make -C MassStorageHost $@
-	make -C MIDI $@
-	make -C Mouse $@
-	make -C MouseHost $@
-	make -C MouseHostWithParser $@
-	make -C RNDISEthernet $@
-	make -C StillImageHost $@
-	make -C TestApp $@
-	make -C USBtoSerial $@
-\ No newline at end of file
+	make -C Device/ $@
+	make -C Host/ $@
+	make -C OTG/ $@
author	Dean Camera <dean@fourwalledcubicle.com>	2009-03-20 06:34:41 +0000
committer	Dean Camera <dean@fourwalledcubicle.com>	2009-03-20 06:34:41 +0000
commit	ed031c1df2f5b053b9cd9f48c63e66a42b7c049e (patch)
tree	8e49d639484d53a6e00700b20e2b804e9775242f /Demos
parent	ecf7538430c01b95104682f0f7493e57b9168125 (diff)
download	lufa-ed031c1df2f5b053b9cd9f48c63e66a42b7c049e.tar.gz lufa-ed031c1df2f5b053b9cd9f48c63e66a42b7c049e.tar.bz2 lufa-ed031c1df2f5b053b9cd9f48c63e66a42b7c049e.zip