From 07a26c584a856e87121778e92ac4a99629db6b16 Mon Sep 17 00:00:00 2001 From: oliverschmidt Date: Sun, 31 Dec 2006 13:54:24 +0000 Subject: [PATCH] Introduced a new variable CONTIKI_OBJECTFILES in order to allow target-specific makesfile to add object files to the Contiki library which are not compiled from .c files but i.e. assembled from .S files. --- Makefile.include | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.include b/Makefile.include index 267e66b50..fb1139956 100644 --- a/Makefile.include +++ b/Makefile.include @@ -51,6 +51,8 @@ CONTIKI_SOURCEFILES += $(CONTIKIFILES) CONTIKIDIRS = ${addprefix $(CONTIKI)/core/,dev lib net sys \ cfs ctk lib/ctk loader . } +CONTIKI_OBJECTFILES = ${addprefix $(OBJECTDIR)/,$(CONTIKI_SOURCEFILES:.c=.o)} + PROJECT_OBJECTFILES = ${addprefix $(OBJECTDIR)/,$(PROJECT_SOURCEFILES:.c=.o)} ### Include application makefiles @@ -106,7 +108,7 @@ ifndef AROPTS endif ifndef CUSTOM_RULE_ALLOBJS_TO_TARGETLIB -contiki-$(TARGET).a: ${addprefix $(OBJECTDIR)/, $(CONTIKI_SOURCEFILES:.c=.o)} +contiki-$(TARGET).a: $(CONTIKI_OBJECTFILES) $(AR) $(AROPTS) $@ $^ endif