From 0b8bdbdec427a5a846d00f276dfca3e1e1aa45a3 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Wed, 18 Jan 2017 16:16:51 -0900 Subject: makefile tweaks --- Makefile | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 431bdc0..a852d10 100644 --- a/Makefile +++ b/Makefile @@ -630,6 +630,18 @@ DEPS_g := $(OBJS_g:.o=.d) -include $(DEPS_c) -include $(DEPS_g) +$(OBJS_s): CFLAGS+=$(CFLAGS_s) +$(OBJS_c): CFLAGS+=$(CFLAGS_c) +$(OBJS_g): CFLAGS+=$(CFLAGS_g) + +$(TARG_s): LDFLAGS+=$(LDFLAGS_s) +$(TARG_c): LDFLAGS+=$(LDFLAGS_c) +$(TARG_g): LDFLAGS+=$(LDFLAGS_g) + +$(TARG_s): LDFLAGS+=$(LIBS_s) +$(TARG_c): LDFLAGS+=$(LIBS_c) +$(TARG_g): LDFLAGS+=$(LIBS_g) + clean: $(E) [CLEAN] $(Q)$(RM) $(TARG_s) $(TARG_c) $(TARG_g) @@ -644,7 +656,7 @@ strip: $(TARG_s) $(TARG_c) $(TARG_g) $(BUILD_s)/%.o: %.c $(E) [CC] $@ $(Q)$(MKDIR) $(@D) - $(Q)$(CC) -c $(CFLAGS) $(CFLAGS_s) -o $@ $< + $(Q)$(CC) -c $(CFLAGS) -o $@ $< $(BUILD_s)/%.o: %.rc $(E) [RC] $@ @@ -654,14 +666,14 @@ $(BUILD_s)/%.o: %.rc $(TARG_s): $(OBJS_s) $(E) [LD] $@ $(Q)$(MKDIR) $(@D) - $(Q)$(CC) $(LDFLAGS) $(LDFLAGS_s) -o $@ $(OBJS_s) $(LIBS) $(LIBS_s) + $(Q)$(CC) $(LDFLAGS) -o $@ $(OBJS_s) $(LIBS) # ------ $(BUILD_c)/%.o: %.c $(E) [CC] $@ $(Q)$(MKDIR) $(@D) - $(Q)$(CC) -c $(CFLAGS) $(CFLAGS_c) -o $@ $< + $(Q)$(CC) -c $(CFLAGS) -o $@ $< $(BUILD_c)/%.o: %.rc $(E) [RC] $@ @@ -671,14 +683,14 @@ $(BUILD_c)/%.o: %.rc $(TARG_c): $(OBJS_c) $(E) [LD] $@ $(Q)$(MKDIR) $(@D) - $(Q)$(CC) $(LDFLAGS) $(LDFLAGS_c) -o $@ $(OBJS_c) $(LIBS) $(LIBS_c) + $(Q)$(CC) $(LDFLAGS) -o $@ $(OBJS_c) $(LIBS) # ------ $(BUILD_g)/%.o: %.c $(E) [CC] $@ $(Q)$(MKDIR) $(@D) - $(Q)$(CC) -c $(CFLAGS) $(CFLAGS_g) -o $@ $< + $(Q)$(CC) -c $(CFLAGS) -o $@ $< $(BUILD_g)/%.o: %.rc $(E) [RC] $@ @@ -688,5 +700,5 @@ $(BUILD_g)/%.o: %.rc $(TARG_g): $(OBJS_g) $(E) [LD] $@ $(Q)$(MKDIR) $(@D) - $(Q)$(CC) $(LDFLAGS) $(LDFLAGS_g) -o $@ $(OBJS_g) $(LIBS) $(LIBS_g) + $(Q)$(CC) $(LDFLAGS) -o $@ $(OBJS_g) $(LIBS) -- cgit v1.2.3