From 80047c9a0c9ddb937f79348d83651d920585f390 Mon Sep 17 00:00:00 2001 From: Jared Boone Date: Sat, 11 Jan 2014 15:20:10 -0800 Subject: [PATCH] Makefile: Add separate OBJ_M4_S and OBJ_M0_S variables for .S files. (Unused, but worked earlier and may be useful later.) --- firmware/common/Makefile_inc.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/firmware/common/Makefile_inc.mk b/firmware/common/Makefile_inc.mk index 2689260b..ac1874af 100644 --- a/firmware/common/Makefile_inc.mk +++ b/firmware/common/Makefile_inc.mk @@ -154,15 +154,15 @@ $(BINARY).list: $(BINARY).elf $(BINARY).elf: obj_m4 @#printf " LD $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(LD) -o $(BINARY).elf $(OBJ_M4_C) $(OBJDIR_M4)/m0_bin.o $(LDFLAGS_COMMON) $(LDFLAGS_M4) + $(Q)$(LD) -o $(BINARY).elf $(OBJ_M4_C) $(OBJ_M4_S) $(OBJDIR_M4)/m0_bin.o $(LDFLAGS_COMMON) $(LDFLAGS_M4) $(OBJDIR_M0)/m0.elf: obj_m0 @#printf " LD $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(LD) -o $(OBJDIR_M0)/m0.elf $(OBJ_M0_C) $(LDFLAGS_COMMON) $(LDFLAGS_M0) + $(Q)$(LD) -o $(OBJDIR_M0)/m0.elf $(OBJ_M0_C) $(OBJ_M0_S) $(LDFLAGS_COMMON) $(LDFLAGS_M0) -obj_m4: $(OBJ_M4_C) $(OBJDIR_M4)/m0_bin.o +obj_m4: $(OBJ_M4_C) $(OBJ_M4_S) $(OBJDIR_M4)/m0_bin.o -obj_m0: $(OBJ_M0_C) +obj_m0: $(OBJ_M0_C) $(OBJ_M0_S) $(OBJDIR_M4)/%.o: %.c | $(OBJDIR_M4) @printf " CC $(subst $(shell pwd)/,,$(@))\n"