Change project makefiles so that the current target settings and not just the board selection is printed during the build process.

Fix warning in AudioOutput demos when AUDIO_OUT_STEREO output mode is selected.

14 files changed, 275 insertions, 507 deletions

diff --git a/Demos/Device/LowLevel/AudioInput/makefile b/Demos/Device/LowLevel/AudioInput/makefile
index 36eafefcb..d1d946ceb 100644
--- a/Demos/Device/LowLevel/AudioInput/makefile
+++ b/Demos/Device/LowLevel/AudioInput/makefile
@@ -463,7 +463,7 @@ ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS)
 

 

 # Default target.

-all: begin gccversion sizebefore build checkhooks checklibmode checkboard sizeafter end

+all: begin gccversion sizebefore build showeventhooks showliboptions showtarget sizeafter end

 

 # Change the build target to build a HEX file or a library.

 build: elf hex eep lss sym

@@ -506,27 +506,29 @@ sizeafter:
 	@if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); \

 	2>/dev/null; echo; fi

 

-checkhooks: build

+showeventhooks: build

 	@echo

-	@echo ------- Unhooked LUFA Events -------

+	@echo -------- Unhooked LUFA Events --------

 	@$(shell) (grep -s '^EVENT_.*LUFA/.*\\.o' $(TARGET).map | \

 	           cut -d' ' -f1 | cut -d'_' -f2- | grep ".*") || \

 			   echo "(None)"

-	@echo ------------------------------------

+	@echo --------------------------------------

 

-checklibmode:

+showliboptions:

 	@echo

-	@echo ----------- Library Mode -----------

-	@$(shell) ($(CC) $(ALL_CFLAGS) -E -dM - < /dev/null \

-	          | grep 'USB_\(DEVICE\|HOST\)_ONLY' | cut -d' ' -f2 | grep ".*") \

-	          || echo "No specific mode (both device and host mode allowable)."

-	@echo ------------------------------------

+	@echo ---- Compile Time Library Options ----

+	@for i in $(LUFA_OPTS:-D%=%); do \

+		echo $$i; \

+	done

+	@echo --------------------------------------

 

-checkboard:

+showtarget:

 	@echo

-	@echo ---------- Selected Board ----------

-	@echo Selected board model is $(BOARD).

-	@echo ------------------------------------

+	@echo --------- Target Information ---------

+	@echo AVR Model: $(MCU)

+	@echo Board:     $(BOARD)

+	@echo Clock:     $(F_CPU)Hz CPU, $(F_CLOCK)Hz Master

+	@echo --------------------------------------

 	

 # Display compiler version information.

 gccversion : 

@@ -538,26 +540,6 @@ gccversion :
 program: $(TARGET).hex $(TARGET).eep

 	$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM)

 

-flip: $(TARGET).hex

-	batchisp -hardware usb -device $(MCU) -operation erase f

-	batchisp -hardware usb -device $(MCU) -operation loadbuffer $(TARGET).hex program

-	batchisp -hardware usb -device $(MCU) -operation start reset 0

-

-dfu: $(TARGET).hex

-	dfu-programmer $(MCU) erase

-	dfu-programmer $(MCU) flash --debug 1 $(TARGET).hex

-	dfu-programmer $(MCU) reset

-

-flip-ee: $(TARGET).hex $(TARGET).eep

-	copy $(TARGET).eep $(TARGET)eep.hex

-	batchisp -hardware usb -device $(MCU) -operation memory EEPROM erase

-	batchisp -hardware usb -device $(MCU) -operation memory EEPROM loadbuffer $(TARGET)eep.hex program

-	batchisp -hardware usb -device $(MCU) -operation start reset 0

-

-dfu-ee: $(TARGET).hex $(TARGET).eep

-	dfu-programmer $(MCU) flash-eeprom --debug 1 --suppress-bootloader-mem $(TARGET).eep

-	dfu-programmer $(MCU) reset

-

 

 # Generate avr-gdb config/init file which does the following:

 #     define the reset signal, load the target file, connect to target, and set 

@@ -732,8 +714,8 @@ $(shell mkdir $(OBJDIR) 2>/dev/null)
 

 

 # Listing of phony targets.

-.PHONY : all checkhooks checklibmode checkboard   \

-begin finish end sizebefore sizeafter gccversion  \

-build elf hex eep lss sym coff extcoff clean      \

-clean_list clean_binary program debug gdb-config  \

-doxygen dfu flip flip-ee dfu-ee
\ No newline at end of file
+.PHONY : all showeventhooks showliboptions showtarget  \

+begin finish end sizebefore sizeafter gccversion build \

+elf hex eep lss sym coff extcoff program clean debug   \

+clean_list clean_binary gdb-config doxygen dfu flip    \

+flip-ee dfu-ee
\ No newline at end of file
diff --git a/Demos/Device/LowLevel/AudioOutput/AudioOutput.c b/Demos/Device/LowLevel/AudioOutput/AudioOutput.c
index 2b2cdcbbf..c814c8ce5 100644
--- a/Demos/Device/LowLevel/AudioOutput/AudioOutput.c
+++ b/Demos/Device/LowLevel/AudioOutput/AudioOutput.c
@@ -210,8 +210,10 @@ void USB_Audio_Task(void)
 		int8_t  LeftSample_8Bit   = (LeftSample_16Bit  >> 8);

 		int8_t  RightSample_8Bit  = (RightSample_16Bit >> 8);

 			

+#if !defined(AUDIO_OUT_STEREO)

 		/* Mix the two channels together to produce a mono, 8-bit sample */

 		int8_t  MixedSample_8Bit  = (((int16_t)LeftSample_8Bit + (int16_t)RightSample_8Bit) >> 1);

+#endif

 

 #if defined(AUDIO_OUT_MONO)

 		/* Load the sample into the PWM timer channel */

diff --git a/Demos/Device/LowLevel/AudioOutput/makefile b/Demos/Device/LowLevel/AudioOutput/makefile
index 9505fde0b..e3499b40a 100644
--- a/Demos/Device/LowLevel/AudioOutput/makefile
+++ b/Demos/Device/LowLevel/AudioOutput/makefile
@@ -464,7 +464,7 @@ ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS)
 

 

 # Default target.

-all: begin gccversion sizebefore build checkhooks checklibmode checkboard sizeafter end

+all: begin gccversion sizebefore build showeventhooks showliboptions showtarget sizeafter end

 

 # Change the build target to build a HEX file or a library.

 build: elf hex eep lss sym

@@ -507,27 +507,29 @@ sizeafter:
 	@if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); \

 	2>/dev/null; echo; fi

 

-checkhooks: build

+showeventhooks: build

 	@echo

-	@echo ------- Unhooked LUFA Events -------

+	@echo -------- Unhooked LUFA Events --------

 	@$(shell) (grep -s '^EVENT_.*LUFA/.*\\.o' $(TARGET).map | \

 	           cut -d' ' -f1 | cut -d'_' -f2- | grep ".*") || \

 			   echo "(None)"

-	@echo ------------------------------------

+	@echo --------------------------------------

 

-checklibmode:

+showliboptions:

 	@echo

-	@echo ----------- Library Mode -----------

-	@$(shell) ($(CC) $(ALL_CFLAGS) -E -dM - < /dev/null \

-	          | grep 'USB_\(DEVICE\|HOST\)_ONLY' | cut -d' ' -f2 | grep ".*") \

-	          || echo "No specific mode (both device and host mode allowable)."

-	@echo ------------------------------------

+	@echo ---- Compile Time Library Options ----

