From d29a408ffd906b537bcdce2a0cd98827ea5c27e3 Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Fri, 25 Jun 2010 13:28:34 +0000
Subject: [PATCH] Add default "all" makefile targets to the demo tree
 makefiles.

---
 Demos/Device/makefile                                        | 2 ++
 Demos/DualRole/ClassDriver/MouseHostDevice/DeviceFunctions.c | 2 +-
 Demos/DualRole/makefile                                      | 2 ++
 Demos/Host/makefile                                          | 2 ++
 Demos/makefile                                               | 2 ++
 Projects/AVRISP-MKII/makefile                                | 2 +-
 6 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Demos/Device/makefile b/Demos/Device/makefile
index 3ef7809ca6..ce80f4e967 100644
--- a/Demos/Device/makefile
+++ b/Demos/Device/makefile
@@ -13,6 +13,8 @@
 # custom LUFA library build options are reflected in the compiled
 # code.
 
+all:
+
 %:
 	$(MAKE) -C ClassDriver $@
 	$(MAKE) -C LowLevel $@
diff --git a/Demos/DualRole/ClassDriver/MouseHostDevice/DeviceFunctions.c b/Demos/DualRole/ClassDriver/MouseHostDevice/DeviceFunctions.c
index e566cf89bd..628ea381ae 100644
--- a/Demos/DualRole/ClassDriver/MouseHostDevice/DeviceFunctions.c
+++ b/Demos/DualRole/ClassDriver/MouseHostDevice/DeviceFunctions.c
@@ -144,4 +144,4 @@ void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDI
                                           const uint8_t ReportType, const void* ReportData, const uint16_t ReportSize)
 {
 	// Unused (but mandatory for the HID class driver) in this demo, since there are no Host->Device reports
-}
\ No newline at end of file
+}
diff --git a/Demos/DualRole/makefile b/Demos/DualRole/makefile
index f2ba1a83b1..2e863bbad2 100644
--- a/Demos/DualRole/makefile
+++ b/Demos/DualRole/makefile
@@ -13,5 +13,7 @@
 # custom LUFA library build options are reflected in the compiled
 # code.
 
+all:
+
 %:
 	$(MAKE) -C ClassDriver/ $@
diff --git a/Demos/Host/makefile b/Demos/Host/makefile
index 3ef7809ca6..ce80f4e967 100644
--- a/Demos/Host/makefile
+++ b/Demos/Host/makefile
@@ -13,6 +13,8 @@
 # custom LUFA library build options are reflected in the compiled
 # code.
 
+all:
+
 %:
 	$(MAKE) -C ClassDriver $@
 	$(MAKE) -C LowLevel $@
diff --git a/Demos/makefile b/Demos/makefile
index c5736cb8f5..30434b7ead 100644
--- a/Demos/makefile
+++ b/Demos/makefile
@@ -13,6 +13,8 @@
 # custom LUFA library build options are reflected in the compiled
 # code.
 
+all:
+
 %:
 	$(MAKE) -C Device $@
 	$(MAKE) -C Host $@
diff --git a/Projects/AVRISP-MKII/makefile b/Projects/AVRISP-MKII/makefile
index c6b64dfe13..ab2e862dcf 100644
--- a/Projects/AVRISP-MKII/makefile
+++ b/Projects/AVRISP-MKII/makefile
@@ -194,9 +194,9 @@ CDEFS += -DAUX_LINE_PORT=PORTB
 CDEFS += -DAUX_LINE_PIN=PINB
 CDEFS += -DAUX_LINE_DDR=DDRB
 CDEFS += -DAUX_LINE_MASK="(1 << 4)"
-CDEFS += -DVTARGET_ADC_CHANNEL=2
 CDEFS += -DENABLE_ISP_PROTOCOL
 CDEFS += -DENABLE_XPROG_PROTOCOL
+CDEFS += -DVTARGET_ADC_CHANNEL=2
 CDEFS += -DVTARGET_REF_VOLTS=5
 CDEFS += -DVTARGET_SCALE_FACTOR=1
 #CDEFS += -DNO_VTARGET_DETECT