Add .PHONY targets in all build system modules. Alter BUILD module so that the existe...

diff --git a/LUFA/Build/lufa.avrdude.in b/LUFA/Build/lufa.avrdude.in
index 4c43d18..52cb44b 100644 (file)
--- a/LUFA/Build/lufa.avrdude.in
+++ b/LUFA/Build/lufa.avrdude.in
@@ -60,3 +60,6 @@ program: $(TARGET).hex $(MAKEFILE_LIST)
 program-ee: $(TARGET).eep $(MAKEFILE_LIST)\r
        @echo $(MSG_AVRDUDE_CMD) Programming device \"$(MCU)\" with settings \"$(AVRDUDE_EEP_FLAGS)\" using \"$(AVRDUDE_PROGRAMMER)\" on port \"$(AVRDUDE_PORT)\"\r
        avrdude -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) $(AVRDUDE_EEP_FLAGS)\r
 program-ee: $(TARGET).eep $(MAKEFILE_LIST)\r
        @echo $(MSG_AVRDUDE_CMD) Programming device \"$(MCU)\" with settings \"$(AVRDUDE_EEP_FLAGS)\" using \"$(AVRDUDE_PROGRAMMER)\" on port \"$(AVRDUDE_PORT)\"\r
        avrdude -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) $(AVRDUDE_EEP_FLAGS)\r

+\r
+# Phony build targets for this module\r
+.PHONY: program program-ee
\ No newline at end of file

diff --git a/LUFA/Build/lufa.build.in b/LUFA/Build/lufa.build.in
index bcf539d..a8569a6 100644 (file)
--- a/LUFA/Build/lufa.build.in
+++ b/LUFA/Build/lufa.build.in
@@ -7,7 +7,7 @@
 #\r
 \r
 LUFA_BUILD_MODULES        += BUILD\r
 #\r
 \r
 LUFA_BUILD_MODULES        += BUILD\r

-LUFA_BUILD_TARGETS        += size checksource all elf hex lss gcc_version clean\r
+LUFA_BUILD_TARGETS        += size all elf hex lss clean\r

 LUFA_BUILD_MANDATORY_VARS += TARGET ARCH MCU SRC F_USB LUFA_PATH\r
 LUFA_BUILD_OPTIONAL_VARS  += BOARD OPTIMIZATION C_STANDARD CPP_STANDARD F_CPU C_FLAGS CPP_FLAGS ASM_FLAGS CC_FLAGS LD_FLAGS\r
 \r
 LUFA_BUILD_MANDATORY_VARS += TARGET ARCH MCU SRC F_USB LUFA_PATH\r
 LUFA_BUILD_OPTIONAL_VARS  += BOARD OPTIMIZATION C_STANDARD CPP_STANDARD F_CPU C_FLAGS CPP_FLAGS ASM_FLAGS CC_FLAGS LD_FLAGS\r
 \r


@@ -20,13 +20,11 @@ LUFA_BUILD_OPTIONAL_VARS  += BOARD OPTIMIZATION C_STANDARD CPP_STANDARD F_CPU C_
 # -----------------------------------------------------------------------------\r
 # TARGETS:\r
 #\r
 # -----------------------------------------------------------------------------\r
 # TARGETS:\r
 #\r

-#    size                      - List application size\r
-#    checksource               - Check existance of listed input source files\r
+#    size                      - List built application size\r

 #    all                       - Build application and list size\r
 #    elf                       - Build application ELF debug object file\r
 #    hex                       - Build application HEX object files\r
 #    lss                       - Build application LSS assembly listing file\r
 #    all                       - Build application and list size\r
 #    elf                       - Build application ELF debug object file\r
 #    hex                       - Build application HEX object files\r
 #    lss                       - Build application LSS assembly listing file\r

-#    gcc_version               - Print version of GCC used\r

 #    clean                     - Remove output files\r
 #\r
 # MANDATORY PARAMETERS:\r
 #    clean                     - Remove output files\r
 #\r
 # MANDATORY PARAMETERS:\r