+	@for i in $(LUFA_OPTS:-D%=%); do \

+		echo $$i; \

+	done

+	@echo --------------------------------------

 

-checkboard:

+showtarget:

 	@echo

-	@echo ---------- Selected Board ----------

-	@echo Selected board model is $(BOARD).

-	@echo ------------------------------------

+	@echo --------- Target Information ---------

+	@echo AVR Model: $(MCU)

+	@echo Board:     $(BOARD)

+	@echo Clock:     $(F_CPU)Hz CPU, $(F_CLOCK)Hz Master

+	@echo --------------------------------------

 	

 # Display compiler version information.

 gccversion : 

@@ -539,26 +541,6 @@ gccversion :
 program: $(TARGET).hex $(TARGET).eep

 	$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM)

 

-flip: $(TARGET).hex

-	batchisp -hardware usb -device $(MCU) -operation erase f

-	batchisp -hardware usb -device $(MCU) -operation loadbuffer $(TARGET).hex program

-	batchisp -hardware usb -device $(MCU) -operation start reset 0

-

-dfu: $(TARGET).hex

-	dfu-programmer $(MCU) erase

-	dfu-programmer $(MCU) flash --debug 1 $(TARGET).hex

-	dfu-programmer $(MCU) reset

-

-flip-ee: $(TARGET).hex $(TARGET).eep

-	copy $(TARGET).eep $(TARGET)eep.hex

-	batchisp -hardware usb -device $(MCU) -operation memory EEPROM erase

-	batchisp -hardware usb -device $(MCU) -operation memory EEPROM loadbuffer $(TARGET)eep.hex program

-	batchisp -hardware usb -device $(MCU) -operation start reset 0

-

-dfu-ee: $(TARGET).hex $(TARGET).eep

-	dfu-programmer $(MCU) flash-eeprom --debug 1 --suppress-bootloader-mem $(TARGET).eep

-	dfu-programmer $(MCU) reset

-

 

 # Generate avr-gdb config/init file which does the following:

 #     define the reset signal, load the target file, connect to target, and set 

@@ -733,8 +715,8 @@ $(shell mkdir $(OBJDIR) 2>/dev/null)
 

 

 # Listing of phony targets.

-.PHONY : all checkhooks checklibmode checkboard   \

-begin finish end sizebefore sizeafter gccversion  \

-build elf hex eep lss sym coff extcoff clean      \

-clean_list clean_binary program debug gdb-config  \

-doxygen dfu flip flip-ee dfu-ee
\ No newline at end of file
+.PHONY : all showeventhooks showliboptions showtarget  \

+begin finish end sizebefore sizeafter gccversion build \

+elf hex eep lss sym coff extcoff program clean debug   \

+clean_list clean_binary gdb-config doxygen dfu flip    \

+flip-ee dfu-ee
\ No newline at end of file
diff --git a/Demos/Device/LowLevel/CDC/makefile b/Demos/Device/LowLevel/CDC/makefile
index 4990559fd..80821ad6b 100644
--- a/Demos/Device/LowLevel/CDC/makefile
+++ b/Demos/Device/LowLevel/CDC/makefile
@@ -463,7 +463,7 @@ ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS)
 

 

 # Default target.

-all: begin gccversion sizebefore build checkhooks checklibmode checkboard sizeafter end

+all: begin gccversion sizebefore build showeventhooks showliboptions showtarget sizeafter end

 

 # Change the build target to build a HEX file or a library.

 build: elf hex eep lss sym

@@ -506,27 +506,29 @@ sizeafter:
 	@if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); \

 	2>/dev/null; echo; fi

 

-checkhooks: build

+showeventhooks: build

 	@echo

-	@echo ------- Unhooked LUFA Events -------

+	@echo -------- Unhooked LUFA Events --------

 	@$(shell) (grep -s '^EVENT_.*LUFA/.*\\.o' $(TARGET).map | \

 	           cut -d' ' -f1 | cut -d'_' -f2- | grep ".*") || \

 			   echo "(None)"

-	@echo ------------------------------------

+	@echo --------------------------------------

 

-checklibmode:

+showliboptions:

 	@echo

-	@echo ----------- Library Mode -----------

-	@$(shell) ($(CC) $(ALL_CFLAGS) -E -dM - < /dev/null \

-	          | grep 'USB_\(DEVICE\|HOST\)_ONLY' | cut -d' ' -f2 | grep ".*") \

-	          || echo "No specific mode (both device and host mode allowable)."

-	@echo ------------------------------------

+	@echo ---- Compile Time Library Options ----

+	@for i in $(LUFA_OPTS:-D%=%); do \

+		echo $$i; \

+	done

+	@echo --------------------------------------

 

-checkboard:

+showtarget:

 	@echo

-	@echo ---------- Selected Board ----------

-	@echo Selected board model is $(BOARD).

-	@echo ------------------------------------

+	@echo --------- Target Information ---------

+	@echo AVR Model: $(MCU)

+	@echo Board:     $(BOARD)

+	@echo Clock:     $(F_CPU)Hz CPU, $(F_CLOCK)Hz Master

+	@echo --------------------------------------

 	

 # Display compiler version information.

 gccversion : 

@@ -538,26 +540,6 @@ gccversion :
 program: $(TARGET).hex $(TARGET).eep

 	$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM)

 

-flip: $(TARGET).hex

-	batchisp -hardware usb -device $(MCU) -operation erase f

-	batchisp -hardware usb -device $(MCU) -operation loadbuffer $(TARGET).hex program

-	batchisp -hardware usb -device $(MCU) -operation start reset 0

-

-dfu: $(TARGET).hex

-	dfu-programmer $(MCU) erase

-	dfu-programmer $(MCU) flash --debug 1 $(TARGET).hex

-	dfu-programmer $(MCU) reset

-

-flip-ee: $(TARGET).hex $(TARGET).eep

-	copy $(TARGET).eep $(TARGET)eep.hex

-	batchisp -hardware usb -device $(MCU) -operation memory EEPROM erase

-	batchisp -hardware usb -device $(MCU) -operation memory EEPROM loadbuffer $(TARGET)eep.hex program

-	batchisp -hardware usb -device $(MCU) -operation start reset 0

-

-dfu-ee: $(TARGET).hex $(TARGET).eep

-	dfu-programmer $(MCU) flash-eeprom --debug 1 --suppress-bootloader-mem $(TARGET).eep

-	dfu-programmer $(MCU) reset

-

 

 # Generate avr-gdb config/init file which does the following:

 #     define the reset signal, load the target file, connect to target, and set 

@@ -732,8 +714,8 @@ $(shell mkdir $(OBJDIR) 2>/dev/null)
 

 

 # Listing of phony targets.

-.PHONY : all checkhooks checklibmode checkboard   \

-begin finish end sizebefore sizeafter gccversion  \

-build elf hex eep lss sym coff extcoff clean      \

-clean_list clean_binary program debug gdb-config  \

-doxygen dfu flip flip-ee dfu-ee
\ No newline at end of file
+.PHONY : all showeventhooks showliboptions showtarget  \

+begin finish end sizebefore sizeafter gccversion build \

+elf hex eep lss sym coff extcoff program clean debug   \

+clean_list clean_binary gdb-config doxygen dfu flip    \

+flip-ee dfu-ee
\ No newline at end of file
diff --git a/Demos/Device/LowLevel/DualCDC/makefile b/Demos/Device/LowLevel/DualCDC/makefile
index 99da8cf42..117fdbd83 100644
--- a/Demos/Device/LowLevel/DualCDC/makefile
+++ b/Demos/Device/LowLevel/DualCDC/makefile
@@ -463,7 +463,7 @@ ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS)
 

 

 # Default target.

