From bfc2448662c2a21466a8fa110060981062566880 Mon Sep 17 00:00:00 2001 From: Aurora Date: Thu, 28 Apr 2016 00:31:29 +0200 Subject: [PATCH] Simplify makefiles --- Makefile | 12 ++---------- loader/Makefile | 8 -------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 15b883b..65f6aea 100644 --- a/Makefile +++ b/Makefile @@ -101,8 +101,8 @@ $(dir_build)/screeninit.h: $(dir_screeninit)/Makefile @mv $(dir_screeninit)/screeninit.bin $(@D) @bin2c -o $@ -n screeninit $(@D)/screeninit.bin -$(dir_build)/memory.o : CFLAGS += -O3 -$(dir_build)/config.o : CFLAGS += -DCONFIG_TITLE="\"$(name) $(version) configuration\"" +$(dir_build)/memory.o: CFLAGS += -O3 +$(dir_build)/config.o: CFLAGS += -DCONFIG_TITLE="\"$(name) $(version) configuration\"" $(dir_build)/%.o: $(dir_source)/%.c $(bundled) @mkdir -p "$(@D)" @@ -111,12 +111,4 @@ $(dir_build)/%.o: $(dir_source)/%.c $(bundled) $(dir_build)/%.o: $(dir_source)/%.s @mkdir -p "$(@D)" $(COMPILE.s) $(OUTPUT_OPTION) $< - -$(dir_build)/fatfs/%.o: $(dir_source)/fatfs/%.c - @mkdir -p "$(@D)" - $(COMPILE.c) $(OUTPUT_OPTION) $< - -$(dir_build)/fatfs/%.o: $(dir_source)/fatfs/%.s - @mkdir -p "$(@D)" - $(COMPILE.s) $(OUTPUT_OPTION) $< include $(call rwildcard, $(dir_build), *.d) diff --git a/loader/Makefile b/loader/Makefile index 5d43704..0852b83 100644 --- a/loader/Makefile +++ b/loader/Makefile @@ -44,12 +44,4 @@ $(dir_build)/%.o: $(dir_source)/%.c $(dir_build)/%.o: $(dir_source)/%.s @mkdir -p "$(@D)" $(COMPILE.s) $(OUTPUT_OPTION) $< - -$(dir_build)/fatfs/%.o: $(dir_source)/fatfs/%.c - @mkdir -p "$(@D)" - $(COMPILE.c) $(OUTPUT_OPTION) $< - -$(dir_build)/fatfs/%.o: $(dir_source)/fatfs/%.s - @mkdir -p "$(@D)" - $(COMPILE.s) $(OUTPUT_OPTION) $< include $(call rwildcard, $(dir_build), *.d)