cleaned up some if-def routines

[proxmark3-svn] / armsrc / Makefile

diff --git a/armsrc/Makefile b/armsrc/Makefile
index 045e1fba49ddb217b9ef672978fe7d62266e8d8e..d49272257fd837138639bb1bdddf6d1bf0d2a471 100644 (file)
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -10,14 +10,15 @@ APP_INCLUDES = apps.h
 
 #remove one of the following defines and comment out the relevant line
 #in the next section to remove that particular feature from compilation  
-APP_CFLAGS     = -O6 -DWITH_LF -DWITH_ISO15693 -DWITH_ISO14443a -DWITH_ISO14443b
+APP_CFLAGS     = -O2 -DWITH_LF -DWITH_ISO15693 -DWITH_ISO14443a -DWITH_ISO14443b -DWITH_ICLASS -DWITH_LEGICRF
 #-DWITH_LCD 
 
 #SRC_LCD = fonts.c LCD.c
 SRC_LF = lfops.c hitag2.c
-SRC_ISO15693 = iso15693.c
-SRC_ISO14443a = iso14443a.c
+SRC_ISO15693 = iso15693.c iso15693tools.c 
+SRC_ISO14443a = iso14443a.c mifareutil.c mifarecmd.c
 SRC_ISO14443b = iso14443.c
+SRC_CRAPTO1 = crapto1.c crypto1.c
 
 THUMBSRC = start.c \
        $(SRC_LCD) \
@@ -35,7 +36,9 @@ ARMSRC = fpgaloader.c \
        crc16.c \
        $(SRC_ISO14443a) \
        $(SRC_ISO14443b) \
-        legic_prng.c \
+       $(SRC_CRAPTO1) \
+       legic_prng.c \
+       iclass.c \
        crc.c
 
 # stdint.h provided locally until GCC 4.5 becomes C99 compliant
@@ -44,13 +47,15 @@ APP_CFLAGS += -I.
 # Do not move this inclusion before the definition of {THUMB,ASM,ARM}SRC
 include ../common/Makefile.common
 
-all: $(OBJDIR)/osimage.s19 $(OBJDIR)/fpgaimage.s19
+OBJS = $(OBJDIR)/osimage.s19 $(OBJDIR)/fpgaimage.s19
+
+all: $(OBJS)
 
 $(OBJDIR)/fpga.o: fpga.bit
        $(OBJCOPY) -O elf32-littlearm -I binary -B arm --redefine-sym _binary____fpga_fpga_bit_start=_binary_fpga_bit_start --redefine-sym _binary____fpga_fpga_bit_end=_binary_fpga_bit_end --prefix-sections=fpga_bit  $^ $@
 
-$(OBJDIR)/fullimage.elf: $(VERSIONOBJ) $(OBJDIR)/fpga.o $(THUMBOBJ) $(ARMOBJ) $(LIBGCC)
-       $(LD) -g -Tldscript -Map=$(patsubst %.elf,%.map,$@) -o $@ $^
+$(OBJDIR)/fullimage.elf: $(VERSIONOBJ) $(OBJDIR)/fpga.o $(THUMBOBJ) $(ARMOBJ)
+       $(CC) $(LDFLAGS) -Wl,-T,ldscript,-Map,$(patsubst %.elf,%.map,$@) -o $@ $^ $(LIBS)
 
 $(OBJDIR)/fpgaimage.elf: $(OBJDIR)/fullimage.elf
        $(OBJCOPY) -F elf32-littlearm --only-section .fpgaimage $^ $@  
@@ -58,6 +63,10 @@ $(OBJDIR)/fpgaimage.elf: $(OBJDIR)/fullimage.elf
 $(OBJDIR)/osimage.elf: $(OBJDIR)/fullimage.elf
        $(OBJCOPY) -F elf32-littlearm --remove-section .fpgaimage $^ $@
 
+tarbin: $(OBJS)
+       $(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(OBJS:%=armsrc/%) $(OBJS:%.s19=armsrc/%.elf)
+
+
 clean:
        $(DELETE) $(OBJDIR)$(PATHSEP)*.o
        $(DELETE) $(OBJDIR)$(PATHSEP)*.elf