Fixed recent change.

This commit is contained in:
oliverschmidt 2007-08-30 20:47:14 +00:00
parent 02fb08e029
commit 34af8fbc1a

View file

@ -30,7 +30,7 @@
# #
# Author: Oliver Schmidt <ol.sc@web.de> # Author: Oliver Schmidt <ol.sc@web.de>
# #
# $Id: Makefile.6502,v 1.11 2007/08/30 14:39:18 matsutsuka Exp $ # $Id: Makefile.6502,v 1.12 2007/08/30 20:47:14 oliverschmidt Exp $
# #
ifndef CONTIKI ifndef CONTIKI
@ -68,7 +68,7 @@ CC = cc65
LD = ld65 LD = ld65
AR = ar65 AR = ar65
AFLAGS = -t $(TARGET) ASFLAGS = -t $(TARGET)
CFLAGS += -t $(TARGET) -Or CFLAGS += -t $(TARGET) -Or
LDFLAGS = -C $(CONTIKI)/platform/$(TARGET)/linker.cfg -m contiki-$(TARGET).map LDFLAGS = -C $(CONTIKI)/platform/$(TARGET)/linker.cfg -m contiki-$(TARGET).map
AROPTS = a AROPTS = a
@ -84,16 +84,12 @@ CUSTOM_RULE_C_TO_OBJECTDIR_D = 1
CUSTOM_RULE_C_TO_OBJECTDIR_O = 1 CUSTOM_RULE_C_TO_OBJECTDIR_O = 1
$(OBJECTDIR)/%.o: %.c $(OBJECTDIR)/%.o: %.c
$(CC) $(CFLAGS) --create-dep $< -o $(@:.o=.s) $(CC) $(CFLAGS) --create-dep $< -o $(@:.o=.s)
@$(AS) $(AFLAGS) $(@:.o=.s) -o $@ @$(AS) $(ASFLAGS) $(@:.o=.s) -o $@
@sed 's!.s:!.o:!' < $(@:.o=.u) > $(@:.o=.d) @sed 's!.s:!.o:!' < $(@:.o=.u) > $(@:.o=.d)
@rm -f $(@:.o=.s) $(@:.o=.u) @rm -f $(@:.o=.s) $(@:.o=.u)
CUSTOM_RULE_C_TO_CO = 1 CUSTOM_RULE_C_TO_CO = 1
%.co: %.c %.co: %.c
$(CC) $(CFLAGS) -DAUTOSTART_ENABLE $< -o $(@:.co=.s) $(CC) $(CFLAGS) -DAUTOSTART_ENABLE $< -o $(@:.co=.s)
@$(AS) $(AFLAGS) $(@:.co=.s) -o $@ @$(AS) $(ASFLAGS) $(@:.co=.s) -o $@
@rm -f $(@:.co=.s) @rm -f $(@:.co=.s)
#moved to Makefile.include
#$(OBJECTDIR)/%.o: %.S
# $(AS) $(AFLAGS) $< -o $@