-all: begin gccversion sizebefore build checkhooks checklibmode checkboard sizeafter end

+all: begin gccversion sizebefore build showeventhooks showliboptions showtarget sizeafter end

 

 # Change the build target to build a HEX file or a library.

 build: elf hex eep lss sym

@@ -506,27 +506,29 @@ sizeafter:
 	@if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); \

 	2>/dev/null; echo; fi

 

-checkhooks: build

+showeventhooks: build

 	@echo

-	@echo ------- Unhooked LUFA Events -------

+	@echo -------- Unhooked LUFA Events --------

 	@$(shell) (grep -s '^EVENT_.*LUFA/.*\\.o' $(TARGET).map | \

 	           cut -d' ' -f1 | cut -d'_' -f2- | grep ".*") || \

 			   echo "(None)"

-	@echo ------------------------------------

+	@echo --------------------------------------

 

-checklibmode:

+showliboptions:

 	@echo

-	@echo ----------- Library Mode -----------

-	@$(shell) ($(CC) $(ALL_CFLAGS) -E -dM - < /dev/null \

-	          | grep 'USB_\(DEVICE\|HOST\)_ONLY' | cut -d' ' -f2 | grep ".*") \

-	          || echo "No specific mode (both device and host mode allowable)."

-	@echo ------------------------------------

+	@echo ---- Compile Time Library Options ----

+	@for i in $(LUFA_OPTS:-D%=%); do \

+		echo $$i; \

+	done

+	@echo --------------------------------------

 

-checkboard:

+showtarget:

 	@echo

-	@echo ---------- Selected Board ----------

-	@echo Selected board model is $(BOARD).

-	@echo ------------------------------------

+	@echo --------- Target Information ---------

+	@echo AVR Model: $(MCU)

+	@echo Board:     $(BOARD)

+	@echo Clock:     $(F_CPU)Hz CPU, $(F_CLOCK)Hz Master

+	@echo --------------------------------------

 	

 # Display compiler version information.

 gccversion : 

@@ -538,26 +540,6 @@ gccversion :
 program: $(TARGET).hex $(TARGET).eep

 	$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM)

 

-flip: $(TARGET).hex

-	batchisp -hardware usb -device $(MCU) -operation erase f

-	batchisp -hardware usb -device $(MCU) -operation loadbuffer $(TARGET).hex program

-	batchisp -hardware usb -device $(MCU) -operation start reset 0

-

-dfu: $(TARGET).hex

-	dfu-programmer $(MCU) erase

-	dfu-programmer $(MCU) flash --debug 1 $(TARGET).hex

-	dfu-programmer $(MCU) reset

-

-flip-ee: $(TARGET).hex $(TARGET).eep

-	copy $(TARGET).eep $(TARGET)eep.hex

-	batchisp -hardware usb -device $(MCU) -operation memory EEPROM erase

-	batchisp -hardware usb -device $(MCU) -operation memory EEPROM loadbuffer $(TARGET)eep.hex program

-	batchisp -hardware usb -device $(MCU) -operation start reset 0

-

-dfu-ee: $(TARGET).hex $(TARGET).eep

-	dfu-programmer $(MCU) flash-eeprom --debug 1 --suppress-bootloader-mem $(TARGET).eep

-	dfu-programmer $(MCU) reset

-

 

 # Generate avr-gdb config/init file which does the following:

 #     define the reset signal, load the target file, connect to target, and set 

@@ -732,8 +714,8 @@ $(shell mkdir $(OBJDIR) 2>/dev/null)
 

 

 # Listing of phony targets.

-.PHONY : all checkhooks checklibmode checkboard   \

-begin finish end sizebefore sizeafter gccversion  \

-build elf hex eep lss sym coff extcoff clean      \

-clean_list clean_binary program debug gdb-config  \

-doxygen dfu flip flip-ee dfu-ee
\ No newline at end of file
+.PHONY : all showeventhooks showliboptions showtarget  \

+begin finish end sizebefore sizeafter gccversion build \

+elf hex eep lss sym coff extcoff program clean debug   \

+clean_list clean_binary gdb-config doxygen dfu flip    \

+flip-ee dfu-ee
\ No newline at end of file
diff --git a/Demos/Device/LowLevel/GenericHID/makefile b/Demos/Device/LowLevel/GenericHID/makefile
index 407536c7f..a6130c35d 100644
--- a/Demos/Device/LowLevel/GenericHID/makefile
+++ b/Demos/Device/LowLevel/GenericHID/makefile
@@ -463,7 +463,7 @@ ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS)
 

 

 # Default target.

-all: begin gccversion sizebefore build checkhooks checklibmode checkboard sizeafter end

+all: begin gccversion sizebefore build showeventhooks showliboptions showtarget sizeafter end

 

 # Change the build target to build a HEX file or a library.

 build: elf hex eep lss sym

@@ -506,27 +506,29 @@ sizeafter:
 	@if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); \

 	2>/dev/null; echo; fi

 

-checkhooks: build

+showeventhooks: build

 	@echo

-	@echo ------- Unhooked LUFA Events -------

+	@echo -------- Unhooked LUFA Events --------

 	@$(shell) (grep -s '^EVENT_.*LUFA/.*\\.o' $(TARGET).map | \

 	           cut -d' ' -f1 | cut -d'_' -f2- | grep ".*") || \

 			   echo "(None)"

-	@echo ------------------------------------

+	@echo --------------------------------------

 

-checklibmode:

+showliboptions:

 	@echo

-	@echo ----------- Library Mode -----------

-	@$(shell) ($(CC) $(ALL_CFLAGS) -E -dM - < /dev/null \

-	          | grep 'USB_\(DEVICE\|HOST\)_ONLY' | cut -d' ' -f2 | grep ".*") \

-	          || echo "No specific mode (both device and host mode allowable)."

-	@echo ------------------------------------

+	@echo ---- Compile Time Library Options ----

+	@for i in $(LUFA_OPTS:-D%=%); do \

+		echo $$i; \

+	done

+	@echo --------------------------------------

 

-checkboard:

+showtarget:

 	@echo

-	@echo ---------- Selected Board ----------

-	@echo Selected board model is $(BOARD).

-	@echo ------------------------------------

+	@echo --------- Target Information ---------

+	@echo AVR Model: $(MCU)

+	@echo Board:     $(BOARD)

+	@echo Clock:     $(F_CPU)Hz CPU, $(F_CLOCK)Hz Master

+	@echo --------------------------------------

 	

 # Display compiler version information.

 gccversion : 

@@ -538,26 +540,6 @@ gccversion :
 program: $(TARGET).hex $(TARGET).eep

 	$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM)

 

-flip: $(TARGET).hex

-	batchisp -hardware usb -device $(MCU) -operation erase f

-	batchisp -hardware usb -device $(MCU) -operation loadbuffer $(TARGET).hex program

-	batchisp -hardware usb -device $(MCU) -operation start reset 0

-

-dfu: $(TARGET).hex

-	dfu-programmer $(MCU) erase

-	dfu-programmer $(MCU) flash --debug 1 $(TARGET).hex

-	dfu-programmer $(MCU) reset

-

-flip-ee: $(TARGET).hex $(TARGET).eep

-	copy $(TARGET).eep $(TARGET)eep.hex

-	batchisp -hardware usb -device $(MCU) -operation memory EEPROM erase

