deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #315 from oliverschmidt/master

Browse source 
Support the recently added verbosity control.
This commit is contained in:
Oliver Schmidt 2013-07-30 15:28:52 -07:00
parent c259e6a093 8d23d1b0bb
commit f1f198f5cc
2 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cpu/6502/Makefile.6502
View file

@ -74,18 +74,22 @@ AROPTS = a
CUSTOM_RULE_C_TO_OBJECTDIR_O = 1
$(OBJECTDIR)/%.o: %.c | $(OBJECTDIR)
$(CC) -c -o $@ $(CFLAGS) --create-dep $(@:.o=.d) $<
$(TRACE_CC)
$(Q)$(CC) -c -o $@ $(CFLAGS) --create-dep $(@:.o=.d) $<
CUSTOM_RULE_C_TO_CO = 1
%.co: %.c
$(CC) -c -o $@ $(CFLAGS) -DAUTOSTART_ENABLE --create-dep $(@:.o=.d) $<
$(TRACE_CC)
$(Q)$(CC) -c -o $@ $(CFLAGS) -DAUTOSTART_ENABLE --create-dep $(@:.o=.d) $<
CUSTOM_RULE_LINK = 1
%.$(TARGET): %.co $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) contiki-$(TARGET).a
$(LD) -o $@ $(LDFLAGS) -u _main $^ $(TARGET).lib
$(TRACE_LD)
$(Q)$(LD) -o $@ $(LDFLAGS) -u _main $^ $(TARGET).lib
%.eth: $(OBJECTDIR)/%.o
$(LD) -o $@ -t module -m $@.map $<
$(TRACE_LD)
$(Q)$(LD) -o $@ -t module -m $@.map $<
ifdef ETHERNET
$(ETHERNET)-eth.S: $(ETHERNET).eth

19
platform/win32/Makefile.win32
View file

@ -72,10 +72,11 @@ ${foreach DSC,$(DSCS),${eval ${call dsc_template,$(DSC),${call appname,$(DSC)}}}
### Generic module-link rules, no prerequisites here
$(PRGS:=.prg) $(DSCS:=.dsc):
$(TRACE_LD)
ifdef VCINSTALLDIR
link -nologo -debug -dll $^ contiki-main.$(TARGET).a -out:$@
$(Q)link -nologo -debug -dll $^ contiki-main.$(TARGET).a -out:$@
else
$(LD) -shared $^ contiki-main.$(TARGET).a -o $@
$(Q)$(LD) -shared $^ contiki-main.$(TARGET).a -o $@
endif
ifdef VCINSTALLDIR
@ -84,19 +85,23 @@ VCFLAGS = -Od -Z7 $(filter-out -Wall -g -O,$(CFLAGS))
CUSTOM_RULE_C_TO_OBJECTDIR_O = 1
$(OBJECTDIR)/%.o: %.c | $(OBJECTDIR)
cl -nologo $(VCFLAGS) -c $< -Fo$@
@makedepend $(CFLAGS) -o.o -f- $< 2> nul: | sed -e s!$(<:.c=.o)!$@! -e s!\\!/!g > $(@:.o=.d)
$(TRACE_CC)
$(Q)cl -nologo $(VCFLAGS) -c $< -Fo$@
$(Q)makedepend $(CFLAGS) -o.o -f- $< 2> nul: | sed -e s!$(<:.c=.o)!$@! -e s!\\!/!g > $(@:.o=.d)
CUSTOM_RULE_C_TO_CO = 1
%.co: %.c
cl -nologo $(VCFLAGS) -DAUTOSTART_ENABLE -c $< -Fo$@
$(TRACE_CC)
$(Q)cl -nologo $(VCFLAGS) -DAUTOSTART_ENABLE -c $< -Fo$@
CUSTOM_RULE_ALLOBJS_TO_TARGETLIB = 1
contiki-$(TARGET).a: $(CONTIKI_OBJECTFILES)
lib -nologo $^ -out:$@
$(TRACE_AR)
$(Q)lib -nologo $^ -out:$@
CUSTOM_RULE_LINK = 1
%.$(TARGET): %.co $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) contiki-$(TARGET).a
link -nologo $(LINKFLAGS) -debug -map:contiki-$(TARGET).map $^ user32.lib ws2_32.lib iphlpapi.lib -out:$@
$(TRACE_LD)
$(Q)link -nologo $(LINKFLAGS) -debug -map:contiki-$(TARGET).map $^ user32.lib ws2_32.lib iphlpapi.lib -out:$@
endif # VCINSTALLDIR