@@ -155,12 +153,11 @@ end:
 gcc_version:\r
        @$(CROSS)gcc --version\r
 \r
 gcc_version:\r
        @$(CROSS)gcc --version\r
 \r

-checksource:\r
-       @for f in $(SRC) $(CPPSRC) $(ASRC); do \\r
-               if [ -f $$f ]; then \\r
-                       echo "Found Source File: $$f" ; \\r
-               else \\r
-                       echo "Source File Not Found: $$f" ; \\r
+check_source:\r
+       @for f in $(SRC); do \\r
+               if [ ! -f $$f ]; then \\r
+                       echo "Error: Source file not found: $$f"; \\r
+                       exit 1; \\r

                fi; \\r
         done\r
 \r
                fi; \\r
         done\r
 \r


@@ -170,8 +167,15 @@ size:
            $(CROSS)size $(SIZE_MCU_FLAG) $(SIZE_FORMAT_FLAG) $(TARGET).elf ; 2>/dev/null; \\r
         fi\r
 \r
            $(CROSS)size $(SIZE_MCU_FLAG) $(SIZE_FORMAT_FLAG) $(TARGET).elf ; 2>/dev/null; \\r
         fi\r
 \r

-.PHONY: begin gcc_version elf hex lss size end\r
-all: begin gcc_version elf hex lss size end\r
+clean:\r
+       @echo $(MSG_REMOVE_CMD) Removing object files \"$(strip $(notdir $(OBJECT_FILES)))\"\r
+       rm -f $(OBJECT_FILES)\r
+       @echo $(MSG_REMOVE_CMD) Removing dependency files \"$(strip $(notdir $(DEPENDENCY_FILES)))\"\r
+       rm -f $(DEPENDENCY_FILES)\r
+       @echo $(MSG_REMOVE_CMD) Removing output files \"$(TARGET).elf $(TARGET).hex $(TARGET).eep $(TARGET).map $(TARGET).lss\"\r
+       rm -f $(TARGET).elf $(TARGET).hex $(TARGET).eep $(TARGET).map $(TARGET).lss\r
+\r
+all: begin check_source gcc_version elf hex lss size end\r

 \r
 elf: $(TARGET).elf\r
 hex: $(TARGET).hex $(TARGET).eep\r
 \r
 elf: $(TARGET).elf\r
 hex: $(TARGET).hex $(TARGET).eep\r


@@ -206,13 +210,8 @@ lss: $(TARGET).lss
        @echo $(MSG_OBJDMP_CMD) Extracting LSS file data from \"$<\"\r
        $(CROSS)objdump -h -S -z $< > $@\r
 \r
        @echo $(MSG_OBJDMP_CMD) Extracting LSS file data from \"$<\"\r
        $(CROSS)objdump -h -S -z $< > $@\r
 \r

-clean:\r
-       @echo $(MSG_REMOVE_CMD) Removing object files \"$(strip $(notdir $(OBJECT_FILES)))\"\r
-       rm -f $(OBJECT_FILES)\r
-       @echo $(MSG_REMOVE_CMD) Removing dependency files \"$(strip $(notdir $(DEPENDENCY_FILES)))\"\r
-       rm -f $(DEPENDENCY_FILES)\r
-       @echo $(MSG_REMOVE_CMD) Removing output files \"$(TARGET).elf $(TARGET).hex $(TARGET).eep $(TARGET).map $(TARGET).lss\"\r
-       rm -f $(TARGET).elf $(TARGET).hex $(TARGET).eep $(TARGET).map $(TARGET).lss\r
-\r

 # Include build dependency files\r
 # Include build dependency files\r

--include $(DEPENDENCY_FILES)
\ No newline at end of file
+-include $(DEPENDENCY_FILES)\r
+\r
+# Phony build targets for this module\r
+.PHONY: begin end gcc_version check_source size elf hex lss clean
\ No newline at end of file