-	batchisp -hardware usb -device $(MCU) -operation memory EEPROM loadbuffer $(TARGET)eep.hex program

-	batchisp -hardware usb -device $(MCU) -operation start reset 0

-

-dfu-ee: $(TARGET).hex $(TARGET).eep

-	dfu-programmer $(MCU) flash-eeprom --debug 1 --suppress-bootloader-mem $(TARGET).eep

-	dfu-programmer $(MCU) reset

-

 

 # Generate avr-gdb config/init file which does the following:

 #     define the reset signal, load the target file, connect to target, and set 

@@ -732,8 +714,8 @@ $(shell mkdir $(OBJDIR) 2>/dev/null)
 

 

 # Listing of phony targets.

-.PHONY : all checkhooks checklibmode checkboard   \

-begin finish end sizebefore sizeafter gccversion  \

-build elf hex eep lss sym coff extcoff clean      \

-clean_list clean_binary program debug gdb-config  \

-doxygen dfu flip flip-ee dfu-ee
\ No newline at end of file
+.PHONY : all showeventhooks showliboptions showtarget  \

+begin finish end sizebefore sizeafter gccversion build \

+elf hex eep lss sym coff extcoff program clean debug   \

+clean_list clean_binary gdb-config doxygen dfu flip    \

+flip-ee dfu-ee
\ No newline at end of file
diff --git a/Demos/Device/LowLevel/Joystick/makefile b/Demos/Device/LowLevel/Joystick/makefile
index b418ba222..0510a6992 100644
--- a/Demos/Device/LowLevel/Joystick/makefile
+++ b/Demos/Device/LowLevel/Joystick/makefile
@@ -463,7 +463,7 @@ ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS)
 

 

 # Default target.

-all: begin gccversion sizebefore build checkhooks checklibmode checkboard sizeafter end

+all: begin gccversion sizebefore build showeventhooks showliboptions showtarget sizeafter end

 

 # Change the build target to build a HEX file or a library.

 build: elf hex eep lss sym

@@ -506,27 +506,29 @@ sizeafter:
 	@if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); \

 	2>/dev/null; echo; fi

 

-checkhooks: build

+showeventhooks: build

 	@echo

-	@echo ------- Unhooked LUFA Events -------

+	@echo -------- Unhooked LUFA Events --------

 	@$(shell) (grep -s '^EVENT_.*LUFA/.*\\.o' $(TARGET).map | \

 	           cut -d' ' -f1 | cut -d'_' -f2- | grep ".*") || \

 			   echo "(None)"

-	@echo ------------------------------------

+	@echo --------------------------------------

 

-checklibmode:

+showliboptions:

 	@echo

-	@echo ----------- Library Mode -----------

-	@$(shell) ($(CC) $(ALL_CFLAGS) -E -dM - < /dev/null \

-	          | grep 'USB_\(DEVICE\|HOST\)_ONLY' | cut -d' ' -f2 | grep ".*") \

-	          || echo "No specific mode (both device and host mode allowable)."

-	@echo ------------------------------------

+	@echo ---- Compile Time Library Options ----

+	@for i in $(LUFA_OPTS:-D%=%); do \

+		echo $$i; \

+	done

+	@echo --------------------------------------

 

-checkboard:

+showtarget:

 	@echo

-	@echo ---------- Selected Board ----------

-	@echo Selected board model is $(BOARD).

-	@echo ------------------------------------

+	@echo --------- Target Information ---------

+	@echo AVR Model: $(MCU)

+	@echo Board:     $(BOARD)

+	@echo Clock:     $(F_CPU)Hz CPU, $(F_CLOCK)Hz Master

+	@echo --------------------------------------

 	

 # Display compiler version information.

 gccversion : 

@@ -538,26 +540,6 @@ gccversion :
 program: $(TARGET).hex $(TARGET).eep

 	$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM)

 

-flip: $(TARGET).hex

-	batchisp -hardware usb -device $(MCU) -operation erase f

-	batchisp -hardware usb -device $(MCU) -operation loadbuffer $(TARGET).hex program

-	batchisp -hardware usb -device $(MCU) -operation start reset 0

-

-dfu: $(TARGET).hex

-	dfu-programmer $(MCU) erase

-	dfu-programmer $(MCU) flash --debug 1 $(TARGET).hex

-	dfu-programmer $(MCU) reset

-

-flip-ee: $(TARGET).hex $(TARGET).eep

-	copy $(TARGET).eep $(TARGET)eep.hex

-	batchisp -hardware usb -device $(MCU) -operation memory EEPROM erase

-	batchisp -hardware usb -device $(MCU) -operation memory EEPROM loadbuffer $(TARGET)eep.hex program

-	batchisp -hardware usb -device $(MCU) -operation start reset 0

-

-dfu-ee: $(TARGET).hex $(TARGET).eep

-	dfu-programmer $(MCU) flash-eeprom --debug 1 --suppress-bootloader-mem $(TARGET).eep

-	dfu-programmer $(MCU) reset

-

 

 # Generate avr-gdb config/init file which does the following:

 #     define the reset signal, load the target file, connect to target, and set 

@@ -732,8 +714,8 @@ $(shell mkdir $(OBJDIR) 2>/dev/null)
 

 

 # Listing of phony targets.

-.PHONY : all checkhooks checklibmode checkboard   \

-begin finish end sizebefore sizeafter gccversion  \

-build elf hex eep lss sym coff extcoff clean      \

-clean_list clean_binary program debug gdb-config  \

-doxygen dfu flip flip-ee dfu-ee
\ No newline at end of file
+.PHONY : all showeventhooks showliboptions showtarget  \

+begin finish end sizebefore sizeafter gccversion build \

+elf hex eep lss sym coff extcoff program clean debug   \

+clean_list clean_binary gdb-config doxygen dfu flip    \

+flip-ee dfu-ee
\ No newline at end of file
diff --git a/Demos/Device/LowLevel/Keyboard/makefile b/Demos/Device/LowLevel/Keyboard/makefile
index af351c099..d0a87a2c9 100644
--- a/Demos/Device/LowLevel/Keyboard/makefile
+++ b/Demos/Device/LowLevel/Keyboard/makefile
@@ -463,7 +463,7 @@ ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS)
 

 

 # Default target.

-all: begin gccversion sizebefore build checkhooks checklibmode checkboard sizeafter end

+all: begin gccversion sizebefore build showeventhooks showliboptions showtarget sizeafter end

 

 # Change the build target to build a HEX file or a library.

 build: elf hex eep lss sym

@@ -506,27 +506,29 @@ sizeafter:
 	@if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); \

 	2>/dev/null; echo; fi

 

-checkhooks: build

+showeventhooks: build

 	@echo

-	@echo ------- Unhooked LUFA Events -------

+	@echo -------- Unhooked LUFA Events --------

 	@$(shell) (grep -s '^EVENT_.*LUFA/.*\\.o' $(TARGET).map | \

 	           cut -d' ' -f1 | cut -d'_' -f2- | grep ".*") || \

 			   echo "(None)"

-	@echo ------------------------------------

+	@echo --------------------------------------

 

-checklibmode:

+showliboptions:

 	@echo

-	@echo ----------- Library Mode -----------

-	@$(shell) ($(CC) $(ALL_CFLAGS) -E -dM - < /dev/null \

-	          | grep 'USB_\(DEVICE\|HOST\)_ONLY' | cut -d' ' -f2 | grep ".*") \

-	          || echo "No specific mode (both device and host mode allowable)."

-	@echo ------------------------------------

