From 8ee4f7fc3db310167e4f42c3d3303ce006006d88 Mon Sep 17 00:00:00 2001
From: adamdunkels <adamdunkels>
Date: Sat, 24 Jun 2006 06:23:47 +0000
Subject: [PATCH] Removed out-commented stuff from Makefiles

---
 Makefile.include           |  7 -------
 cpu/avr/Makefile.avr       |  8 +-------
 cpu/msp430/Makefile.msp430 |  6 +-----
 cpu/x86/Makefile.x86       | 13 -------------
 platform/gtk/Makefile.gtk  |  2 --
 5 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/Makefile.include b/Makefile.include
index 6a03d9c34..93117da9b 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -45,15 +45,8 @@ CONTIKIFILES = $(SYSTEM) $(THREADS) $(CFS) $(LIBS) $(NET) $(DHCP)
 
 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 \
                  cfs ctk lib/ctk loader . }
-#APPDIRS += ${filter-out $(CONTIKI)/apps/CVS,${wildcard ${addprefix $(CONTIKI)/,apps/*}}}
 
 PROJECT_OBJECTFILES = ${addprefix $(OBJECTDIR)/,$(PROJECT_SOURCEFILES:.c=.o)}
 
diff --git a/cpu/avr/Makefile.avr b/cpu/avr/Makefile.avr
index 8ec26a503..735dad9ca 100644
--- a/cpu/avr/Makefile.avr
+++ b/cpu/avr/Makefile.avr
@@ -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
 
@@ -60,9 +60,6 @@ vpath %.c $(PROJECTDIRS) $(CONTIKI)/cpu/avr/dev \
 $(OBJECTDIR)/%.o: %.c
 	$(CC) $(CFLAGS) -c $< -o $@
 
-# %.firmware:	%.co $(PROJECT_OBJECTFILES) contiki-$(TARGET).a
-# 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter-out %.a,$^) $(filter %.a,$^) $(LDLIBS)
-
 %.o: %.c
 	$(CC) $(CFLAGS) -c $< -o $@
 
@@ -92,9 +89,6 @@ $(OBJECTDIR)/%.o: %.c
 %.o: ${CONTIKI_TARGET}/loader/%.S
 	$(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)
 	$(OBJCOPY) -O srec $< $@
 
diff --git a/cpu/msp430/Makefile.msp430 b/cpu/msp430/Makefile.msp430
index facc54023..430b97885 100644
--- a/cpu/msp430/Makefile.msp430
+++ b/cpu/msp430/Makefile.msp430
@@ -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
 
@@ -81,10 +81,6 @@ vpath %.c $(PROJECTDIRS) \
 %.firmware:	%.co $(PROJECT_OBJECTFILES) contiki-$(TARGET).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
 	$(OBJCOPY) $^ -O ihex $@
 
diff --git a/cpu/x86/Makefile.x86 b/cpu/x86/Makefile.x86
index b14102c35..cf9e4a666 100644
--- a/cpu/x86/Makefile.x86
+++ b/cpu/x86/Makefile.x86
@@ -16,18 +16,5 @@ LDFLAGS  = -Wl,-Map=contiki.map,-export-dynamic
 
 ### Compilation rules
 
-# $(OBJECTDIR)/%.o: %.c
-# 	$(CC) $(CFLAGS) -c $< -o $@
-
 %.so: $(OBJECTDIR)/%.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)
diff --git a/platform/gtk/Makefile.gtk b/platform/gtk/Makefile.gtk
index ec39ced6b..6103dc007 100644
--- a/platform/gtk/Makefile.gtk
+++ b/platform/gtk/Makefile.gtk
@@ -5,8 +5,6 @@ endif
 APPS+=process-list webserver program-handler editor irc calc webbrowser email \
       shell netconf dhcp ftp
 
-#contiki:	contiki-$(TARGET).a
-
 CONTIKI_TARGET_DIRS = . ctk net
 CONTIKI_TARGET_MAIN = ${addprefix $(OBJECTDIR)/,contiki-main.o}