Consolidate Linux/Windows Makefiles into one, see http://www.proxmark.org/forum/topic...

[proxmark3-svn] / armsrc / Makefile

diff --git a/armsrc/Makefile b/armsrc/Makefile
index b7b4d71007d24aad47b5c937a1a41f1ba6bfc905..1acfdd88c700d85bcf0479d34ca9a1235c9e9a81 100644 (file)
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -1,19 +1,11 @@
-PATH=..\..\devkitARM\bin;%PATH%\r
-CC     = arm-elf-gcc\r
-AS     = arm-elf-as\r
-LD     = arm-elf-ld\r
-OBJCOPY = arm-elf-objcopy\r
+# Makefile for armsrc, see ../common/Makefile.common for common settings\r
+include ../common/Makefile.common\r
 \r
-OBJDIR = obj\r
+APP_INCLUDES = apps.h\r
 \r
-INCLUDE = -I../include\r
-\r
-INCLUDES = ../include/proxmark3.h ../include/at91sam7s128.h ../include/config_gpio.h ../include/usb_cmd.h apps.h\r
-LIB = "..\..\devkitARM\lib\gcc\arm-elf\4.1.0\interwork"\r
-\r
-# Add the "-DWITH_LCD" flag in CLFAGS to add support for LCD\r
+# Add the "-DWITH_LCD" flag in APP_CLFAGS to add support for LCD\r
 # and add OBJLCD to OBJ too\r
-CFLAGS = -O6 -c $(INCLUDE) -Wall\r
+APP_CFLAGS     = -O6\r
 \r
 OBJLCD = $(OBJDIR)/fonts.o \\r
                $(OBJDIR)/LCD.o\r
@@ -21,45 +13,41 @@ OBJLCD = $(OBJDIR)/fonts.o \
 OBJ =  $(OBJDIR)/start.o \\r
                $(OBJDIR)/appmain.o \\r
                $(OBJDIR)/fpga.o \\r
+               $(OBJDIR)/lfops.o \\r
                $(OBJDIR)/iso14443.o \\r
                $(OBJDIR)/iso14443a.o \\r
                $(OBJDIR)/iso15693.o \\r
-               $(OBJDIR)/util.o\r
+               $(OBJDIR)/util.o \\r
+               $(OBJDIR)/usb.o\r
 \r
 OBJFPGA = \\r
                $(OBJDIR)/fpgaimg.o\r
 \r
-OBJCOMMON = \\r
-               $(OBJDIR)/usb.o\r
-\r
-all: osimage.s19\r
-\r
-$(OBJDIR)/fpgaimage.s19: $(OBJDIR)/fpgaimg.o\r
-       @echo obj/fpgaimage.s19\r
-       @$(LD) -g -Tldscript-fpga -o $(OBJDIR)\fpgaimage.elf $(OBJDIR)/fpgaimg.o\r
-       @$(OBJCOPY) -Osrec --srec-forceS3 $(OBJDIR)\fpgaimage.elf $(OBJDIR)\fpgaimage.s19\r
-\r
-$(OBJDIR)/osimage.s19: $(OBJ) $(OBJCOMMON)\r
-       @echo obj/osimage.s19\r
-       @$(LD) -g -Tldscript -o $(OBJDIR)\osimage.elf $(OBJ) $(OBJCOMMON) $(LIB)\libgcc.a\r
-       @$(OBJCOPY) -Osrec --srec-forceS3 $(OBJDIR)\osimage.elf $(OBJDIR)\osimage.s19\r
+all: $(OBJDIR)/osimage.s19 $(OBJDIR)/fpgaimage.s19\r
 \r
-osimage.s19: $(OBJDIR)/osimage.s19 $(OBJDIR)/fpgaimage.s19\r
-       @echo osimage.s19\r
+$(OBJDIR)/fpgaimage.elf: $(OBJDIR)/fpgaimg.o\r
+       $(LD) -g -Tldscript-fpga -Map=$(patsubst %.elf,%.map,$@) -o $@ $^\r
 \r
-$(OBJ): $(@B).c $(INCLUDES)\r
-       @echo $(@B).c\r
-       @$(CC) $(CFLAGS) -mthumb -mthumb-interwork $(@B).c -o $(OBJDIR)/$(@B).o\r
+$(OBJDIR)/osimage.elf: $(OBJ) $(OBJCOMMON) $(ARMLIB)/libgcc.a\r
+       $(LD) -g -Tldscript -Map=$(patsubst %.elf,%.map,$@) -o $@ $^\r
 \r
-$(OBJCOMMON): ../common/$(@B).c $(INCLUDES)\r
-       @echo $(@B).c\r
-       @$(CC) $(CFLAGS) -mthumb -mthumb-interwork ../common/$(@B).c -o $(OBJDIR)/$(@B).o\r
+$(OBJDIR)/%.s19: $(OBJDIR)/%.elf\r
+       $(OBJCOPY) -Osrec --srec-forceS3 $^ $@\r
 \r
-$(OBJFPGA): $(@B).c $(INCLUDES)\r
-       @echo $(@B).c\r
-       @$(CC) $(CFLAGS) -mthumb -mthumb-interwork $(@B).c -o $(OBJDIR)/$(@B).o\r
+$(OBJ) $(OBJFPGA): $(OBJDIR)/%.o: %.c $(INCLUDES)\r
+       $(CC) $(CFLAGS) -mthumb -mthumb-interwork $< -o $@\r
 \r
 clean:\r
-       del /q obj\*.o\r
-       del /q obj\*.elf\r
-       del /q obj\*.s19\r
+       $(DELETE) $(OBJDIR)$(PATHSEP)*.o\r
+       $(DELETE) $(OBJDIR)$(PATHSEP)*.elf\r
+       $(DELETE) $(OBJDIR)$(PATHSEP)*.s19\r
+       $(DELETE) $(OBJDIR)$(PATHSEP)*.map\r
+\r
+.PHONY: all clean help\r
+help:\r
+       @echo Multi-OS Makefile, you are running on $(DETECTED_OS)\r
+       @echo Possible targets:\r
+       @echo + all           - Make both:\r
+       @echo + osimage.s19   - The OS image\r
+       @echo + fpgaimage.s19 - The FPGA image\r
+       @echo + clean         - Clean $(OBJDIR)\r