Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-12-23 16:29:34 +00:00
Code Issues Projects Releases Wiki Activity

fix how board.a is created and linked

Browse Source
This commit is contained in:
Mariano Alvira 2010-03-11 12:22:47 -05:00
parent 3cd4bf5768
commit da7898557d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.include
View File

@ -59,12 +59,12 @@ $(ISR): $(ISR:.o=.c)
empty-board-a: empty-board-a:
$(AR) $(ARFLAGS) $(OBJDIR)/board.a $(AR) $(ARFLAGS) $(OBJDIR)/board.a
$(OBJDIR)/board.a: empty-board-a $(filter $(OBJDIR)/%.o, $(OBJDIR)/board.a($(OBJDIR)/$(COBJS))) $(OBJDIR)/board.a: empty-board-a $(OBJDIR)/board.a(${filter $(OBJDIR)/%.o,$(OBJDIR)/$(COBJS)}) #$(filter $(OBJDIR)/%.o), $(OBJDIR)/board.a($(OBJDIR)/$(COBJS)))
$(MC1322X)/src/src.a: $(MC1322X)/src/src.a($(SRCOBJS)) $(MC1322X)/src/src.a: $(MC1322X)/src/src.a($(SRCOBJS))
%_$(BOARD).elf: $(OBJDIR)/%.o $(START) $(ISR) $(SRCOBJS) $(LINKERSCRIPT) $(LIBMC1322X)/libmc1322x.a $(OBJDIR)/board.a $(MC1322X)/src/src.a %_$(BOARD).elf: $(OBJDIR)/%.o $(START) $(ISR) $(SRCOBJS) $(LINKERSCRIPT) $(LIBMC1322X)/libmc1322x.a $(OBJDIR)/board.a $(MC1322X)/src/src.a
$(CC) $(LDFLAGS) \ $(CC) $(LDFLAGS) \
-L $(LIBMC1322X) -L $(MC1322X)/src -L $(OBJDIR) $< -o $@ $(START) $(MC1322X)/src/src.a $(OBJDIR)/board.a $(LIBMC1322X)/libmc1322x.a -L $(LIBMC1322X) -L $(MC1322X)/src -L $(OBJDIR) $< -o $@ $(START) $(MC1322X)/src/src.a --start-group $(OBJDIR)/board.a $(LIBMC1322X)/libmc1322x.a --end-group
%.srec: %.elf %.srec: %.elf
$(OBJCOPY) ${OBJCFLAGS} -O srec $< $@ $(OBJCOPY) ${OBJCFLAGS} -O srec $< $@