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.

git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@475 d5102386-fcda-11dd-9fdb-3debd5008f28
author: Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> 2009-03-20 06:34:41 +0000
committer: Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> 2009-03-20 06:34:41 +0000
commit: ceb698fdde8358f6e04c53e77a3f0d08e306d02b (patch)
tree: 8e49d639484d53a6e00700b20e2b804e9775242f
parent: 0ed9598a9aab0e947ecc766559debd2aa58ea36d (diff)
209 files changed, 522 insertions, 372 deletions
diff --git a/Demos/AudioInput/AudioInput.aps b/Demos/Device/AudioInput/AudioInput.aps
index aed850ae..aed850ae 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 f41306f3..f41306f3 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 02c83803..02c83803 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 36e71e97..36e71e97 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 7a3e4288..7a3e4288 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 cc007498..cc007498 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 f84efb7b..f84efb7b 100644
--- a/Demos/AudioInput/Doxygen.conf
+++ b/Demos/Device/AudioInput/Doxygen.conf
diff --git a/Demos/AudioInput/makefile b/Demos/Device/AudioInput/makefile
index ff2d83f9..95297d79 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 a01ba8f1..a01ba8f1 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 0f390f00..0f390f00 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 0ad9e5bf..0ad9e5bf 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 0638c47f..0638c47f 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 169e534b..169e534b 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 99f10d64..99f10d64 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 114137e1..114137e1 100644
--- a/Demos/AudioOutput/Doxygen.conf
+++ b/Demos/Device/AudioOutput/Doxygen.conf
diff --git a/Demos/AudioOutput/makefile b/Demos/Device/AudioOutput/makefile
index af99358f..7ecd9009 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 83dde595..83dde595 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 6e933d58..6e933d58 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 d953303f..d953303f 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 8e13b55b..8e13b55b 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 fa0c79da..fa0c79da 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 bec5e40d..bec5e40d 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 3493347c..3493347c 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 d9d9ed63..d9d9ed63 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 6547dc80..6f27fb92 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 4f74b138..4f74b138 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 7bbe52fe..7bbe52fe 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 7b3b7417..7b3b7417 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 276e7435..276e7435 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 3c598da4..3c598da4 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 4c62abf9..4c62abf9 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 6e086029..6e086029 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 10ba560f..10ba560f 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 08433130..b2a8d9e0 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 36e644c2..36e644c2 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 3463d962..3463d962 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 2af5ce68..2af5ce68 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 245245da..245245da 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 cd882270..cd882270 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 79c7e498..79c7e498 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 7d47ae92..7d47ae92 100644
--- a/Demos/Joystick/Joystick.txt
+++ b/Demos/Device/Joystick/Joystick.txt
diff --git a/Demos/Joystick/makefile b/Demos/Device/Joystick/makefile
index e29a3a50..8c645747 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 1f383ab0..1f383ab0 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 aa1bf05b..aa1bf05b 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 79a300ae..79a300ae 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 541c1750..541c1750 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 d6b254ff..d6b254ff 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 143ffc65..143ffc65 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 a09d8350..a09d8350 100644
--- a/Demos/Keyboard/Keyboard.txt
+++ b/Demos/Device/Keyboard/Keyboard.txt
diff --git a/Demos/Keyboard/makefile b/Demos/Device/Keyboard/makefile
index fde8ce0a..9f738ce0 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 c9d91039..c9d91039 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 59495425..59495425 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 12916856..12916856 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 eb54f1d4..eb54f1d4 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 3ee101b8..3ee101b8 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 9794159f..9794159f 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 6388e980..6388e980 100644
--- a/Demos/KeyboardMouse/KeyboardMouse.txt
+++ b/Demos/Device/KeyboardMouse/KeyboardMouse.txt
diff --git a/Demos/KeyboardMouse/makefile b/Demos/Device/KeyboardMouse/makefile
index d411fc4a..59d676f0 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 1dbc1d91..1dbc1d91 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 f80e58b2..f80e58b2 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 7d36de8e..7d36de8e 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 e61e7701..e61e7701 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 c0e4f9df..c0e4f9df 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 733a7bae..733a7bae 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 3eb60cdc..3eb60cdc 100644
--- a/Demos/MIDI/MIDI.txt
+++ b/Demos/Device/MIDI/MIDI.txt
diff --git a/Demos/MIDI/makefile b/Demos/Device/MIDI/makefile
index ecd4215c..09bd0c28 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 7b02ed6c..7b02ed6c 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 1332fd3a..1332fd3a 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 a6173156..a6173156 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 a64d72e9..a64d72e9 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 a7b90016..a7b90016 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 483bc4ca..483bc4ca 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 92e33073..92e33073 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 a30e7f74..a30e7f74 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 4e8adadb..4e8adadb 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 d9c55269..d9c55269 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 a0be3900..a0be3900 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 2b2213de..2b2213de 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 65285253..a25c2335 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 dac048b9..dac048b9 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 1fcee721..1fcee721 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 62c4db11..62c4db11 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 3ae16379..3ae16379 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 c066d424..c066d424 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 c9854a8f..c9854a8f 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 6764275c..6764275c 100644
--- a/Demos/Mouse/Mouse.txt
+++ b/Demos/Device/Mouse/Mouse.txt
diff --git a/Demos/Mouse/makefile b/Demos/Device/Mouse/makefile
index 27ca1d80..1dc0c663 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 3560403f..3560403f 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 8551df85..8551df85 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 7f220c42..7f220c42 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 f1e14e19..f1e14e19 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 1994c601..1994c601 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 070c118d..070c118d 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 9d7973b7..9d7973b7 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 b8d56150..b8d56150 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 23fc325a..23fc325a 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 3ff3433a..3ff3433a 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 a1556405..a1556405 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 b20a557e..b20a557e 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 65875bb0..65875bb0 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 119d219e..119d219e 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 a124afec..a124afec 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 f0e6ebba..f0e6ebba 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 06e4c0ad..06e4c0ad 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 ee0c8c34..ee0c8c34 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 7c75875c..7c75875c 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 91a7e898..91a7e898 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 b5d21c1f..b5d21c1f 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 3f9bb187..3f9bb187 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 83e49ce8..83e49ce8 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 306cf852..306cf852 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 b4a65344..b4a65344 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 21254859..21254859 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 3e1f9395..3e1f9395 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 60bbe218..60bbe218 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 c07f2c8b..c07f2c8b 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 b2193ad1..b2193ad1 100644
--- a/Demos/RNDISEthernet/Webserver.h
+++ b/Demos/Device/RNDISEthernet/Webserver.h
diff --git a/Demos/RNDISEthernet/makefile b/Demos/Device/RNDISEthernet/makefile
index 8e2c781a..1a068a03 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 03d4ed9e..03d4ed9e 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 bec5e40d..bec5e40d 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 1eb8c543..1eb8c543 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 bd9c8bf1..bd9c8bf1 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 1f477f17..1f477f17 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 4b6bfde6..4b6bfde6 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 2db4f97b..2db4f97b 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 c7c9e4b0..c7c9e4b0 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 3fb6d7d9..3fb6d7d9 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 e3346721..e3346721 100644
--- a/Demos/USBtoSerial/USBtoSerial.txt
+++ b/Demos/Device/USBtoSerial/USBtoSerial.txt
diff --git a/Demos/USBtoSerial/makefile b/Demos/Device/USBtoSerial/makefile
index 1e820a61..62939ab6 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 00000000..825825f8
--- /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 b68991ca..b68991ca 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 1f05ecb1..1f05ecb1 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 21b9d67e..21b9d67e 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 39e2357b..39e2357b 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 eb80ec3e..eb80ec3e 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 04d71aad..04d71aad 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 320951a5..320951a5 100644
--- a/Demos/CDCHost/Doxygen.conf
+++ b/Demos/Host/CDCHost/Doxygen.conf
diff --git a/Demos/CDCHost/makefile b/Demos/Host/CDCHost/makefile
index 926b6967..80b986ad 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 9d1a630a..9d1a630a 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 1d168b45..1d168b45 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 3bdbc95e..3bdbc95e 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 f80c86dc..f80c86dc 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 6249e529..6249e529 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 8c1a7091..8c1a7091 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 6d536fb8..6d536fb8 100644
--- a/Demos/KeyboardHost/KeyboardHost.txt
+++ b/Demos/Host/KeyboardHost/KeyboardHost.txt
diff --git a/Demos/KeyboardHost/makefile b/Demos/Host/KeyboardHost/makefile
index 41ce5c7a..cb720f2b 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 2c962cbc..2c962cbc 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 e007a942..e007a942 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 6c6db18f..6c6db18f 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 89bd1c86..89bd1c86 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 5e18313f..5e18313f 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 3a51668b..3a51668b 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 f7a0087e..f7a0087e 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 fece6797..fece6797 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 cd367067..cd367067 100644
--- a/Demos/KeyboardHostWithParser/KeyboardHostWithParser.txt
+++ b/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.txt
diff --git a/Demos/KeyboardHostWithParser/makefile b/Demos/Host/KeyboardHostWithParser/makefile
index d3de1d19..0a2e95ea 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 53e44875..53e44875 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 908cc2ba..908cc2ba 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 b154575b..b154575b 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 9481b344..9481b344 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 d042b78b..d042b78b 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 b130cfed..b130cfed 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 88b42e93..88b42e93 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 f4143adc..f4143adc 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 d3ddfeeb..d3ddfeeb 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 2b2213de..2b2213de 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 de7ee3dc..5d853e4b 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 b45cc645..b45cc645 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 22e73371..22e73371 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 5194af37..5194af37 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 1e40b0c6..1e40b0c6 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 44f20b43..44f20b43 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 b72e09cd..b72e09cd 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 d36c7313..d36c7313 100644
--- a/Demos/MouseHost/MouseHost.txt
+++ b/Demos/Host/MouseHost/MouseHost.txt
diff --git a/Demos/MouseHost/makefile b/Demos/Host/MouseHost/makefile
index bbdb548f..65c9dd67 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 31e1aa13..31e1aa13 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 971bdfee..971bdfee 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 f3f45e31..f3f45e31 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 55f250dd..55f250dd 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 8ebb97da..8ebb97da 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 81d82eba..81d82eba 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 5ccda491..5ccda491 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 b59ab9a7..b59ab9a7 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 3c83341a..3c83341a 100644
--- a/Demos/MouseHostWithParser/MouseHostWithParser.txt
+++ b/Demos/Host/MouseHostWithParser/MouseHostWithParser.txt
diff --git a/Demos/MouseHostWithParser/makefile b/Demos/Host/MouseHostWithParser/makefile
index bc5e28d3..bc4ca6ca 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 a336c1f5..a336c1f5 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 f791488b..f791488b 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 d3a494a5..d3a494a5 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 38755aba..38755aba 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 969ff5af..969ff5af 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 5679deae..5679deae 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 cf2f1d8e..cf2f1d8e 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 50b2054d..50b2054d 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 7757b080..7757b080 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 4cdfe634..4cdfe634 100644
--- a/Demos/StillImageHost/StillImageHost.txt
+++ b/Demos/Host/StillImageHost/StillImageHost.txt
diff --git a/Demos/StillImageHost/makefile b/Demos/Host/StillImageHost/makefile
index df81e484..e34c18f3 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 00000000..6e431339
--- /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 fc56660b..fc56660b 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 88c0a5e7..88c0a5e7 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 80e1b7e4..80e1b7e4 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 6939268c..6939268c 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 a66a728c..a66a728c 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 cb262397..cb262397 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 aef55b76..aef55b76 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 8f05b820..8f05b820 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 6ba06aed..6ba06aed 100644
--- a/Demos/TestApp/TestEvents.h
+++ b/Demos/OTG/TestApp/TestEvents.h
diff --git a/Demos/TestApp/makefile b/Demos/OTG/TestApp/makefile
index ac2e6053..0d198317 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 00000000..44596749
--- /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 67d1b8cd..cb624f41 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 <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28>	2009-03-20 06:34:41 +0000
committer	Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28>	2009-03-20 06:34:41 +0000
commit	ceb698fdde8358f6e04c53e77a3f0d08e306d02b (patch)
tree	8e49d639484d53a6e00700b20e2b804e9775242f
parent	0ed9598a9aab0e947ecc766559debd2aa58ea36d (diff)