diff --git a/LUFA/Build/lufa.core.in b/LUFA/Build/lufa.core.in
index 4ce9221..d111aad 100644 (file)
--- a/LUFA/Build/lufa.core.in
+++ b/LUFA/Build/lufa.core.in
@@ -100,3 +100,6 @@ list_mandatory:
        \r
 list_optional:\r
        @echo Optional Variables for Included Modules: $(SORTED_LUFA_OPTIONAL_VARS)\r
        \r
 list_optional:\r
        @echo Optional Variables for Included Modules: $(SORTED_LUFA_OPTIONAL_VARS)\r

+\r
+# Phony build targets for this module\r
+.PHONY: help list_modules list_targets list_mandatory list_optional
\ No newline at end of file

diff --git a/LUFA/Build/lufa.dfu.in b/LUFA/Build/lufa.dfu.in
index 565e848..91922d0 100644 (file)
--- a/LUFA/Build/lufa.dfu.in
+++ b/LUFA/Build/lufa.dfu.in
@@ -70,4 +70,7 @@ dfu: $(TARGET).hex $(MAKEFILE_LIST)
 dfu-ee: $(TARGET).eep $(MAKEFILE_LIST)\r
        @echo $(MSG_DFU_CMD) Programming EEPROM with dfu-programmer using \"$(TARGET).eep\"\r
        dfu-programmer $(MCU) eeprom-flash $(TARGET).eep\r
 dfu-ee: $(TARGET).eep $(MAKEFILE_LIST)\r
        @echo $(MSG_DFU_CMD) Programming EEPROM with dfu-programmer using \"$(TARGET).eep\"\r
        dfu-programmer $(MCU) eeprom-flash $(TARGET).eep\r

-       dfu-programmer $(MCU) reset
\ No newline at end of file
+       dfu-programmer $(MCU) reset\r
+       \r
+# Phony build targets for this module\r
+.PHONY: flip flip-ee dfu dfu-ee
\ No newline at end of file

diff --git a/LUFA/Build/lufa.doxygen.in b/LUFA/Build/lufa.doxygen.in
index 7d4f8ae..0a6ad6e 100644 (file)
--- a/LUFA/Build/lufa.doxygen.in
+++ b/LUFA/Build/lufa.doxygen.in
@@ -50,10 +50,15 @@ MSG_DOXYGEN_CMD         := ' [DOXYGEN] :'
 BASE_DOXYGEN_CMD = ( cat Doxygen.conf $(DOXYGEN_OVERRIDE_PARAMS:%=; echo "%") ) | doxygen -\r
 ifeq ($(DOXYGEN_FAIL_ON_WARNING), Y)\r
    DOXYGEN_CMD = if ( $(BASE_DOXYGEN_CMD) 2>&1 | grep -v "warning: ignoring unsupported tag" ;); then exit 1; fi;\r
 BASE_DOXYGEN_CMD = ( cat Doxygen.conf $(DOXYGEN_OVERRIDE_PARAMS:%=; echo "%") ) | doxygen -\r
 ifeq ($(DOXYGEN_FAIL_ON_WARNING), Y)\r
    DOXYGEN_CMD = if ( $(BASE_DOXYGEN_CMD) 2>&1 | grep -v "warning: ignoring unsupported tag" ;); then exit 1; fi;\r

-else\r
+else ifeq ($(DOXYGEN_FAIL_ON_WARNING), N)\r

    DOXYGEN_CMD = $(BASE_DOXYGEN_CMD)\r
    DOXYGEN_CMD = $(BASE_DOXYGEN_CMD)\r

+else\r
+       $(error DOXYGEN_FAIL_ON_WARNING must be Y or N.)\r

 endif\r
 \r
 doxygen:\r
        @echo $(MSG_DOXYGEN_CMD) Configuration file \"$(DOXYGEN_CONF)\" with parameters \"$(DOXYGEN_OVERRIDE_PARAMS)\"\r
        $(DOXYGEN_CMD)\r
 endif\r
 \r
 doxygen:\r
        @echo $(MSG_DOXYGEN_CMD) Configuration file \"$(DOXYGEN_CONF)\" with parameters \"$(DOXYGEN_OVERRIDE_PARAMS)\"\r
        $(DOXYGEN_CMD)\r

+\r
+# Phony build targets for this module\r
+.PHONY: doxygen
\ No newline at end of file