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.
This commit is contained in:
parent
355630f2d6
commit
07a26c584a
1 changed files with 3 additions and 1 deletions
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue