From ae4978e994157b53023e049a64e5b81a9cb65ab7 Mon Sep 17 00:00:00 2001 From: oliverschmidt Date: Fri, 21 Dec 2007 00:49:40 +0000 Subject: [PATCH] Moved z80 specific line to z80 makefile. --- Makefile.include | 2 -- cpu/z80/Makefile.z80 | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile.include b/Makefile.include index 8fcefde3b..73746c69b 100644 --- a/Makefile.include +++ b/Makefile.include @@ -61,8 +61,6 @@ CONTIKI_OBJECTFILES = ${addprefix $(OBJECTDIR)/,${call oname, $(CONTIKI_SOURCEFI PROJECT_OBJECTFILES = ${addprefix $(OBJECTDIR)/,${call oname, $(PROJECT_SOURCEFILES)}} -CONTIKI_ASMOBJECTFILES = ${addprefix $(OBJECTDIR)/,$(CONTIKI_ASMFILES:.S=.o)} - ### Include application makefiles ifdef APPS diff --git a/cpu/z80/Makefile.z80 b/cpu/z80/Makefile.z80 index a2b4fa4c2..39d3b37d2 100644 --- a/cpu/z80/Makefile.z80 +++ b/cpu/z80/Makefile.z80 @@ -2,7 +2,7 @@ # Makefile for z80/SDCC # @author Takahide Matsutsuka # -# $Id: Makefile.z80,v 1.10 2007/11/28 06:13:24 matsutsuka Exp $ +# $Id: Makefile.z80,v 1.11 2007/12/21 00:49:57 oliverschmidt Exp $ # ### Compiler definitions @@ -38,6 +38,7 @@ CONTIKI_SOURCEFILES += strcasecmp.c mtarch.c uip_arch.c \ CONTIKI_ASMFILES += uip_arch-asm.S crt0.S #crt-prg.S +CONTIKI_ASMOBJECTFILES = ${addprefix $(OBJECTDIR)/,$(CONTIKI_ASMFILES:.S=.o)} CONTIKI_CASMOBJECTFILES = ${addprefix $(OBJECTDIR)/,$(CONTIKI_CASMFILES:.cS=.o)}