Merge pull request #553 from oliverschmidt/master

Some fine tuning after the recent general modularization.

cpu/6502/Makefile.6502

@@ -37,6 +37,8 @@ endif
 
 all: cs8900a.eth lan91c96.eth w5100.eth
 
+.SUFFIXES:
+
 CONTIKI_TARGET_DIRS = . lib sys
 CONTIKI_CPU_DIRS    = . lib sys ctk net
 
@@ -48,13 +50,13 @@ CONTIKI_CPU_SOURCEFILES    += log.c error.c unload.c config.c ctk-mouse.c \
 CONTIKI_SOURCEFILES += $(CTK) ctk-conio.c petsciiconv.c cfs-posix-dir.c \
                        $(CONTIKI_TARGET_SOURCEFILES) $(CONTIKI_CPU_SOURCEFILES)
 
+MODULES += core/ctk core/net/ip core/net/ipv4 core/net/ipv6
+
 ifdef ETHERNET
   CONTIKI_SOURCEFILES += $(ETHERNET)-eth.S
   CFLAGS += -DETHERNET=$(ETHERNET)
 endif
 
-### Compiler definitions
-
 AS = ca65
 CC = cl65
 LD = ld65
@@ -64,9 +66,6 @@ AR = ar65
 # The apps coming with Contiki run even on a 0x100 byte stack.
 
 ASFLAGS = -t $(TARGET)
-CFLAGS += -t $(TARGET) -Or -W -unused-param,-unused-var,-const-comparison
+CFLAGS += -t $(TARGET) -Or -W -unused-param
 LDFLAGS = $(STARTADDR_FLAG) -t $(TARGET) -m contiki-$(TARGET).map -D __STACKSIZE__=0x200
 AROPTS  = a
-
-## Default modules
-MODULES += core/net/ipv4 core/ctk core/net core/net/ip

cpu/6502/Makefile.customrules-6502

@@ -1,7 +1,3 @@
-### Compilation rules
-
-.SUFFIXES:
-
 CUSTOM_RULE_C_TO_OBJECTDIR_O = 1
 $(OBJECTDIR)/%.o: %.c | $(OBJECTDIR)
 	$(TRACE_CC)