Merge remote-tracking branch 'origin/master' into iclass-fixes

[proxmark3-svn] / Makefile

diff --git a/Makefile b/Makefile
index 5014fb0a09dda5a0a4b4d626313d2b361d2a09df..101212b49c0a7fbf3aadbe27033a68d1057ca47f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,9 @@
 include common/Makefile.common
 
 include common/Makefile.common
 

-all clean: %: bootrom/% armsrc/% client/%
+GZIP=gzip
+FLASH_PORT=/dev/ttyACM0
+
+all clean: %: bootrom/% armsrc/% client/% recovery/%

 
 bootrom/%: FORCE
        $(MAKE) -C bootrom $(patsubst bootrom/%,%,$@)
 
 bootrom/%: FORCE
        $(MAKE) -C bootrom $(patsubst bootrom/%,%,$@)


@@ -8,6 +11,8 @@ armsrc/%: FORCE
        $(MAKE) -C armsrc $(patsubst armsrc/%,%,$@)
 client/%: FORCE
        $(MAKE) -C client $(patsubst client/%,%,$@)
        $(MAKE) -C armsrc $(patsubst armsrc/%,%,$@)
 client/%: FORCE
        $(MAKE) -C client $(patsubst client/%,%,$@)

+recovery/%: FORCE
+       $(MAKE) -C recovery $(patsubst recovery/%,%,$@)

 FORCE: # Dummy target to force remake in the subdirectories, even if files exist (this Makefile doesn't know about the prerequisites)
 
 
 FORCE: # Dummy target to force remake in the subdirectories, even if files exist (this Makefile doesn't know about the prerequisites)
 
 


@@ -16,6 +21,7 @@ help:
        @echo Multi-OS Makefile, you are running on $(DETECTED_OS)
        @echo Possible targets:
        @echo + all           - Make bootrom, armsrc and the OS-specific host directory
        @echo Multi-OS Makefile, you are running on $(DETECTED_OS)
        @echo Possible targets:
        @echo + all           - Make bootrom, armsrc and the OS-specific host directory

+       @echo + client        - Make only the OS-specific host directory

        @echo + flash-bootrom - Make bootrom and flash it
        @echo + flash-os      - Make armsrc and flash os
        @echo + flash-fpga    - Make armsrc and flash fpga
        @echo + flash-bootrom - Make bootrom and flash it
        @echo + flash-os      - Make armsrc and flash os
        @echo + flash-fpga    - Make armsrc and flash fpga


@@ -23,20 +29,29 @@ 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
 

+client: client/all
+

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

-       $(FLASH_TOOL) -b $(subst /,$(PATHSEP),$<)
+       $(FLASH_TOOL) $(FLASH_PORT) -b $(subst /,$(PATHSEP),$<)

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

-       $(FLASH_TOOL) $(subst /,$(PATHSEP),$<)
+       $(FLASH_TOOL) $(FLASH_PORT) $(subst /,$(PATHSEP),$<)

 
 flash-fpga: armsrc/obj/fpgaimage.elf $(FLASH_TOOL)
 
 flash-fpga: armsrc/obj/fpgaimage.elf $(FLASH_TOOL)

-       $(FLASH_TOOL) $(subst /,$(PATHSEP),$<)
+       $(FLASH_TOOL) $(FLASH_PORT) $(subst /,$(PATHSEP),$<)

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

-       $(FLASH_TOOL) $(subst /,$(PATHSEP),$(filter-out $(FLASH_TOOL),$^))
+       $(FLASH_TOOL) $(FLASH_PORT) $(subst /,$(PATHSEP),$(filter-out $(FLASH_TOOL),$^))

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

-       $(FLASH_TOOL) -b $(subst /,$(PATHSEP),$(filter-out $(FLASH_TOOL),$^))
+       $(FLASH_TOOL) $(FLASH_PORT) -b $(subst /,$(PATHSEP),$(filter-out $(FLASH_TOOL),$^))
+
+newtarbin:
+       $(DELETE) proxmark3-$(platform)-bin.tar proxmark3-$(platform)-bin.tar.gz
+       @touch proxmark3-$(platform)-bin.tar
+
+tarbin: newtarbin client/tarbin armsrc/tarbin bootrom/tarbin
+       $(GZIP) proxmark3-$(platform)-bin.tar

 
 # Dummy target to test for GNU make availability
 _test:
 
 # Dummy target to test for GNU make availability
 _test: