Fix PrintAndLogEx ERR (#748)

[proxmark3-svn] / Makefile

diff --git a/Makefile b/Makefile
index 0e065b41dc9ee86c6245d421163f66990c0a75e5..1ab83f9e681c4448aac0b9789174a26d3130e859 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,40 @@
-include common/Makefile.common
-
+GZIP=gzip
+# Windows' echo echos its input verbatim, on Posix there is some
+#  amount of shell command line parsing going on. echo "" on 
+#  Windows yields literal "", on Linux yields an empty line
+ifeq ($(shell echo ""),)
+# This is probably a proper system, so we can use uname
+DELETE=rm -rf
+FLASH_TOOL=client/flasher
+platform=$(shell uname)
+ifneq (,$(findstring MINGW,$(platform)))
+FLASH_PORT=com3
+PATHSEP=\\#
+else
 FLASH_PORT=/dev/ttyACM0
+PATHSEP=/
+endif
+else
+# Assume that we are running on native Windows
+DELETE=del /q
+FLASH_TOOL=client/flasher.exe
+platform=Windows
+FLASH_PORT=com3
+PATHSEP=\\#
+endif
 
-all clean: %: client/% bootrom/% armsrc/% recovery/%
+all clean: %: client/% bootrom/% armsrc/% recovery/% mfkey/%
 
 bootrom/%: FORCE
-       $(MAKE) -C bootrom $(patsubst bootrom/%,%,$@)
+       $(MAKE) -C bootrom $(patsubst bootrom/%, %, $@)
 armsrc/%: FORCE
-       $(MAKE) -C armsrc $(patsubst armsrc/%,%,$@)
+       $(MAKE) -C armsrc $(patsubst armsrc/%, %, $@)
 client/%: FORCE
-       $(MAKE) -C client $(patsubst client/%,%,$@)
+       $(MAKE) -C client $(patsubst client/%, %, $@)
 recovery/%: FORCE
-       $(MAKE) -C recovery $(patsubst recovery/%,%,$@)
+       $(MAKE) -C recovery $(patsubst recovery/%, %, $@)
+mfkey/%: FORCE
+       $(MAKE) -C tools/mfkey $(patsubst mfkey/%, %, $@)
 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-all FORCE
@@ -22,12 +45,14 @@ help:
        @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 (includes fpga)
+       @echo + flash-os      - Make armsrc and flash os \(includes fpga\)
        @echo + flash-all     - Make bootrom and armsrc and flash bootrom and os image
        @echo + clean         - Clean in bootrom, armsrc and the OS-specific host directory
 
 client: client/all
 
+mfkey: mfkey/all
+
 flash-bootrom: bootrom/obj/bootrom.elf $(FLASH_TOOL)
        $(FLASH_TOOL) $(FLASH_PORT) -b $(subst /,$(PATHSEP),$<)