+	@echo ---- Compile Time Library Options ----

+	@for i in $(LUFA_OPTS:-D%=%); do \

+		echo $$i; \

+	done

+	@echo --------------------------------------

 

-checkboard:

+showtarget:

 	@echo

-	@echo ---------- Selected Board ----------

-	@echo Selected board model is $(BOARD).

-	@echo ------------------------------------

+	@echo --------- Target Information ---------

+	@echo AVR Model: $(MCU)

+	@echo Board:     $(BOARD)

+	@echo Clock:     $(F_CPU)Hz CPU, $(F_CLOCK)Hz Master

+	@echo --------------------------------------

 	

 # Display compiler version information.

 gccversion : 

@@ -538,26 +540,6 @@ gccversion :
 program: $(TARGET).hex $(TARGET).eep

 	$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM)

 

-flip: $(TARGET).hex

-	batchisp -hardware usb -device $(MCU) -operation erase f

-	batchisp -hardware usb -device $(MCU) -operation loadbuffer $(TARGET).hex program

-	batchisp -hardware usb -device $(MCU) -operation start reset 0

-

-dfu: $(TARGET).hex

-	dfu-programmer $(MCU) erase

-	dfu-programmer $(MCU) flash --debug 1 $(TARGET).hex

-	dfu-programmer $(MCU) reset

-

-flip-ee: $(TARGET).hex $(TARGET).eep

-	copy $(TARGET).eep $(TARGET)eep.hex

-	batchisp -hardware usb -device $(MCU) -operation memory EEPROM erase

-	batchisp -hardware usb -device $(MCU) -operation memory EEPROM loadbuffer $(TARGET)eep.hex program

-	batchisp -hardware usb -device $(MCU) -operation start reset 0

-

-dfu-ee: $(TARGET).hex $(TARGET).eep

-	dfu-programmer $(MCU) flash-eeprom --debug 1 --suppress-bootloader-mem $(TARGET).eep

-	dfu-programmer $(MCU) reset

-

 

 # Generate avr-gdb config/init file which does the following:

 #     define the reset signal, load the target file, connect to target, and set 

@@ -732,8 +714,8 @@ $(shell mkdir $(OBJDIR) 2>/dev/null)
 

 

 # Listing of phony targets.

-.PHONY : all checkhooks checklibmode checkboard   \

-begin finish end sizebefore sizeafter gccversion  \

-build elf hex eep lss sym coff extcoff clean      \

-clean_list clean_binary program debug gdb-config  \

-doxygen dfu flip flip-ee dfu-ee
\ No newline at end of file
+.PHONY : all showeventhooks showliboptions showtarget  \

+begin finish end sizebefore sizeafter gccversion build \

+elf hex eep lss sym coff extcoff program clean debug   \

+clean_list clean_binary gdb-config doxygen dfu flip    \

+flip-ee dfu-ee
\ No newline at end of file
diff --git a/Demos/Device/LowLevel/KeyboardMouse/makefile b/Demos/Device/LowLevel/KeyboardMouse/makefile
index 9474f89a6..597658e6c 100644
--- a/Demos/Device/LowLevel/KeyboardMouse/makefile
+++ b/Demos/Device/LowLevel/KeyboardMouse/makefile
@@ -463,7 +463,7 @@ ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS)
 

 

 # Default target.

-all: begin gccversion sizebefore build checkhooks checklibmode checkboard sizeafter end

+all: begin gccversion sizebefore build showeventhooks showliboptions showtarget sizeafter end

 

 # Change the build target to build a HEX file or a library.

 build: elf hex eep lss sym

@@ -506,27 +506,29 @@ sizeafter:
 	@if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); \

 	2>/dev/null; echo; fi

 

-checkhooks: build

+showeventhooks: build

 	@echo

-	@echo ------- Unhooked LUFA Events -------

+	@echo -------- Unhooked LUFA Events --------

 	@$(shell) (grep -s '^EVENT_.*LUFA/.*\\.o' $(TARGET).map | \

 	           cut -d' ' -f1 | cut -d'_' -f2- | grep ".*") || \

 			   echo "(None)"

-	@echo ------------------------------------

+	@echo --------------------------------------

 

-checklibmode:

+showliboptions:

 	@echo

-	@echo ----------- Library Mode -----------

-	@$(shell) ($(CC) $(ALL_CFLAGS) -E -dM - < /dev/null \

-	          | grep 'USB_\(DEVICE\|HOST\)_ONLY' | cut -d' ' -f2 | grep ".*") \

-	          || echo "No specific mode (both device and host mode allowable)."

-	@echo ------------------------------------

+	@echo ---- Compile Time Library Options ----

+	@for i in $(LUFA_OPTS:-D%=%); do \

+		echo $$i; \

+	done

+	@echo --------------------------------------

 

-checkboard:

+showtarget:

 	@echo

-	@echo ---------- Selected Board ----------

-	@echo Selected board model is $(BOARD).

-	@echo ------------------------------------

+	@echo --------- Target Information ---------

+	@echo AVR Model: $(MCU)

+	@echo Board:     $(BOARD)

+	@echo Clock:     $(F_CPU)Hz CPU, $(F_CLOCK)Hz Master

+	@echo --------------------------------------

 	

 # Display compiler version information.

 gccversion : 

@@ -538,26 +540,6 @@ gccversion :
 program: $(TARGET).hex $(TARGET).eep

 	$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM)

 

-flip: $(TARGET).hex

-	batchisp -hardware usb -device $(MCU) -operation erase f

-	batchisp -hardware usb -device $(MCU) -operation loadbuffer $(TARGET).hex program

-	batchisp -hardware usb -device $(MCU) -operation start reset 0

-

-dfu: $(TARGET).hex

-	dfu-programmer $(MCU) erase

-	dfu-programmer $(MCU) flash --debug 1 $(TARGET).hex

-	dfu-programmer $(MCU) reset

-

-flip-ee: $(TARGET).hex $(TARGET).eep

-	copy $(TARGET).eep $(TARGET)eep.hex

-	batchisp -hardware usb -device $(MCU) -operation memory EEPROM erase

-	batchisp -hardware usb -device $(MCU) -operation memory EEPROM loadbuffer $(TARGET)eep.hex program

-	batchisp -hardware usb -device $(MCU) -operation start reset 0

-

-dfu-ee: $(TARGET).hex $(TARGET).eep

-	dfu-programmer $(MCU) flash-eeprom --debug 1 --suppress-bootloader-mem $(TARGET).eep

-	dfu-programmer $(MCU) reset

-

 

 # Generate avr-gdb config/init file which does the following:

 #     define the reset signal, load the target file, connect to target, and set 

@@ -732,8 +714,8 @@ $(shell mkdir $(OBJDIR) 2>/dev/null)
 

 

 # Listing of phony targets.

-.PHONY : all checkhooks checklibmode checkboard   \

-begin finish end sizebefore sizeafter gccversion  \

-build elf hex eep lss sym coff extcoff clean      \

-clean_list clean_binary program debug gdb-config  \

-doxygen dfu flip flip-ee dfu-ee
\ No newline at end of file
+.PHONY : all showeventhooks showliboptions showtarget  \

+begin finish end sizebefore sizeafter gccversion build \

+elf hex eep lss sym coff extcoff program clean debug   \

+clean_list clean_binary gdb-config doxygen dfu flip    \

