@@ -7,18 +7,18 @@ src = $(wildcard *.c) $(wildcard *.s) bare = $(mod:k%=%) headers = $(wildcard *.h) $(gen-headers) -tools = $(filter exe.%.c, $(src)) -nontools = $(filter-out exe.%.c, $(src)) +tools = $(filter %.exe.c, $(src)) +nontools = $(filter-out %.exe.c, $(src)) cobjects = $(filter %.c, $(nontools)) sobjects = $(filter %.${TARGET}.s, $(nontools)) cflags = -isystem ${OUT} -fPIC -nostdlib ${COMPLIB} -L${OUT} -lk obj: $(cobjects:%.c=${OUT}/$(mod).%.o) \ $(sobjects:%.s=${OUT}/$(mod).%.o) -tool: $(tools:exe.%.c=${OUT}/$(mod).%) \ +tool: $(tools:%.exe.c=${OUT}/$(mod).%) \ ${OUT}/libk.a def: $(headers:%=${OUT}/k/%) @@ -35,9 +35,9 @@ ${OUT}/k/%.h: %.h cp $< $@ -${OUT}/$(mod).%: exe.%.c +${OUT}/$(mod).%: %.exe.c $(CC) $(cflags) $< -o $@ ${TMP}: mkdir -p ${TMP}