Merge branch 'master' of https://github.com/Proxmark/proxmark3

[proxmark3-svn] / Makefile

diff --git a/Makefile b/Makefile
index 4b1016c4429a261a784e2869f7f26d80f73547f6..101212b49c0a7fbf3aadbe27033a68d1057ca47f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,9 @@
 include common/Makefile.common
 
 GZIP=gzip
+FLASH_PORT=/dev/ttyACM0
 
-all clean: %: bootrom/% armsrc/% client/%
+all clean: %: bootrom/% armsrc/% client/% recovery/%
 
 bootrom/%: FORCE
        $(MAKE) -C bootrom $(patsubst bootrom/%,%,$@)
@@ -10,6 +11,8 @@ armsrc/%: FORCE
        $(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)
 
 
@@ -29,19 +32,19 @@ help:
 client: client/all
 
 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_TOOL) $(subst /,$(PATHSEP),$<)
+       $(FLASH_TOOL) $(FLASH_PORT) $(subst /,$(PATHSEP),$<)
 
 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_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_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