From 6afa5ccbd77ebcc6f6e6695c352e7842740ce714 Mon Sep 17 00:00:00 2001
From: Olaf Rempel <razzor@kopf-tisch.de>
Date: Sun, 5 Oct 2014 14:27:03 +0200
Subject: [PATCH] update Makefile

---
 .gitignore |  1 +
 Makefile   | 80 ++++++++++++++++++++++++++++--------------------------
 2 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6d36148..d53dd72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@
 *.bin
 *.hex
 *.lst
+*.lss
 *.map
diff --git a/Makefile b/Makefile
index 0de1162..8685c62 100644
--- a/Makefile
+++ b/Makefile
@@ -1,51 +1,53 @@
-PRG            = ispprog
-OBJ            = ispprog.o
-MCU_TARGET     = atmega16
-OPTIMIZE       = -Os
+CC	:= avr-gcc
+LD	:= avr-ld
+OBJCOPY	:= avr-objcopy
+OBJDUMP	:= avr-objdump
+SIZE	:= avr-size
 
-DEFS           =
-LIBS           =
+TARGET = ispprog
+SOURCE = $(wildcard *.c)
 
-# You should not have to change anything below here.
+# select MCU
+MCU = atmega16
 
-CC             = avr-gcc
+AVRDUDE_PROG := -c butterfly -b 19200 -P /dev/ttyUSB0
+#AVRDUDE_PROG := -c dragon_isp -P usb
 
-# Override is only needed by avr-lib build system.
+# ---------------------------------------------------------------------------
 
-override CFLAGS        = -g -Wall $(OPTIMIZE) -mmcu=$(MCU_TARGET) $(DEFS)
-override LDFLAGS       = -Wl,-Map,$(PRG).map
+ifeq ($(MCU), atmega16)
+# (ext. crystal)
+AVRDUDE_MCU=m16
+AVRDUDE_FUSES=lfuse:w:0xff:m hfuse:w:0xda:m
+endif
 
-OBJCOPY        = avr-objcopy
-OBJDUMP        = avr-objdump
-SIZE           = avr-size
+# ---------------------------------------------------------------------------
 
-all: $(PRG).elf lst text
-	$(SIZE) -x -A $(PRG).elf
+CFLAGS = -pipe -g -Os -mmcu=$(MCU) -Wall -fdata-sections -ffunction-sections
+CFLAGS += -Wa,-adhlns=$(*F).lst
+LDFLAGS = -Wl,-Map,$(@:.elf=.map),--cref,--relax,--gc-sections
 
-$(PRG).elf: $(OBJ)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+# ---------------------------------------------------------------------------
+
+$(TARGET): $(TARGET).elf
+	@$(SIZE) -B -x --mcu=$(MCU) $<
+
+$(TARGET).elf: $(SOURCE:.c=.o)
+	@echo " Linking file:  $@"
+	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+	@$(OBJDUMP) -h -S $@ > $(@:.elf=.lss)
+	@$(OBJCOPY) -j .text -j .data -O ihex $@ $(@:.elf=.hex)
+	@$(OBJCOPY) -j .text -j .data -O binary $@ $(@:.elf=.bin)
+
+%.o: %.c $(MAKEFILE_LIST)
+	@echo " Building file: $<"
+	@$(CC) $(CFLAGS) -o $@ -c $<
 
 clean:
-	rm -rf *.o $(PRG).lst $(PRG).map $(PRG).elf $(PRG).hex $(PRG).bin
+	rm -rf $(SOURCE:.c=.o) $(SOURCE:.c=.lst) $(addprefix $(TARGET), .elf .map .lss .hex .bin)
 
-lst:  $(PRG).lst
+install: $(TARGET).elf
+	avrdude $(AVRDUDE_PROG) -p $(AVRDUDE_MCU) -U flash:w:$(<:.elf=.hex)
 
-%.lst: %.elf
-	$(OBJDUMP) -h -S $< > $@
-
-# Rules for building the .text rom images
-
-text: hex bin
-
-hex:  $(PRG).hex
-bin:  $(PRG).bin
-
-%.hex: %.elf
-	$(OBJCOPY) -j .text -j .data -O ihex $< $@
-
-%.bin: %.elf
-	$(OBJCOPY) -j .text -j .data -O binary $< $@
-
-install: text
-#	uisp -dprog=stk200 --erase --upload if=$(PRG).hex --verify
-	avrdude -p m16 -c butterfly -b 19200 -P /dev/ttyUSB0 -U flash:w:$(PRG).hex
+fuses:
+	avrdude $(AVRDUDE_PROG) -p $(AVRDUDE_MCU) $(patsubst %,-U %, $(AVRDUDE_FUSES))