+flip-ee dfu-ee
\ No newline at end of file
diff --git a/Demos/Device/LowLevel/MIDI/makefile b/Demos/Device/LowLevel/MIDI/makefile
index 1f0d8159e..1789c396e 100644
--- a/Demos/Device/LowLevel/MIDI/makefile
+++ b/Demos/Device/LowLevel/MIDI/makefile
@@ -463,7 +463,7 @@ ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS)
 

 

 # Default target.

-all: begin gccversion sizebefore build checkhooks checklibmode checkboard sizeafter end

+all: begin gccversion sizebefore build showeventhooks showliboptions showtarget sizeafter end

 

 # Change the build target to build a HEX file or a library.

 build: elf hex eep lss sym

@@ -506,27 +506,29 @@ sizeafter:
 	@if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); \

 	2>/dev/null; echo; fi

 

-checkhooks: build

+showeventhooks: build

 	@echo

-	@echo ------- Unhooked LUFA Events -------

+	@echo -------- Unhooked LUFA Events --------

 	@$(shell) (grep -s '^EVENT_.*LUFA/.*\\.o' $(TARGET).map | \

 	           cut -d' ' -f1 | cut -d'_' -f2- | grep ".*") || \

 			   echo "(None)"

-	@echo ------------------------------------

+	@echo --------------------------------------

 

-checklibmode:

+showliboptions:

 	@echo

-	@echo ----------- Library Mode -----------

-	@$(shell) ($(CC) $(ALL_CFLAGS) -E -dM - < /dev/null \

-	          | grep 'USB_\(DEVICE\|HOST\)_ONLY' | cut -d' ' -f2 | grep ".*") \

-	          || echo "No specific mode (both device and host mode allowable)."

-	@echo ------------------------------------

+	@echo ---- Compile Time Library Options ----

+	@for i in $(LUFA_OPTS:-D%=%); do \

+		echo $$i; \

+	done

+	@echo --------------------------------------

 

-checkboard:

+showtarget:

 	@echo

-	@echo ---------- Selected Board ----------

-	@echo Selected board model is $(BOARD).

-	@echo ------------------------------------

+	@echo --------- Target Information ---------

+	@echo AVR Model: $(MCU)

+	@echo Board:     $(BOARD)

+	@echo Clock:     $(F_CPU)Hz CPU, $(F_CLOCK)Hz Master

+	@echo --------------------------------------

 	

 # Display compiler version information.

 gccversion : 

@@ -538,26 +540,6 @@ gccversion :
 program: $(TARGET).hex $(TARGET).eep

 	$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM)

 

-flip: $(TARGET).hex

-	batchisp -hardware usb -device $(MCU) -operation erase f

-	batchisp -hardware usb -device $(MCU) -operation loadbuffer $(TARGET).hex program

-	batchisp -hardware usb -device $(MCU) -operation start reset 0

-

-dfu: $(TARGET).hex

-	dfu-programmer $(MCU) erase

-	dfu-programmer $(MCU) flash --debug 1 $(TARGET).hex

-	dfu-programmer $(MCU) reset

-

-flip-ee: $(TARGET).hex $(TARGET).eep

-	copy $(TARGET).eep $(TARGET)eep.hex

-	batchisp -hardware usb -device $(MCU) -operation memory EEPROM erase

-	batchisp -hardware usb -device $(MCU) -operation memory EEPROM loadbuffer $(TARGET)eep.hex program

-	batchisp -hardware usb -device $(MCU) -operation start reset 0

-

-dfu-ee: $(TARGET).hex $(TARGET).eep

-	dfu-programmer $(MCU) flash-eeprom --debug 1 --suppress-bootloader-mem $(TARGET).eep

-	dfu-programmer $(MCU) reset

-

 

 # Generate avr-gdb config/init file which does the following:

 #     define the reset signal, load the target file, connect to target, and set 

@@ -732,8 +714,8 @@ $(shell mkdir $(OBJDIR) 2>/dev/null)
 

 

 # Listing of phony targets.

-.PHONY : all checkhooks checklibmode checkboard   \

-begin finish end sizebefore sizeafter gccversion  \

-build elf hex eep lss sym coff extcoff clean      \

-clean_list clean_binary program debug gdb-config  \

-doxygen dfu flip flip-ee dfu-ee
\ No newline at end of file
+.PHONY : all showeventhooks showliboptions showtarget  \

+begin finish end sizebefore sizeafter gccversion build \

+elf hex eep lss sym coff extcoff program clean debug   \

+clean_list clean_binary gdb-config doxygen dfu flip    \

+flip-ee dfu-ee
\ No newline at end of file
diff --git a/Demos/Device/LowLevel/MassStorage/makefile b/Demos/Device/LowLevel/MassStorage/makefile
index b98541097..6d3fb0a04 100644
--- a/Demos/Device/LowLevel/MassStorage/makefile
+++ b/Demos/Device/LowLevel/MassStorage/makefile
@@ -465,7 +465,7 @@ ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS)
 

 

 # Default target.

-all: begin gccversion sizebefore build checkhooks checklibmode checkboard sizeafter end

+all: begin gccversion sizebefore build showeventhooks showliboptions showtarget sizeafter end

 

 # Change the build target to build a HEX file or a library.

 build: elf hex eep lss sym

@@ -508,27 +508,29 @@ sizeafter:
 	@if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); \

 	2>/dev/null; echo; fi

 

-checkhooks: build

+showeventhooks: build

 	@echo

-	@echo ------- Unhooked LUFA Events -------

+	@echo -------- Unhooked LUFA Events --------

 	@$(shell) (grep -s '^EVENT_.*LUFA/.*\\.o' $(TARGET).map | \

 	           cut -d' ' -f1 | cut -d'_' -f2- | grep ".*") || \

 			   echo "(None)"

-	@echo ------------------------------------

+	@echo --------------------------------------

 

-checklibmode:

+showliboptions:

 	@echo

-	@echo ----------- Library Mode -----------

-	@$(shell) ($(CC) $(ALL_CFLAGS) -E -dM - < /dev/null \

-	          | grep 'USB_\(DEVICE\|HOST\)_ONLY' | cut -d' ' -f2 | grep ".*") \

-	          || echo "No specific mode (both device and host mode allowable)."

-	@echo ------------------------------------

+	@echo ---- Compile Time Library Options ----

+	@for i in $(LUFA_OPTS:-D%=%); do \

+		echo $$i; \

+	done

+	@echo --------------------------------------

 

-checkboard:

+showtarget:

 	@echo

-	@echo ---------- Selected Board ----------

-	@echo Selected board model is $(BOARD).

-	@echo ------------------------------------

+	@echo --------- Target Information ---------

+	@echo AVR Model: $(MCU)

+	@echo Board:     $(BOARD)

+	@echo Clock:     $(F_CPU)Hz CPU, $(F_CLOCK)Hz Master

+	@echo --------------------------------------

 	

 # Display compiler version information.

 gccversion : 

@@ -540,26 +542,6 @@ gccversion :
 program: $(TARGET).hex $(TARGET).eep

 	$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM)

 

-flip: $(TARGET).hex

-	batchisp -hardware usb -device $(MCU) -operation erase f

-	batchisp -hardware usb -device $(MCU) -operation loadbuffer $(TARGET).hex program

-	batchisp -hardware usb -device $(MCU) -operation start reset 0

-

-dfu: $(TARGET).hex

-	dfu-programmer $(MCU) erase

-	dfu-programmer $(MCU) flash --debug 1 $(TARGET).hex

-	dfu-programmer $(MCU) reset

-

-flip-ee: $(TARGET).hex $(TARGET).eep

-	copy $(TARGET).eep $(TARGET)eep.hex

