From 953d3ce7a04d77b41a835867429766b0de3c1b8c Mon Sep 17 00:00:00 2001 From: oliverschmidt Date: Sun, 31 Jan 2010 09:34:12 +0000 Subject: [PATCH] Now that we have at least two examples working on the cc65 targets it is preferable to not name the program files all 'contiki'. --- platform/apple2enh/Makefile.apple2enh | 27 ++++++++++++++------------- platform/c128/Makefile.c128 | 23 +++++++++++------------ platform/c64/Makefile.c64 | 23 +++++++++++------------ 3 files changed, 36 insertions(+), 37 deletions(-) diff --git a/platform/apple2enh/Makefile.apple2enh b/platform/apple2enh/Makefile.apple2enh index ce109118d..43e54bb48 100644 --- a/platform/apple2enh/Makefile.apple2enh +++ b/platform/apple2enh/Makefile.apple2enh @@ -30,7 +30,7 @@ # # Author: Oliver Schmidt # -# $Id: Makefile.apple2enh,v 1.9 2010/01/27 22:37:15 oliverschmidt Exp $ +# $Id: Makefile.apple2enh,v 1.10 2010/01/31 09:34:12 oliverschmidt Exp $ # CONTIKI_SOURCEFILES += log-asm.S pfs.S @@ -50,20 +50,21 @@ ifeq ($(MAKECMDGOALS),disk) endif endif -DISK = $(CONTIKI_PROJECT).dsk +TRIM_PROJECT := ${shell echo $(CONTIKI_PROJECT) | sed 's!\(.\{1,8\}\).*!\1!'} + disk: all - cp $(CONTIKI)/tools/$(TARGET)/prodos.dsk $(DISK) - java -jar $(AC) -p $(DISK) contiki.system sys 0 < $(CONTIKI)/tools/$(TARGET)/loader.system - java -jar $(AC) -cc65 $(DISK) contiki bin < $(CONTIKI_PROJECT).$(TARGET) - java -jar $(AC) -p $(DISK) contiki.cfg bin 0 < $(CONTIKI)/tools/$(TARGET)/sample.cfg - java -jar $(AC) -p $(DISK) cs8900a.eth rel 0 < cs8900a.eth - java -jar $(AC) -p $(DISK) lan91c96.eth rel 0 < lan91c96.eth + cp $(CONTIKI)/tools/$(TARGET)/prodos.dsk contiki.dsk + java -jar $(AC) -p contiki.dsk $(TRIM_PROJECT).system sys 0 < $(CONTIKI)/tools/$(TARGET)/loader.system + java -jar $(AC) -cc65 contiki.dsk $(TRIM_PROJECT) bin < $(CONTIKI_PROJECT).$(TARGET) + java -jar $(AC) -p contiki.dsk contiki.cfg bin 0 < $(CONTIKI)/tools/$(TARGET)/sample.cfg + java -jar $(AC) -p contiki.dsk cs8900a.eth rel 0 < cs8900a.eth + java -jar $(AC) -p contiki.dsk lan91c96.eth rel 0 < lan91c96.eth ifeq ($(findstring WITH_MOUSE,$(DEFINES)),WITH_MOUSE) - java -jar $(AC) -p $(DISK) a2e.stdmou.mou rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou + java -jar $(AC) -p contiki.dsk a2e.stdmou.mou rel 0 < $(CC65_HOME)/mou/a2e.stdmou.mou endif ifeq ($(HTTPD-CFS),1) - java -jar $(AC) -p $(DISK) index.html bin 0 < httpd-cfs/index.html - java -jar $(AC) -p $(DISK) background.gif bin 0 < httpd-cfs/background.gif - java -jar $(AC) -p $(DISK) contiki.gif bin 0 < httpd-cfs/contiki.gif - java -jar $(AC) -p $(DISK) notfound.html bin 0 < httpd-cfs/notfound.html + java -jar $(AC) -p contiki.dsk index.html bin 0 < httpd-cfs/index.html + java -jar $(AC) -p contiki.dsk background.gif bin 0 < httpd-cfs/background.gif + java -jar $(AC) -p contiki.dsk contiki.gif bin 0 < httpd-cfs/contiki.gif + java -jar $(AC) -p contiki.dsk notfound.html bin 0 < httpd-cfs/notfound.html endif diff --git a/platform/c128/Makefile.c128 b/platform/c128/Makefile.c128 index ad38978b3..f1e600270 100644 --- a/platform/c128/Makefile.c128 +++ b/platform/c128/Makefile.c128 @@ -30,7 +30,7 @@ # # Author: Oliver Schmidt # -# $Id: Makefile.c128,v 1.5 2010/01/27 22:37:16 oliverschmidt Exp $ +# $Id: Makefile.c128,v 1.6 2010/01/31 09:34:13 oliverschmidt Exp $ # CONTIKI_CPU = $(CONTIKI)/cpu/6502 @@ -45,19 +45,18 @@ ifeq ($(MAKECMDGOALS),disk) endif endif -DISK = $(CONTIKI_PROJECT).d71 disk: all - $(C1541) -format contiki,00 d71 $(DISK) - $(C1541) -attach $(DISK) -write $(CONTIKI_PROJECT).$(TARGET) contiki - $(C1541) -attach $(DISK) -write $(CONTIKI)/tools/$(TARGET)/sample.cfg contiki.cfg - $(C1541) -attach $(DISK) -write cs8900a.eth cs8900a.eth - $(C1541) -attach $(DISK) -write lan91c96.eth lan91c96.eth + $(C1541) -format contiki,00 d71 contiki.d71 + $(C1541) -attach contiki.d71 -write $(CONTIKI_PROJECT).$(TARGET) $(CONTIKI_PROJECT) + $(C1541) -attach contiki.d71 -write $(CONTIKI)/tools/$(TARGET)/sample.cfg contiki.cfg + $(C1541) -attach contiki.d71 -write cs8900a.eth cs8900a.eth + $(C1541) -attach contiki.d71 -write lan91c96.eth lan91c96.eth ifeq ($(findstring WITH_MOUSE,$(DEFINES)),WITH_MOUSE) - $(C1541) -attach $(DISK) -write $(CC65_HOME)/mou/c128-1351.mou c128-1351.mou + $(C1541) -attach contiki.d71 -write $(CC65_HOME)/mou/c128-1351.mou c128-1351.mou endif ifeq ($(HTTPD-CFS),1) - $(C1541) -attach $(DISK) -write httpd-cfs/index.html index.html - $(C1541) -attach $(DISK) -write httpd-cfs/background.gif background.gif - $(C1541) -attach $(DISK) -write httpd-cfs/contiki.gif contiki.gif - $(C1541) -attach $(DISK) -write httpd-cfs/notfound.html notfound.html + $(C1541) -attach contiki.d71 -write httpd-cfs/index.html index.html + $(C1541) -attach contiki.d71 -write httpd-cfs/background.gif background.gif + $(C1541) -attach contiki.d71 -write httpd-cfs/contiki.gif contiki.gif + $(C1541) -attach contiki.d71 -write httpd-cfs/notfound.html notfound.html endif diff --git a/platform/c64/Makefile.c64 b/platform/c64/Makefile.c64 index 4f71a13a8..70ea5a0f7 100644 --- a/platform/c64/Makefile.c64 +++ b/platform/c64/Makefile.c64 @@ -30,7 +30,7 @@ # # Author: Oliver Schmidt # -# $Id: Makefile.c64,v 1.7 2010/01/27 22:37:16 oliverschmidt Exp $ +# $Id: Makefile.c64,v 1.8 2010/01/31 09:34:13 oliverschmidt Exp $ # CONTIKI_CPU = $(CONTIKI)/cpu/6502 @@ -45,19 +45,18 @@ ifeq ($(MAKECMDGOALS),disk) endif endif -DISK = $(CONTIKI_PROJECT).d64 disk: all - $(C1541) -format contiki,00 d64 $(DISK) - $(C1541) -attach $(DISK) -write $(CONTIKI_PROJECT).$(TARGET) contiki - $(C1541) -attach $(DISK) -write $(CONTIKI)/tools/$(TARGET)/sample.cfg contiki.cfg - $(C1541) -attach $(DISK) -write cs8900a.eth cs8900a.eth - $(C1541) -attach $(DISK) -write lan91c96.eth lan91c96.eth + $(C1541) -format contiki,00 d64 contiki.d64 + $(C1541) -attach contiki.d64 -write $(CONTIKI_PROJECT).$(TARGET) $(CONTIKI_PROJECT) + $(C1541) -attach contiki.d64 -write $(CONTIKI)/tools/$(TARGET)/sample.cfg contiki.cfg + $(C1541) -attach contiki.d64 -write cs8900a.eth cs8900a.eth + $(C1541) -attach contiki.d64 -write lan91c96.eth lan91c96.eth ifeq ($(findstring WITH_MOUSE,$(DEFINES)),WITH_MOUSE) - $(C1541) -attach $(DISK) -write $(CC65_HOME)/mou/c64-1351.mou c64-1351.mou + $(C1541) -attach contiki.d64 -write $(CC65_HOME)/mou/c64-1351.mou c64-1351.mou endif ifeq ($(HTTPD-CFS),1) - $(C1541) -attach $(DISK) -write httpd-cfs/index.html index.html - $(C1541) -attach $(DISK) -write httpd-cfs/background.gif background.gif - $(C1541) -attach $(DISK) -write httpd-cfs/contiki.gif contiki.gif - $(C1541) -attach $(DISK) -write httpd-cfs/notfound.html notfound.html + $(C1541) -attach contiki.d64 -write httpd-cfs/index.html index.html + $(C1541) -attach contiki.d64 -write httpd-cfs/background.gif background.gif + $(C1541) -attach contiki.d64 -write httpd-cfs/contiki.gif contiki.gif + $(C1541) -attach contiki.d64 -write httpd-cfs/notfound.html notfound.html endif