Move most rules to Makefile.common

[proxmark3-svn] / armsrc / Makefile

diff --git a/armsrc/Makefile b/armsrc/Makefile
index 1acfdd88c700d85bcf0479d34ca9a1235c9e9a81..ce1ad087d3b7021e06b1fee4afe4a8b0730d138d 100644 (file)
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -1,47 +1,49 @@
 # Makefile for armsrc, see ../common/Makefile.common for common settings\r
 # Makefile for armsrc, see ../common/Makefile.common for common settings\r

-include ../common/Makefile.common\r

 \r
 APP_INCLUDES = apps.h\r
 \r
 # Add the "-DWITH_LCD" flag in APP_CLFAGS to add support for LCD\r
 \r
 APP_INCLUDES = apps.h\r
 \r
 # Add the "-DWITH_LCD" flag in APP_CLFAGS to add support for LCD\r

-# and add OBJLCD to OBJ too\r
+# and add SRC_LCD to SRC_MAIN\r

 APP_CFLAGS     = -O6\r
 \r
 APP_CFLAGS     = -O6\r
 \r

-OBJLCD = $(OBJDIR)/fonts.o \\r
-               $(OBJDIR)/LCD.o\r
+SRC_LCD = fonts.c LCD.c\r
+\r
+SRC_MAIN = start.c \\r
+       appmain.c \\r
+       fpga.c \\r
+       lfops.c \\r
+       iso15693.c \\r
+       util.c \\r
+       usb.c\r
+\r
+# These are to be compiled in ARM mode\r
+SRC_MAIN_FAST =  iso14443.c \\r
+       iso14443a.c\r

 \r
 \r

-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)/usb.o\r
+SRC_FPGA = fpgaimg.c\r

 \r
 \r

-OBJFPGA = \\r
-               $(OBJDIR)/fpgaimg.o\r
+THUMBSRC = $(SRC_MAIN) $(SRC_FPGA)\r
+ARMSRC = $(SRC_MAIN_FAST)\r
+\r
+MAIN_OBJ = $(patsubst %.c,$(OBJDIR)/%.o,$(SRC_MAIN) $(SRC_MAIN_FAST))\r
+\r
+# Do not move this inclusion before the definition of {THUMB,ASM,ARM}{OBJ,SRC}\r
+include ../common/Makefile.common\r

 \r
 all: $(OBJDIR)/osimage.s19 $(OBJDIR)/fpgaimage.s19\r
 \r
 $(OBJDIR)/fpgaimage.elf: $(OBJDIR)/fpgaimg.o\r
        $(LD) -g -Tldscript-fpga -Map=$(patsubst %.elf,%.map,$@) -o $@ $^\r
 \r
 \r
 all: $(OBJDIR)/osimage.s19 $(OBJDIR)/fpgaimage.s19\r
 \r
 $(OBJDIR)/fpgaimage.elf: $(OBJDIR)/fpgaimg.o\r
        $(LD) -g -Tldscript-fpga -Map=$(patsubst %.elf,%.map,$@) -o $@ $^\r
 \r

-$(OBJDIR)/osimage.elf: $(OBJ) $(OBJCOMMON) $(ARMLIB)/libgcc.a\r
+$(OBJDIR)/osimage.elf: $(MAIN_OBJ) $(ARMLIB)/libgcc.a\r

        $(LD) -g -Tldscript -Map=$(patsubst %.elf,%.map,$@) -o $@ $^\r
 \r
        $(LD) -g -Tldscript -Map=$(patsubst %.elf,%.map,$@) -o $@ $^\r
 \r

-$(OBJDIR)/%.s19: $(OBJDIR)/%.elf\r
-       $(OBJCOPY) -Osrec --srec-forceS3 $^ $@\r
-\r
-$(OBJ) $(OBJFPGA): $(OBJDIR)/%.o: %.c $(INCLUDES)\r
-       $(CC) $(CFLAGS) -mthumb -mthumb-interwork $< -o $@\r
-\r

 clean:\r
        $(DELETE) $(OBJDIR)$(PATHSEP)*.o\r
        $(DELETE) $(OBJDIR)$(PATHSEP)*.elf\r
        $(DELETE) $(OBJDIR)$(PATHSEP)*.s19\r
        $(DELETE) $(OBJDIR)$(PATHSEP)*.map\r
 clean:\r
        $(DELETE) $(OBJDIR)$(PATHSEP)*.o\r
        $(DELETE) $(OBJDIR)$(PATHSEP)*.elf\r
        $(DELETE) $(OBJDIR)$(PATHSEP)*.s19\r
        $(DELETE) $(OBJDIR)$(PATHSEP)*.map\r

+       $(DELETE) $(OBJDIR)$(PATHSEP)*.d\r

 \r
 .PHONY: all clean help\r
 help:\r
 \r
 .PHONY: all clean help\r
 help:\r


@@ -51,3 +53,4 @@ help:
        @echo + osimage.s19   - The OS image\r
        @echo + fpgaimage.s19 - The FPGA image\r
        @echo + clean         - Clean $(OBJDIR)\r
        @echo + osimage.s19   - The OS image\r
        @echo + fpgaimage.s19 - The FPGA image\r
        @echo + clean         - Clean $(OBJDIR)\r

+\r