-	batchisp -hardware usb -device $(MCU) -operation memory EEPROM erase

-	batchisp -hardware usb -device $(MCU) -operation memory EEPROM loadbuffer $(TARGET)eep.hex program

-	batchisp -hardware usb -device $(MCU) -operation start reset 0

-

-dfu-ee: $(TARGET).hex $(TARGET).eep

-	dfu-programmer $(MCU) flash-eeprom --debug 1 --suppress-bootloader-mem $(TARGET).eep

-	dfu-programmer $(MCU) reset

-

 

 # Generate avr-gdb config/init file which does the following:

 #     define the reset signal, load the target file, connect to target, and set 

@@ -734,8 +716,8 @@ $(shell mkdir $(OBJDIR) 2>/dev/null)
 

 

 # Listing of phony targets.

-.PHONY : all checkhooks checklibmode checkboard   \

-begin finish end sizebefore sizeafter gccversion  \

-build elf hex eep lss sym coff extcoff clean      \

-clean_list clean_binary program debug gdb-config  \

-doxygen dfu flip flip-ee dfu-ee
\ No newline at end of file
+.PHONY : all showeventhooks showliboptions showtarget  \

+begin finish end sizebefore sizeafter gccversion build \

+elf hex eep lss sym coff extcoff program clean debug   \

+clean_list clean_binary gdb-config doxygen dfu flip    \

+flip-ee dfu-ee
\ No newline at end of file
diff --git a/Demos/Device/LowLevel/Mouse/makefile b/Demos/Device/LowLevel/Mouse/makefile
index 9ed44c3ff..beb76ab8b 100644
--- a/Demos/Device/LowLevel/Mouse/makefile
+++ b/Demos/Device/LowLevel/Mouse/makefile
@@ -463,7 +463,7 @@ ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS)
 

 

 # Default target.

-all: begin gccversion sizebefore build checkhooks checklibmode checkboard sizeafter end

+all: begin gccversion sizebefore build showeventhooks showliboptions showtarget sizeafter end

 

 # Change the build target to build a HEX file or a library.

 build: elf hex eep lss sym

@@ -506,27 +506,29 @@ sizeafter:
 	@if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); \

 	2>/dev/null; echo; fi

 

-checkhooks: build

+showeventhooks: build

 	@echo

-	@echo ------- Unhooked LUFA Events -------

+	@echo -------- Unhooked LUFA Events --------

 	@$(shell) (grep -s '^EVENT_.*LUFA/.*\\.o' $(TARGET).map | \

 	           cut -d' ' -f1 | cut -d'_' -f2- | grep ".*") || \

 			   echo "(None)"

-	@echo ------------------------------------

+	@echo --------------------------------------

 

-checklibmode:

+showliboptions:

 	@echo

-	@echo ----------- Library Mode -----------

-	@$(shell) ($(CC) $(ALL_CFLAGS) -E -dM - < /dev/null \

-	          | grep 'USB_\(DEVICE\|HOST\)_ONLY' | cut -d' ' -f2 | grep ".*") \

-	          || echo "No specific mode (both device and host mode allowable)."

-	@echo ------------------------------------

+	@echo ---- Compile Time Library Options ----

+	@for i in $(LUFA_OPTS:-D%=%); do \

+		echo $$i; \

+	done

+	@echo --------------------------------------

 

-checkboard:

+showtarget:

 	@echo

-	@echo ---------- Selected Board ----------

-	@echo Selected board model is $(BOARD).

-	@echo ------------------------------------

+	@echo --------- Target Information ---------

+	@echo AVR Model: $(MCU)

+	@echo Board:     $(BOARD)

+	@echo Clock:     $(F_CPU)Hz CPU, $(F_CLOCK)Hz Master

+	@echo --------------------------------------

 	

 # Display compiler version information.

 gccversion : 

@@ -538,26 +540,6 @@ gccversion :
 program: $(TARGET).hex $(TARGET).eep

 	$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM)

 

-flip: $(TARGET).hex

-	batchisp -hardware usb -device $(MCU) -operation erase f

-	batchisp -hardware usb -device $(MCU) -operation loadbuffer $(TARGET).hex program

-	batchisp -hardware usb -device $(MCU) -operation start reset 0

-

-dfu: $(TARGET).hex

-	dfu-programmer $(MCU) erase

-	dfu-programmer $(MCU) flash --debug 1 $(TARGET).hex

-	dfu-programmer $(MCU) reset

-

-flip-ee: $(TARGET).hex $(TARGET).eep

-	copy $(TARGET).eep $(TARGET)eep.hex

-	batchisp -hardware usb -device $(MCU) -operation memory EEPROM erase

-	batchisp -hardware usb -device $(MCU) -operation memory EEPROM loadbuffer $(TARGET)eep.hex program

-	batchisp -hardware usb -device $(MCU) -operation start reset 0

-

-dfu-ee: $(TARGET).hex $(TARGET).eep

-	dfu-programmer $(MCU) flash-eeprom --debug 1 --suppress-bootloader-mem $(TARGET).eep

-	dfu-programmer $(MCU) reset

-

 

 # Generate avr-gdb config/init file which does the following:

 #     define the reset signal, load the target file, connect to target, and set 

@@ -732,8 +714,8 @@ $(shell mkdir $(OBJDIR) 2>/dev/null)
 

 

 # Listing of phony targets.

-.PHONY : all checkhooks checklibmode checkboard   \

-begin finish end sizebefore sizeafter gccversion  \

-build elf hex eep lss sym coff extcoff clean      \

-clean_list clean_binary program debug gdb-config  \

-doxygen dfu flip flip-ee dfu-ee
\ No newline at end of file
+.PHONY : all showeventhooks showliboptions showtarget  \

+begin finish end sizebefore sizeafter gccversion build \

+elf hex eep lss sym coff extcoff program clean debug   \

+clean_list clean_binary gdb-config doxygen dfu flip    \

+flip-ee dfu-ee
\ No newline at end of file
diff --git a/Demos/Device/LowLevel/RNDISEthernet/makefile b/Demos/Device/LowLevel/RNDISEthernet/makefile
index f060c662e..612718e63 100644
--- a/Demos/Device/LowLevel/RNDISEthernet/makefile
+++ b/Demos/Device/LowLevel/RNDISEthernet/makefile
@@ -476,7 +476,7 @@ ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS)
 

 

 # Default target.

-all: begin gccversion sizebefore build checkhooks checklibmode checkboard sizeafter end

+all: begin gccversion sizebefore build showeventhooks showliboptions showtarget sizeafter end

 

 # Change the build target to build a HEX file or a library.

 build: elf hex eep lss sym

@@ -519,27 +519,29 @@ sizeafter:
 	@if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); \

 	2>/dev/null; echo; fi

 

-checkhooks: build

+showeventhooks: build

 	@echo

-	@echo ------- Unhooked LUFA Events -------

+	@echo -------- Unhooked LUFA Events --------

 	@$(shell) (grep -s '^EVENT_.*LUFA/.*\\.o' $(TARGET).map | \

 	           cut -d' ' -f1 | cut -d'_' -f2- | grep ".*") || \

 			   echo "(None)"

-	@echo ------------------------------------

+	@echo --------------------------------------

 

-checklibmode:

+showliboptions:

 	@echo

-	@echo ----------- Library Mode -----------

-	@$(shell) ($(CC) $(ALL_CFLAGS) -E -dM - < /dev/null \

-	          | grep 'USB_\(DEVICE\|HOST\)_ONLY' | cut -d' ' -f2 | grep ".*") \

