marcan's patch until he gets commit access. Remove C library's includes from the...

[proxmark3-svn] / Makefile

diff --git a/Makefile b/Makefile
index 2c95cc1455bda572066b0bf669606749ec9046d4..ae8e12c424e5153fc0dbbeee2f578974b608cbbb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,38 @@
 include common/Makefile.common
 
-ifeq ($(DETECTED_OS),Linux)
-HOST_BINARY=linux
-else
-HOST_BINARY=winsrc
-endif
-
-all clean: %:
-       $(MAKE) -C bootrom $@
-       $(MAKE) -C armsrc $@
-       $(MAKE) -C $(HOST_BINARY) $@
-
-.PHONY: all clean help
+all clean: %: bootrom/% armsrc/% client/%
+
+bootrom/%: FORCE
+       $(MAKE) -C bootrom $(patsubst bootrom/%,%,$@)
+armsrc/%: FORCE
+       $(MAKE) -C armsrc $(patsubst armsrc/%,%,$@)
+client/%: FORCE
+       $(MAKE) -C client $(patsubst client/%,%,$@)
+FORCE: # Dummy target to force remake in the subdirectories, even if files exist (this Makefile doesn't know about the prerequisites)
+
+
+.PHONY: all clean help _test flash-bootrom flash-os flash-both flash-all FORCE
 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 + clean - Clean in bootrom, armsrc and the OS-specific host directory
-       
\ No newline at end of file
+       @echo + all           - Make bootrom, armsrc and the OS-specific host directory
+       @echo + flash-bootrom - Make bootrom and flash it
+       @echo + flash-os      - Make armsrc and flash os
+       @echo + flash-both    - Make armsrc and flash os and fpga image
+       @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.elf $(FLASH_TOOL)
+       $(FLASH_TOOL) bootrom $(subst /,$(PATHSEP),$<)
+
+flash-os: armsrc/obj/osimage.elf $(FLASH_TOOL)
+       $(FLASH_TOOL) os $(subst /,$(PATHSEP),$<)
+
+flash-both: armsrc/obj/osimage.elf armsrc/obj/fpgaimage.elf $(FLASH_TOOL)
+       $(FLASH_TOOL) os,fpga $(subst /,$(PATHSEP),$(filter-out $(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
+_test: