oops. in the spirit of cleaner code, don't do stuff twice!

[proxmark3-svn] / Makefile

diff --git a/Makefile b/Makefile
index bb0d558948d62cef5e84b6c6f302cfca704aab52..ae8e12c424e5153fc0dbbeee2f578974b608cbbb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,16 +22,16 @@ help:
        @echo + flash-all     - Make bootrom and armsrc and flash bootrom, os and fpga image
        @echo + clean         - Clean in bootrom, armsrc and the OS-specific host directory
 
        @echo + flash-all     - Make bootrom and armsrc and flash bootrom, os and fpga image
        @echo + clean         - Clean in bootrom, armsrc and the OS-specific host directory
 

-flash-bootrom: bootrom/obj/bootrom.s19 $(FLASH_TOOL)
+flash-bootrom: bootrom/obj/bootrom.elf $(FLASH_TOOL)

        $(FLASH_TOOL) bootrom $(subst /,$(PATHSEP),$<)
 
        $(FLASH_TOOL) bootrom $(subst /,$(PATHSEP),$<)
 

-flash-os: armsrc/obj/osimage.s19 $(FLASH_TOOL)
+flash-os: armsrc/obj/osimage.elf $(FLASH_TOOL)

        $(FLASH_TOOL) os $(subst /,$(PATHSEP),$<)
 
        $(FLASH_TOOL) os $(subst /,$(PATHSEP),$<)
 

-flash-both: armsrc/obj/osimage.s19 armsrc/obj/fpgaimage.s19 $(FLASH_TOOL)
+flash-both: armsrc/obj/osimage.elf armsrc/obj/fpgaimage.elf $(FLASH_TOOL)

        $(FLASH_TOOL) os,fpga $(subst /,$(PATHSEP),$(filter-out $(FLASH_TOOL),$^))
 
        $(FLASH_TOOL) os,fpga $(subst /,$(PATHSEP),$(filter-out $(FLASH_TOOL),$^))
 

-flash-all: bootrom/obj/bootrom.s19 armsrc/obj/osimage.s19 armsrc/obj/fpgaimage.s19 $(FLASH_TOOL)
+flash-all: bootrom/obj/bootrom.elf armsrc/obj/osimage.elf armsrc/obj/fpgaimage.elf $(FLASH_TOOL)

        $(FLASH_TOOL) bootrom,os,fpga $(subst /,$(PATHSEP),$(filter-out $(FLASH_TOOL),$^))
 
 # Dummy target to test for GNU make availability
        $(FLASH_TOOL) bootrom,os,fpga $(subst /,$(PATHSEP),$(filter-out $(FLASH_TOOL),$^))
 
 # Dummy target to test for GNU make availability