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.

16 years ago · ed031c1df2
parent ecf7538430
commit ed031c1df2
209 changed files with 522 additions and 372 deletions
--- a/Demos/Device/AudioInput/AudioInput.aps
+++ b/Demos/Device/AudioInput/AudioInput.aps
--- a/Demos/Device/AudioInput/AudioInput.c
+++ b/Demos/Device/AudioInput/AudioInput.c
--- a/Demos/Device/AudioInput/AudioInput.h
+++ b/Demos/Device/AudioInput/AudioInput.h
--- a/Demos/Device/AudioInput/AudioInput.txt
+++ b/Demos/Device/AudioInput/AudioInput.txt
--- a/Demos/Device/AudioInput/Descriptors.c
+++ b/Demos/Device/AudioInput/Descriptors.c
--- a/Demos/Device/AudioInput/Descriptors.h
+++ b/Demos/Device/AudioInput/Descriptors.h
--- a/Demos/Device/AudioInput/Doxygen.conf
+++ b/Demos/Device/AudioInput/Doxygen.conf
--- a/Demos/Device/AudioInput/makefile
+++ b/Demos/Device/AudioInput/makefile
@ -118,17 +118,22 @@ 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    \
+	  $(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.
--- a/Demos/Device/AudioOutput/AudioOutput.aps
+++ b/Demos/Device/AudioOutput/AudioOutput.aps
--- a/Demos/Device/AudioOutput/AudioOutput.c
+++ b/Demos/Device/AudioOutput/AudioOutput.c
--- a/Demos/Device/AudioOutput/AudioOutput.h
+++ b/Demos/Device/AudioOutput/AudioOutput.h
--- a/Demos/Device/AudioOutput/AudioOutput.txt
+++ b/Demos/Device/AudioOutput/AudioOutput.txt
--- a/Demos/Device/AudioOutput/Descriptors.c
+++ b/Demos/Device/AudioOutput/Descriptors.c
--- a/Demos/Device/AudioOutput/Descriptors.h
+++ b/Demos/Device/AudioOutput/Descriptors.h
--- a/Demos/Device/AudioOutput/Doxygen.conf
+++ b/Demos/Device/AudioOutput/Doxygen.conf
--- a/Demos/Device/AudioOutput/makefile
+++ b/Demos/Device/AudioOutput/makefile
@ -118,17 +118,22 @@ 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    \
+	  $(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.
--- a/Demos/Device/CDC/CDC.aps
+++ b/Demos/Device/CDC/CDC.aps
--- a/Demos/Device/CDC/CDC.c
+++ b/Demos/Device/CDC/CDC.c
--- a/Demos/Device/CDC/CDC.h
+++ b/Demos/Device/CDC/CDC.h
--- a/Demos/Device/CDC/CDC.txt
+++ b/Demos/Device/CDC/CDC.txt
--- a/Demos/Device/CDC/Descriptors.c
+++ b/Demos/Device/CDC/Descriptors.c
--- a/Demos/USBtoSerial/Descriptors.h
+++ b/Demos/USBtoSerial/Descriptors.h
--- a/Demos/Device/CDC/Doxygen.conf
+++ b/Demos/Device/CDC/Doxygen.conf
--- a/Demos/Device/CDC/LUFA
+++ b/Demos/Device/CDC/LUFA
--- a/Demos/Device/CDC/makefile
+++ b/Demos/Device/CDC/makefile
@ -118,17 +118,22 @@ 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    \
+	  $(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.
--- a/Demos/Device/DualCDC/Descriptors.c
+++ b/Demos/Device/DualCDC/Descriptors.c
--- a/Demos/Device/DualCDC/Descriptors.h
+++ b/Demos/Device/DualCDC/Descriptors.h
--- a/Demos/Device/DualCDC/Doxygen.conf
+++ b/Demos/Device/DualCDC/Doxygen.conf
--- a/Demos/Device/DualCDC/DualCDC.aps
+++ b/Demos/Device/DualCDC/DualCDC.aps
--- a/Demos/Device/DualCDC/DualCDC.c
+++ b/Demos/Device/DualCDC/DualCDC.c
--- a/Demos/Device/DualCDC/DualCDC.h
+++ b/Demos/Device/DualCDC/DualCDC.h
--- a/Demos/Device/DualCDC/DualCDC.txt
+++ b/Demos/Device/DualCDC/DualCDC.txt
--- a/Demos/Device/DualCDC/LUFA
+++ b/Demos/Device/DualCDC/LUFA
--- a/Demos/Device/DualCDC/makefile
+++ b/Demos/Device/DualCDC/makefile
@ -118,17 +118,22 @@ 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    \
+	  $(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.
--- a/Demos/Device/Joystick/Descriptors.c
+++ b/Demos/Device/Joystick/Descriptors.c
--- a/Demos/Device/Joystick/Descriptors.h
+++ b/Demos/Device/Joystick/Descriptors.h
--- a/Demos/Device/Joystick/Doxygen.conf
+++ b/Demos/Device/Joystick/Doxygen.conf
--- a/Demos/Device/Joystick/Joystick.aps
+++ b/Demos/Device/Joystick/Joystick.aps
--- a/Demos/Device/Joystick/Joystick.c
+++ b/Demos/Device/Joystick/Joystick.c
--- a/Demos/Device/Joystick/Joystick.h
+++ b/Demos/Device/Joystick/Joystick.h
--- a/Demos/Device/Joystick/Joystick.txt
+++ b/Demos/Device/Joystick/Joystick.txt
--- a/Demos/Device/Joystick/makefile
+++ b/Demos/Device/Joystick/makefile
@ -118,17 +118,22 @@ 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    \
+	  $(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.
--- a/Demos/Device/Keyboard/Descriptors.c
+++ b/Demos/Device/Keyboard/Descriptors.c
--- a/Demos/Device/Keyboard/Descriptors.h
+++ b/Demos/Device/Keyboard/Descriptors.h
--- a/Demos/Device/Keyboard/Doxygen.conf
+++ b/Demos/Device/Keyboard/Doxygen.conf
--- a/Demos/Device/Keyboard/Keyboard.aps
+++ b/Demos/Device/Keyboard/Keyboard.aps
--- a/Demos/Device/Keyboard/Keyboard.c
+++ b/Demos/Device/Keyboard/Keyboard.c
--- a/Demos/Device/Keyboard/Keyboard.h
+++ b/Demos/Device/Keyboard/Keyboard.h
--- a/Demos/Device/Keyboard/Keyboard.txt
+++ b/Demos/Device/Keyboard/Keyboard.txt
--- a/Demos/Device/Keyboard/makefile
+++ b/Demos/Device/Keyboard/makefile
@ -118,17 +118,22 @@ 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    \
+	  $(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.
--- a/Demos/Device/KeyboardMouse/Descriptors.c
+++ b/Demos/Device/KeyboardMouse/Descriptors.c
--- a/Demos/Device/KeyboardMouse/Descriptors.h
+++ b/Demos/Device/KeyboardMouse/Descriptors.h
--- a/Demos/Device/KeyboardMouse/Doxygen.conf
+++ b/Demos/Device/KeyboardMouse/Doxygen.conf
--- a/Demos/Device/KeyboardMouse/KeyboardMouse.aps
+++ b/Demos/Device/KeyboardMouse/KeyboardMouse.aps
--- a/Demos/Device/KeyboardMouse/KeyboardMouse.c
+++ b/Demos/Device/KeyboardMouse/KeyboardMouse.c
--- a/Demos/Device/KeyboardMouse/KeyboardMouse.h
+++ b/Demos/Device/KeyboardMouse/KeyboardMouse.h
--- a/Demos/Device/KeyboardMouse/KeyboardMouse.txt
+++ b/Demos/Device/KeyboardMouse/KeyboardMouse.txt
--- a/Demos/Device/KeyboardMouse/makefile
+++ b/Demos/Device/KeyboardMouse/makefile
@ -118,17 +118,22 @@ 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    \
+	  $(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.
--- a/Demos/Device/MIDI/Descriptors.c
+++ b/Demos/Device/MIDI/Descriptors.c
--- a/Demos/Device/MIDI/Descriptors.h
+++ b/Demos/Device/MIDI/Descriptors.h
--- a/Demos/Device/MIDI/Doxygen.conf
+++ b/Demos/Device/MIDI/Doxygen.conf
--- a/Demos/Device/MIDI/MIDI.aps
+++ b/Demos/Device/MIDI/MIDI.aps
--- a/Demos/Device/MIDI/MIDI.c
+++ b/Demos/Device/MIDI/MIDI.c
--- a/Demos/Device/MIDI/MIDI.h
+++ b/Demos/Device/MIDI/MIDI.h
--- a/Demos/Device/MIDI/MIDI.txt
+++ b/Demos/Device/MIDI/MIDI.txt
--- a/Demos/Device/MIDI/makefile
+++ b/Demos/Device/MIDI/makefile
@ -118,17 +118,22 @@ 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    \
+	  $(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.
--- a/Demos/Device/MassStorage/DataflashManager.c
+++ b/Demos/Device/MassStorage/DataflashManager.c
--- a/Demos/Device/MassStorage/DataflashManager.h
+++ b/Demos/Device/MassStorage/DataflashManager.h
--- a/Demos/Device/MassStorage/Descriptors.c
+++ b/Demos/Device/MassStorage/Descriptors.c
--- a/Demos/Device/MassStorage/Descriptors.h
+++ b/Demos/Device/MassStorage/Descriptors.h
--- a/Demos/Device/MassStorage/Doxygen.conf
+++ b/Demos/Device/MassStorage/Doxygen.conf
--- a/Demos/Device/MassStorage/MassStorage.aps
+++ b/Demos/Device/MassStorage/MassStorage.aps
--- a/Demos/Device/MassStorage/MassStorage.c
+++ b/Demos/Device/MassStorage/MassStorage.c
--- a/Demos/Device/MassStorage/MassStorage.h
+++ b/Demos/Device/MassStorage/MassStorage.h
--- a/Demos/Device/MassStorage/MassStorage.txt
+++ b/Demos/Device/MassStorage/MassStorage.txt
--- a/Demos/Device/MassStorage/SCSI.c
+++ b/Demos/Device/MassStorage/SCSI.c
--- a/Demos/Device/MassStorage/SCSI.h
+++ b/Demos/Device/MassStorage/SCSI.h
--- a/Demos/Device/MassStorage/SCSI_Codes.h
+++ b/Demos/Device/MassStorage/SCSI_Codes.h
--- a/Demos/Device/MassStorage/makefile
+++ b/Demos/Device/MassStorage/makefile
@ -118,19 +118,24 @@ 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    \
+	  $(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.
--- a/Demos/Device/Mouse/Descriptors.c
+++ b/Demos/Device/Mouse/Descriptors.c
--- a/Demos/Device/Mouse/Descriptors.h
+++ b/Demos/Device/Mouse/Descriptors.h
--- a/Demos/Device/Mouse/Doxygen.conf
+++ b/Demos/Device/Mouse/Doxygen.conf
--- a/Demos/Device/Mouse/Mouse.aps
+++ b/Demos/Device/Mouse/Mouse.aps
--- a/Demos/Device/Mouse/Mouse.c
+++ b/Demos/Device/Mouse/Mouse.c
--- a/Demos/Device/Mouse/Mouse.h
+++ b/Demos/Device/Mouse/Mouse.h
--- a/Demos/Device/Mouse/Mouse.txt
+++ b/Demos/Device/Mouse/Mouse.txt
--- a/Demos/Device/Mouse/makefile
+++ b/Demos/Device/Mouse/makefile
@ -118,17 +118,22 @@ 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    \
+	  $(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.
--- a/Demos/Device/RNDISEthernet/ARP.c
+++ b/Demos/Device/RNDISEthernet/ARP.c
--- a/Demos/Device/RNDISEthernet/ARP.h
+++ b/Demos/Device/RNDISEthernet/ARP.h
--- a/Demos/Device/RNDISEthernet/DHCP.c
+++ b/Demos/Device/RNDISEthernet/DHCP.c
--- a/Demos/Device/RNDISEthernet/DHCP.h
+++ b/Demos/Device/RNDISEthernet/DHCP.h
--- a/Demos/Device/RNDISEthernet/Descriptors.c
+++ b/Demos/Device/RNDISEthernet/Descriptors.c
--- a/Demos/Device/RNDISEthernet/Descriptors.h
+++ b/Demos/Device/RNDISEthernet/Descriptors.h
--- a/Demos/Device/RNDISEthernet/Doxygen.conf
+++ b/Demos/Device/RNDISEthernet/Doxygen.conf
--- a/Demos/Device/RNDISEthernet/Ethernet.c
+++ b/Demos/Device/RNDISEthernet/Ethernet.c
--- a/Demos/Device/RNDISEthernet/Ethernet.h
+++ b/Demos/Device/RNDISEthernet/Ethernet.h
--- a/Demos/Device/RNDISEthernet/EthernetProtocols.h
+++ b/Demos/Device/RNDISEthernet/EthernetProtocols.h
--- a/Demos/Device/RNDISEthernet/ICMP.c
+++ b/Demos/Device/RNDISEthernet/ICMP.c
--- a/Demos/Device/RNDISEthernet/ICMP.h
+++ b/Demos/Device/RNDISEthernet/ICMP.h
--- a/Demos/Device/RNDISEthernet/IP.c
+++ b/Demos/Device/RNDISEthernet/IP.c
--- a/Show More
+++ b/Show More