aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2016-06-05 18:23:04 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2016-06-05 18:48:50 +0200
commit6adc5149137ef66724d19a4679f817f4e63a741b (patch)
treeb1d4d4508ecd7d16066f0d2c5b3cee76b041a87e /src
parent06a1141453ec00e24e211347f0ad71d152f16954 (diff)
downloadglutte-o-matic-6adc5149137ef66724d19a4679f817f4e63a741b.tar.gz
glutte-o-matic-6adc5149137ef66724d19a4679f817f4e63a741b.tar.bz2
glutte-o-matic-6adc5149137ef66724d19a4679f817f4e63a741b.zip
Makefile: fix clean that deleted an .s file by accident
Diffstat (limited to 'src')
-rw-r--r--src/glutt-o-logique/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/glutt-o-logique/Makefile b/src/glutt-o-logique/Makefile
index d9ff944..2fd5f91 100644
--- a/src/glutt-o-logique/Makefile
+++ b/src/glutt-o-logique/Makefile
@@ -13,8 +13,8 @@ SIZE=arm-none-eabi-size
BINDIR=bin
SRCDIR=.
-SOURCES=$(shell find -L $(SRCDIR) -name '*.s')
-SOURCES+=$(shell find -L $(SRCDIR) -name '*.c')
+ASOURCES=$(shell find -L $(SRCDIR) -name '*.s')
+CSOURCES+=$(shell find -L $(SRCDIR) -name '*.c')
HEADERS=$(shell find -L $(SRCDIR) -name '*.h')
INC=$(shell find -L $(SRCDIR) -name '*.h' -exec dirname {} \; | uniq)
@@ -22,7 +22,8 @@ INC+=../common/includes
INCLUDES=$(INC:%=-I%)
# Create object list
-OBJECTS=$(SOURCES:%.c=obj/%.o)
+OBJECTS=$(CSOURCES:%.c=obj/%.o)
+OBJECTS+=$(ASOURCES:%.s=obj/%.o)
# Define output files ELF & IHEX
BINELF=outp.elf