X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/97a82e8f362e3731bf45a1f9b3598d5f0a3459b4..0fc0fca5830c9d1a430f40ff935fb399f91b8adc:/armsrc/Makefile

diff --git a/armsrc/Makefile b/armsrc/Makefile
index 1acfdd88..ce1ad087 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -1,47 +1,49 @@
 # Makefile for armsrc, see ../common/Makefile.common for common settings
-include ../common/Makefile.common
 
 APP_INCLUDES = apps.h
 
 # Add the "-DWITH_LCD" flag in APP_CLFAGS to add support for LCD
-# and add OBJLCD to OBJ too
+# and add SRC_LCD to SRC_MAIN
 APP_CFLAGS	= -O6
 
-OBJLCD = $(OBJDIR)/fonts.o \
-		$(OBJDIR)/LCD.o
+SRC_LCD = fonts.c LCD.c
+
+SRC_MAIN = start.c \
+	appmain.c \
+	fpga.c \
+	lfops.c \
+	iso15693.c \
+	util.c \
+	usb.c
+
+# These are to be compiled in ARM mode
+SRC_MAIN_FAST =  iso14443.c \
+	iso14443a.c
 
-OBJ =	$(OBJDIR)/start.o \
-		$(OBJDIR)/appmain.o \
-		$(OBJDIR)/fpga.o \
-		$(OBJDIR)/lfops.o \
-		$(OBJDIR)/iso14443.o \
-		$(OBJDIR)/iso14443a.o \
-		$(OBJDIR)/iso15693.o \
-		$(OBJDIR)/util.o \
-		$(OBJDIR)/usb.o
+SRC_FPGA = fpgaimg.c
 
-OBJFPGA = \
-		$(OBJDIR)/fpgaimg.o
+THUMBSRC = $(SRC_MAIN) $(SRC_FPGA)
+ARMSRC = $(SRC_MAIN_FAST)
+
+MAIN_OBJ = $(patsubst %.c,$(OBJDIR)/%.o,$(SRC_MAIN) $(SRC_MAIN_FAST))
+
+# Do not move this inclusion before the definition of {THUMB,ASM,ARM}{OBJ,SRC}
+include ../common/Makefile.common
 
 all: $(OBJDIR)/osimage.s19 $(OBJDIR)/fpgaimage.s19
 
 $(OBJDIR)/fpgaimage.elf: $(OBJDIR)/fpgaimg.o
 	$(LD) -g -Tldscript-fpga -Map=$(patsubst %.elf,%.map,$@) -o $@ $^
 
-$(OBJDIR)/osimage.elf: $(OBJ) $(OBJCOMMON) $(ARMLIB)/libgcc.a
+$(OBJDIR)/osimage.elf: $(MAIN_OBJ) $(ARMLIB)/libgcc.a
 	$(LD) -g -Tldscript -Map=$(patsubst %.elf,%.map,$@) -o $@ $^
 
-$(OBJDIR)/%.s19: $(OBJDIR)/%.elf
-	$(OBJCOPY) -Osrec --srec-forceS3 $^ $@
-
-$(OBJ) $(OBJFPGA): $(OBJDIR)/%.o: %.c $(INCLUDES)
-	$(CC) $(CFLAGS) -mthumb -mthumb-interwork $< -o $@
-
 clean:
 	$(DELETE) $(OBJDIR)$(PATHSEP)*.o
 	$(DELETE) $(OBJDIR)$(PATHSEP)*.elf
 	$(DELETE) $(OBJDIR)$(PATHSEP)*.s19
 	$(DELETE) $(OBJDIR)$(PATHSEP)*.map
+	$(DELETE) $(OBJDIR)$(PATHSEP)*.d
 
 .PHONY: all clean help
 help:
@@ -51,3 +53,4 @@ help:
 	@echo +	osimage.s19   - The OS image
 	@echo +	fpgaimage.s19 - The FPGA image
 	@echo +	clean         - Clean $(OBJDIR)
+