Merge in latest trunk.

3 files changed, 18 insertions, 15 deletions

diff --git a/BuildTests/ModuleTest/makefile.avr8 b/BuildTests/ModuleTest/makefile.avr8
index 360b1ee8b..58fd5a47b 100644
--- a/BuildTests/ModuleTest/makefile.avr8
+++ b/BuildTests/ModuleTest/makefile.avr8
@@ -154,7 +154,7 @@ ASRC = Dummy.S
 # Optimization level, can be [0, 1, 2, 3, s].

 #     0 = turn off optimization. s = optimize for size.

 #     (Note: 3 is not always the best optimization level. See avr-libc FAQ.)

-OPT = s

+OPT = 1

 

 

 # Debugging format.

@@ -220,7 +220,7 @@ CFLAGS += -fpack-struct
 CFLAGS += -fshort-enums

 CFLAGS += -fno-strict-aliasing

 CFLAGS += -fno-split-wide-types

-CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)

+#CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)

 CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))

 CFLAGS += $(CSTANDARD)

 CFLAGS += -Werror

@@ -268,7 +268,7 @@ CPPFLAGS += -fshort-enums
 CPPFLAGS += -fno-exceptions

 CPPFLAGS += -Wall

 CPPFLAGS += -Wundef

-CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)

+#CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)

 CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))

 

 

@@ -281,7 +281,8 @@ CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 #             files -- see avr-libc docs [FIXME: not yet described there]

 #  -listing-cont-lines: Sets the maximum number of continuation lines of hex

 #       dump that will be displayed for a given single line of source input.

-ASFLAGS = $(ADEFS) -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100

+ASFLAGS = $(ADEFS)

+#ASFLAGS += -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100

 

 

 #---------------- Library Options ----------------

@@ -708,7 +709,7 @@ clean_list :
 

 doxygen:

 	@echo Generating Project Documentation \($(TARGET)\)...

-	@if ( doxygen Doxygen.conf 2>&1 | grep -v "warning: ignoring unsupported tag" ;); then \

+	@if ( ( cat Doxygen.conf ; echo "HTML_STYLESHEET=$(LUFA_PATH)/LUFA/DoxygenPages/Style/Style.css" ) | doxygen - 2>&1 | grep -v "warning: ignoring unsupported tag" ;); then \

 	  exit 1; \

 	fi;

 	@echo Documentation Generation Complete.

diff --git a/BuildTests/ModuleTest/makefile.uc3 b/BuildTests/ModuleTest/makefile.uc3
index 05b8d583b..9c01edf0b 100644
--- a/BuildTests/ModuleTest/makefile.uc3
+++ b/BuildTests/ModuleTest/makefile.uc3
@@ -126,7 +126,7 @@ ASRC = Dummy.S                 \
 # Optimization level, can be [0, 1, 2, 3, s]. 

 #     0 = turn off optimization. s = optimize for size.

 #     (Note: 3 is not always the best optimization level. See avr-libc FAQ.)

-OPT = s

+OPT = 1

 

 

 # List any extra directories to look for include files here.

@@ -186,7 +186,7 @@ CFLAGS += -funsigned-bitfields
 CFLAGS += -ffunction-sections

 CFLAGS += -fno-strict-aliasing

 CFLAGS += -masm-addr-pseudos

-CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)

+#CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)

 CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))

 CFLAGS += $(CSTANDARD)

 CFLAGS += -Werror

@@ -235,7 +235,7 @@ CPPFLAGS += -fno-exceptions
 CPPFLAGS += -masm-addr-pseudos

 CPPFLAGS += -Wall

 CPPFLAGS += -Wundef

-CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)

+#CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)

 CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))

 #CPPFLAGS += $(CSTANDARD)

 

@@ -249,7 +249,8 @@ CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 #             files -- see avr-libc docs [FIXME: not yet described there]

 #  -listing-cont-lines: Sets the maximum number of continuation lines of hex 

 #       dump that will be displayed for a given single line of source input.

-ASFLAGS = $(ADEFS) -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst)

+ASFLAGS = $(ADEFS)

+#ASFLAGS += -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100

 

 

 #---------------- Linker Options ----------------

@@ -480,7 +481,7 @@ clean_list :
 

 doxygen:

 	@echo Generating Project Documentation \($(TARGET)\)...

-	@if ( doxygen Doxygen.conf 2>&1 | grep -v "warning: ignoring unsupported tag" ;); then \

+	@if ( ( cat Doxygen.conf ; echo "HTML_STYLESHEET=$(LUFA_PATH)/LUFA/DoxygenPages/Style/Style.css" ) | doxygen - 2>&1 | grep -v "warning: ignoring unsupported tag" ;); then \

 	  exit 1; \

 	fi;

 	@echo Documentation Generation Complete.

diff --git a/BuildTests/ModuleTest/makefile.xmega b/BuildTests/ModuleTest/makefile.xmega
index de27630dc..3da056646 100644
--- a/BuildTests/ModuleTest/makefile.xmega
+++ b/BuildTests/ModuleTest/makefile.xmega
@@ -143,7 +143,7 @@ ASRC = Dummy.S
 # Optimization level, can be [0, 1, 2, 3, s]. 

 #     0 = turn off optimization. s = optimize for size.

 #     (Note: 3 is not always the best optimization level. See avr-libc FAQ.)

-OPT = s

+OPT = 1

 

 

 # List any extra directories to look for include files here.

@@ -209,7 +209,7 @@ CFLAGS += -fpack-struct
 CFLAGS += -fshort-enums

 CFLAGS += -fno-strict-aliasing

 CFLAGS += -fno-split-wide-types

-CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)

+#CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)

 CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))

 CFLAGS += $(CSTANDARD)

 CFLAGS += -Werror

@@ -259,7 +259,7 @@ CPPFLAGS += -fno-strict-aliasing
 CPPFLAGS += -fno-exceptions

 CPPFLAGS += -Wall

 CPPFLAGS += -Wundef

-CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)

+#CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)

 CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))

 #CPPFLAGS += $(CSTANDARD)

 

@@ -273,7 +273,8 @@ CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
 #             files -- see avr-libc docs [FIXME: not yet described there]

 #  -listing-cont-lines: Sets the maximum number of continuation lines of hex 

 #       dump that will be displayed for a given single line of source input.

-ASFLAGS = $(ADEFS) -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100

+ASFLAGS = $(ADEFS)

+#ASFLAGS += -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100

 

 

 #---------------- Library Options ----------------

@@ -700,7 +701,7 @@ clean_list :
 

 doxygen:

 	@echo Generating Project Documentation \($(TARGET)\)...

-	@if ( doxygen Doxygen.conf 2>&1 | grep -v "warning: ignoring unsupported tag" ;); then \

+	@if ( ( cat Doxygen.conf ; echo "HTML_STYLESHEET=$(LUFA_PATH)/LUFA/DoxygenPages/Style/Style.css" ) | doxygen - 2>&1 | grep -v "warning: ignoring unsupported tag" ;); then \

 	  exit 1; \

 	fi;

 	@echo Documentation Generation Complete.