-	          || echo "No specific mode (both device and host mode allowable)."

-	@echo ------------------------------------

+	@echo ---- Compile Time Library Options ----

+	@for i in $(LUFA_OPTS:-D%=%); do \

+		echo $$i; \

+	done

+	@echo --------------------------------------

 

-checkboard:

+showtarget:

 	@echo

-	@echo ---------- Selected Board ----------

-	@echo Selected board model is $(BOARD).

-	@echo ------------------------------------

+	@echo --------- Target Information ---------

+	@echo AVR Model: $(MCU)

+	@echo Board:     $(BOARD)

+	@echo Clock:     $(F_CPU)Hz CPU, $(F_CLOCK)Hz Master

+	@echo --------------------------------------

 	

 # Display compiler version information.

 gccversion : 

@@ -551,26 +553,6 @@ gccversion :
 program: $(TARGET).hex $(TARGET).eep

 	$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM)

 

-flip: $(TARGET).hex

-	batchisp -hardware usb -device $(MCU) -operation erase f

-	batchisp -hardware usb -device $(MCU) -operation loadbuffer $(TARGET).hex program

-	batchisp -hardware usb -device $(MCU) -operation start reset 0

-

-dfu: $(TARGET).hex

-	dfu-programmer $(MCU) erase

-	dfu-programmer $(MCU) flash --debug 1 $(TARGET).hex

-	dfu-programmer $(MCU) reset

-

-flip-ee: $(TARGET).hex $(TARGET).eep

-	copy $(TARGET).eep $(TARGET)eep.hex

-	batchisp -hardware usb -device $(MCU) -operation memory EEPROM erase

-	batchisp -hardware usb -device $(MCU) -operation memory EEPROM loadbuffer $(TARGET)eep.hex program

-	batchisp -hardware usb -device $(MCU) -operation start reset 0

-

-dfu-ee: $(TARGET).hex $(TARGET).eep

-	dfu-programmer $(MCU) flash-eeprom --debug 1 --suppress-bootloader-mem $(TARGET).eep

-	dfu-programmer $(MCU) reset

-

 

 # Generate avr-gdb config/init file which does the following:

 #     define the reset signal, load the target file, connect to target, and set 

@@ -745,8 +727,8 @@ $(shell mkdir $(OBJDIR) 2>/dev/null)
 

 

 # Listing of phony targets.

-.PHONY : all checkhooks checklibmode checkboard   \

-begin finish end sizebefore sizeafter gccversion  \

-build elf hex eep lss sym coff extcoff clean      \

-clean_list clean_binary program debug gdb-config  \

-doxygen dfu flip flip-ee dfu-ee
\ No newline at end of file
+.PHONY : all showeventhooks showliboptions showtarget  \

+begin finish end sizebefore sizeafter gccversion build \

+elf hex eep lss sym coff extcoff program clean debug   \

+clean_list clean_binary gdb-config doxygen dfu flip    \

+flip-ee dfu-ee
\ No newline at end of file
diff --git a/Demos/Device/LowLevel/USBtoSerial/makefile b/Demos/Device/LowLevel/USBtoSerial/makefile
index 8e989d52c..9a08fb4dd 100644
--- a/Demos/Device/LowLevel/USBtoSerial/makefile
+++ b/Demos/Device/LowLevel/USBtoSerial/makefile
@@ -464,7 +464,7 @@ ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS)
 

 

 # Default target.

-all: begin gccversion sizebefore build checkhooks checklibmode checkboard sizeafter end

+all: begin gccversion sizebefore build showeventhooks showliboptions showtarget sizeafter end

 

 # Change the build target to build a HEX file or a library.

 build: elf hex eep lss sym

@@ -507,27 +507,29 @@ sizeafter:
 	@if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); \

 	2>/dev/null; echo; fi

 

-checkhooks: build

+showeventhooks: build

 	@echo

-	@echo ------- Unhooked LUFA Events -------

+	@echo -------- Unhooked LUFA Events --------

 	@$(shell) (grep -s '^EVENT_.*LUFA/.*\\.o' $(TARGET).map | \

 	           cut -d' ' -f1 | cut -d'_' -f2- | grep ".*") || \

 			   echo "(None)"

-	@echo ------------------------------------

+	@echo --------------------------------------

 

-checklibmode:

+showliboptions:

 	@echo

-	@echo ----------- Library Mode -----------

-	@$(shell) ($(CC) $(ALL_CFLAGS) -E -dM - < /dev/null \

-	          | grep 'USB_\(DEVICE\|HOST\)_ONLY' | cut -d' ' -f2 | grep ".*") \

-	          || echo "No specific mode (both device and host mode allowable)."

-	@echo ------------------------------------

+	@echo ---- Compile Time Library Options ----

+	@for i in $(LUFA_OPTS:-D%=%); do \

+		echo $$i; \

+	done

+	@echo --------------------------------------

 

-checkboard:

+showtarget:

 	@echo

-	@echo ---------- Selected Board ----------

-	@echo Selected board model is $(BOARD).

-	@echo ------------------------------------

+	@echo --------- Target Information ---------

+	@echo AVR Model: $(MCU)

+	@echo Board:     $(BOARD)

+	@echo Clock:     $(F_CPU)Hz CPU, $(F_CLOCK)Hz Master

+	@echo --------------------------------------

 	

 # Display compiler version information.

 gccversion : 

@@ -539,26 +541,6 @@ gccversion :
 program: $(TARGET).hex $(TARGET).eep

 	$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM)

 

-flip: $(TARGET).hex

-	batchisp -hardware usb -device $(MCU) -operation erase f

-	batchisp -hardware usb -device $(MCU) -operation loadbuffer $(TARGET).hex program

-	batchisp -hardware usb -device $(MCU) -operation start reset 0

-

-dfu: $(TARGET).hex

-	dfu-programmer $(MCU) erase

-	dfu-programmer $(MCU) flash --debug 1 $(TARGET).hex

-	dfu-programmer $(MCU) reset

-

-flip-ee: $(TARGET).hex $(TARGET).eep

-	copy $(TARGET).eep $(TARGET)eep.hex

-	batchisp -hardware usb -device $(MCU) -operation memory EEPROM erase

-	batchisp -hardware usb -device $(MCU) -operation memory EEPROM loadbuffer $(TARGET)eep.hex program

-	batchisp -hardware usb -device $(MCU) -operation start reset 0

-

-dfu-ee: $(TARGET).hex $(TARGET).eep

-	dfu-programmer $(MCU) flash-eeprom --debug 1 --suppress-bootloader-mem $(TARGET).eep

-	dfu-programmer $(MCU) reset

-

 

 # Generate avr-gdb config/init file which does the following:

 #     define the reset signal, load the target file, connect to target, and set 

@@ -733,8 +715,8 @@ $(shell mkdir $(OBJDIR) 2>/dev/null)
 

 

 # Listing of phony targets.

-.PHONY : all checkhooks checklibmode checkboard   \

-begin finish end sizebefore sizeafter gccversion  \

-build elf hex eep lss sym coff extcoff clean      \

-clean_list clean_binary program debug gdb-config  \

-doxygen dfu flip flip-ee dfu-ee
\ No newline at end of file
+.PHONY : all showeventhooks showliboptions showtarget  \

+begin finish end sizebefore sizeafter gccversion build \

+elf hex eep lss sym coff extcoff program clean debug   \

+clean_list clean_binary gdb-config doxygen dfu flip    \

+flip-ee dfu-ee
\ No newline at end of file