aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNIIBE Yutaka <gniibe@fsij.org>2013-08-19 17:33:41 +0900
committerNIIBE Yutaka <gniibe@fsij.org>2013-08-19 17:33:41 +0900
commit102f30092baef5ff06458fd3afee7611e18d1211 (patch)
tree024b85af68633fee40fed5c7a16582ae96558818
parent86ec749d755ad54254778596805bf5a71cdc2bbb (diff)
Support OBJS_ADD
-rw-r--r--ChangeLog4
-rw-r--r--rules.mk6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ea9f8bc..d0d6f08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-19 Niibe Yutaka <gniibe@fsij.org>
+
+ * rules.mk (%.elf): Support OBJS_ADD.
+
2013-08-16 Niibe Yutaka <gniibe@fsij.org>
* chopstx.c (chopstx_usec_wait_var): Check usec_p at the beginning
diff --git a/rules.mk b/rules.mk
index 16f16cc..b493a1d 100644
--- a/rules.mk
+++ b/rules.mk
@@ -31,7 +31,7 @@ LDFLAGS += -mthumb -mno-thumb-interwork
CFLAGS += -MD -MP -MF .dep/$(@F).d
-all: $(OBJS) $(OUTFILES)
+all: $(OUTFILES)
$(OBJS): | $(BUILDDIR)
@@ -42,9 +42,9 @@ $(OBJS) : $(BUILDDIR)/%.o : %.c Makefile
@echo
$(CC) -c $(CFLAGS) -I. $(IINCDIR) $< -o $@
-%.elf: $(OBJS) $(LDSCRIPT)
+%.elf: $(OBJS) $(OBJS_ADD) $(LDSCRIPT)
@echo
- $(LD) $(OBJS) $(LDFLAGS) $(LIBS) -o $@
+ $(LD) $(OBJS) $(OBJS_ADD) $(LDFLAGS) $(LIBS) -o $@
%.bin: %.elf $(LDSCRIPT)
$(OBJCOPY) -O binary $< $@