aboutsummaryrefslogtreecommitdiff
path: root/template
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2016-03-20 16:36:04 +0100
committerKarel Kočí <cynerd@email.cz>2016-03-20 16:36:04 +0100
commit1ac3026c039cb15dd8c110c84215096854c3c804 (patch)
tree7e03927e10d2339cd0b8906e905a4a5871d58e2d /template
parent9b98275f519773177039cbc65d500ddefb0d4831 (diff)
downloadavr-ioe-1ac3026c039cb15dd8c110c84215096854c3c804.tar.gz
avr-ioe-1ac3026c039cb15dd8c110c84215096854c3c804.tar.bz2
avr-ioe-1ac3026c039cb15dd8c110c84215096854c3c804.zip
Some chages in configuration build
Diffstat (limited to 'template')
-rw-r--r--template/Makefile33
1 files changed, 18 insertions, 15 deletions
diff --git a/template/Makefile b/template/Makefile
index f67d0c2..bc0643f 100644
--- a/template/Makefile
+++ b/template/Makefile
@@ -7,9 +7,10 @@ PROJNAME = template
SRC = main.c
OBJ = $(patsubst %.c,%.o,$(SRC)) # This creates list of *.o files from *.c
+Q ?= @ # This can be overwritten to show commands
.PHONY: all
-ifneq ("$(wildcard .config)","") # Checking if configuration exists
+ifneq ("$(wildcard ioeconfig)","") # Checking if configuration exists
all: $(PROJNAME).hex
@echo Now you can flash $< to your chip.
else
@@ -29,34 +30,36 @@ help:
.PHONY: clean
clean:
@echo " CLEAN OBJ"
- @$(RM) $(OBJ)
+ $(Q)$(RM) $(OBJ)
@echo " CLEAN $(PROJNAME).elf $(PROJNAME).hex"
- @$(RM) $(PROJNAME).elf $(PROJNAME).hex
- @$(MAKE) -C avr-ioe clean
+ $(Q)$(RM) $(PROJNAME).elf $(PROJNAME).hex
+ $(Q)$(MAKE) -C avr-ioe clean CONFIG="$$( readlink -f ioeconfig )"
# Building targets are available only if configuration is generated
-ifneq ("$(wildcard .config)","")
--include .config
+ifneq ("$(wildcard ioeconfig)","")
+include ioeconfig
# If you want change some standard CFLAGS, change them in configuration not here.
# Add here only options that should not be applied to avr-ioe also.
-CFLAGS = -Iavr-ioe/include -mmcu=$(MMCU) -imacros avr-ioe/.config.h \
+CFLAGS = -Iavr-ioe/include -mmcu=$(MMCU) -imacros avr-ioe/build/config.h \
$(shell echo $(CONFCFLAGS)) $(shell echo -DF_CPU=$(F_CPU)000L)
$(PROJNAME).elf: avr-ioe/libioe.a
$(PROJNAME).elf: $(OBJ)
@echo " LD $@"
- @avr-gcc -Os -mmcu=$(MMCU) $^ -o $@ -Lavr-ioe -lioe
+ $(Q)avr-gcc -Os -mmcu=$(MMCU) $^ -o $@ -Lavr-ioe -lioe
$(PROJNAME).hex: $(PROJNAME).elf
@echo " OBJCOPY $@"
- @avr-objcopy -O ihex -R .eeprom $< $@
+ $(Q)avr-objcopy -O ihex -R .eeprom $< $@
-$(OBJ): %.o: %.c avr-ioe/libioe.a
+$(OBJ): %.o: %.c avr-ioe/build/config.h
@echo " CC $@"
- @avr-gcc $(CFLAGS) -c -o $@ $<
+ $(Q)avr-gcc $(CFLAGS) -c -o $@ $<
-avr-ioe/libioe.a: .config
- @CONFIG=$$(readlink -f .config) $(MAKE) -C avr-ioe libioe.a
+avr-ioe/libioe.a: ioeconfig
+ $(Q)$(MAKE) -C avr-ioe libioe.a CONFIG="$$( readlink -f ioeconfig )"
+avr-ioe/build/config.h: ioeconfig
+ $(Q)$(MAKE) -C avr-ioe build/config.h CONFIG="$$( readlink -f ioeconfig )"
endif
.config:
@@ -65,8 +68,8 @@ endif
.PHONY: config
config:
- @CONFIG=$$(readlink -f .config) $(MAKE) -C avr-ioe menuconfig
+ $(Q)$(MAKE) -C avr-ioe menuconfig CONFIG="$$( readlink -f ioeconfig )"
.PHONY: menuconfig
menuconfig:
- @CONFIG=$$(readlink -f .config) $(MAKE) -C avr-ioe menuconfig
+ $(Q)$(MAKE) -C avr-ioe menuconfig CONFIG="$$( readlink -f ioeconfig )"