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

Removed out-commented stuff from Makefiles

Browse source
This commit is contained in:
adamdunkels 2006-06-24 06:23:47 +00:00
parent 46ad48666c
commit 8ee4f7fc3d
5 changed files with 2 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile.include
View file

@ -45,15 +45,8 @@ CONTIKIFILES = $(SYSTEM) $(THREADS) $(CFS) $(LIBS) $(NET) $(DHCP)
CONTIKI_SOURCEFILES += $(CONTIKIFILES) CONTIKI_SOURCEFILES += $(CONTIKIFILES)
# contiki.a: ${addprefix $(OBJECTDIR)/, $(CONTIKIFILES:.c=.o)}
# @$(AR) rcf $@ $^
# contikiapps.a: ${addprefix $(OBJECTDIR)/, $(APPSFILES:.c=.o)}
# @$(AR) rcf $@ $^
CONTIKIDIRS = ${addprefix $(CONTIKI)/core/,dev lib net sys \ CONTIKIDIRS = ${addprefix $(CONTIKI)/core/,dev lib net sys \
cfs ctk lib/ctk loader . } cfs ctk lib/ctk loader . }
#APPDIRS += ${filter-out $(CONTIKI)/apps/CVS,${wildcard ${addprefix $(CONTIKI)/,apps/*}}}
PROJECT_OBJECTFILES = ${addprefix $(OBJECTDIR)/,$(PROJECT_SOURCEFILES:.c=.o)} PROJECT_OBJECTFILES = ${addprefix $(OBJECTDIR)/,$(PROJECT_SOURCEFILES:.c=.o)}

8
cpu/avr/Makefile.avr
View file

@ -1,4 +1,4 @@
# $Id: Makefile.avr,v 1.2 2006/06/20 21:23:09 adamdunkels Exp $ # $Id: Makefile.avr,v 1.3 2006/06/24 06:23:47 adamdunkels Exp $
### Check if we are running under Windows ### Check if we are running under Windows
@ -60,9 +60,6 @@ vpath %.c $(PROJECTDIRS) $(CONTIKI)/cpu/avr/dev \
$(OBJECTDIR)/%.o: %.c $(OBJECTDIR)/%.o: %.c
$(CC) $(CFLAGS) -c $< -o $@ $(CC) $(CFLAGS) -c $< -o $@
# %.firmware: %.co $(PROJECT_OBJECTFILES) contiki-$(TARGET).a
# $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter-out %.a,$^) $(filter %.a,$^) $(LDLIBS)
%.o: %.c %.o: %.c
$(CC) $(CFLAGS) -c $< -o $@ $(CC) $(CFLAGS) -c $< -o $@
@ -92,9 +89,6 @@ $(OBJECTDIR)/%.o: %.c
%.o: ${CONTIKI_TARGET}/loader/%.S %.o: ${CONTIKI_TARGET}/loader/%.S
$(AS) -o $(notdir $(<:.S=.o)) $< $(AS) -o $(notdir $(<:.S=.o)) $<
# %: %.o $(CONTIKI_TARGET_MAIN) $(PROJECT_OBJECTFILES) contiki-$(TARGET).a
# $(CC) $(LDFLAGS) $(CFLAGS) -o $@.$(TARGET) $(filter-out %.a,$^) $(filter %.a,$^)
%.srec: %.$(TARGET) %.srec: %.$(TARGET)
$(OBJCOPY) -O srec $< $@ $(OBJCOPY) -O srec $< $@

6
cpu/msp430/Makefile.msp430
View file

@ -1,4 +1,4 @@
# $Id: Makefile.msp430,v 1.2 2006/06/22 14:24:49 nifi Exp $ # $Id: Makefile.msp430,v 1.3 2006/06/24 06:23:47 adamdunkels Exp $
### Check if we are running under Windows ### Check if we are running under Windows
@ -81,10 +81,6 @@ vpath %.c $(PROJECTDIRS) \
%.firmware: %.co $(PROJECT_OBJECTFILES) contiki-$(TARGET).a %.firmware: %.co $(PROJECT_OBJECTFILES) contiki-$(TARGET).a
$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(filter-out %.a,$^) $(filter %.a,$^) $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(filter-out %.a,$^) $(filter %.a,$^)
# %.firmware: %.o contiki-esb-main.o contikiesb.a
# $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(filter-out %.a,$^) $(filter %.a,$^)
%.ihex: %.firmware %.ihex: %.firmware
$(OBJCOPY) $^ -O ihex $@ $(OBJCOPY) $^ -O ihex $@

13
cpu/x86/Makefile.x86
View file

@ -16,18 +16,5 @@ LDFLAGS = -Wl,-Map=contiki.map,-export-dynamic
### Compilation rules ### Compilation rules
# $(OBJECTDIR)/%.o: %.c
# $(CC) $(CFLAGS) -c $< -o $@
%.so: $(OBJECTDIR)/%.o %.so: $(OBJECTDIR)/%.o
$(LD) -shared -o $@ $^ $(LD) -shared -o $@ $^
# %.ce: %.co
# $(LD) -shared -o $@ $^
# %.co: %.c
# $(CC) $(CFLAGS) -DPROCESS_LOADABLE -c $< -o $@
# $(STRIP) --strip-unneeded -g -x $@
# %: %.co $(CONTIKI_TARGET_MAIN) $(PROJECT_OBJECTFILES) contiki-$(TARGET).a
# $(CC) $(CFLAGS) -o $@.$(TARGET) $^ $(LDFLAGS)

2
platform/gtk/Makefile.gtk
View file

@ -5,8 +5,6 @@ endif
APPS+=process-list webserver program-handler editor irc calc webbrowser email \ APPS+=process-list webserver program-handler editor irc calc webbrowser email \
shell netconf dhcp ftp shell netconf dhcp ftp
#contiki: contiki-$(TARGET).a
CONTIKI_TARGET_DIRS = . ctk net CONTIKI_TARGET_DIRS = . ctk net
CONTIKI_TARGET_MAIN = ${addprefix $(OBJECTDIR)/,contiki-main.o} CONTIKI_TARGET_MAIN = ${addprefix $(OBJECTDIR)/,contiki-main.o}