Prep for v1.1.0

[hackover2013-badge-firmware.git] / Makefile

diff --git a/Makefile b/Makefile
index 1f50bc3..379faa6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -70,8 +70,12 @@ OBJS += isl12022m.o
 
 # TFT LCD support
 VPATH += drivers/displays/tft drivers/displays/tft/hw 
-VPATH += drivers/displays/tft/dialogues
-OBJS += drawing.o touchscreen.o colors.o bmp.o alphanumeric.o
+OBJS += drawing.o touchscreen.o colors.o bmp.o
+
+# GUI Controls
+VPATH += drivers/displays/tft/controls
+OBJS += button.o hsbchart.o huechart.o label.o
+OBJS += labelcentered.o progressbar.o
 
 # Bitmap (non-AA) fonts
 VPATH += drivers/displays/tft/fonts
@@ -162,7 +166,6 @@ OBJCOPY = $(CROSS_COMPILE)objcopy
 OBJDUMP = $(CROSS_COMPILE)objdump
 OUTFILE = firmware
 LPCRC = ./lpcrc
-CP = cp
 
 ##########################################################################
 # GNU GCC compiler flags
@@ -220,9 +223,6 @@ firmware: $(OBJS) $(SYS_OBJS)
        -@echo "INCLUDE $(LD_SCRIPT)" >> $(LD_TEMP)
        $(LD) $(LDFLAGS) -T $(LD_TEMP) -o $(OUTFILE).elf $(OBJS) $(LDLIBS)
        -@echo ""
-       -@echo "Removing temporary files"
-       rm -f $(OBJS) $(LD_TEMP)
-       -@echo ""
        $(SIZE) $(OUTFILE).elf
        -@echo ""
        $(OBJCOPY) $(OCFLAGS) -O binary $(OUTFILE).elf $(OUTFILE).bin