Replace non-fully-functional hack with the new gnumake variable CONTIKI_PROJECT.

This commit is contained in:
oliverschmidt 2008-05-26 10:13:32 +00:00
parent 4dcbc3273e
commit f74503c23c
3 changed files with 9 additions and 9 deletions

View file

@ -30,7 +30,7 @@
# #
# Author: Oliver Schmidt <ol.sc@web.de> # Author: Oliver Schmidt <ol.sc@web.de>
# #
# $Id: Makefile.apple2enh,v 1.5 2008/05/22 22:21:43 oliverschmidt Exp $ # $Id: Makefile.apple2enh,v 1.6 2008/05/26 10:13:32 oliverschmidt Exp $
# #
CONTIKI_SOURCEFILES += log-asm.S pfs.S CONTIKI_SOURCEFILES += log-asm.S pfs.S
@ -55,11 +55,11 @@ ifeq ($(MAKECMDGOALS),disk)
endif endif
endif endif
DISK = ${basename ${wildcard *.$(TARGET)}}.dsk DISK = $(CONTIKI_PROJECT).dsk
disk: all disk: all
cp $(CONTIKI)/tools/$(TARGET)/prodos.dsk $(DISK) cp $(CONTIKI)/tools/$(TARGET)/prodos.dsk $(DISK)
java -jar $(AC) -p $(DISK) contiki.system sys 0 < $(CONTIKI)/tools/$(TARGET)/loader-reboot.system java -jar $(AC) -p $(DISK) contiki.system sys 0 < $(CONTIKI)/tools/$(TARGET)/loader-reboot.system
java -jar $(AC) -cc65 $(DISK) contiki bin < ${wildcard *.$(TARGET)} 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) 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) cs8900a.eth rel 0 < cs8900a.eth
java -jar $(AC) -p $(DISK) lan91c96.eth rel 0 < lan91c96.eth java -jar $(AC) -p $(DISK) lan91c96.eth rel 0 < lan91c96.eth

View file

@ -30,7 +30,7 @@
# #
# Author: Oliver Schmidt <ol.sc@web.de> # Author: Oliver Schmidt <ol.sc@web.de>
# #
# $Id: Makefile.c128,v 1.2 2008/05/22 22:19:30 oliverschmidt Exp $ # $Id: Makefile.c128,v 1.3 2008/05/26 10:14:03 oliverschmidt Exp $
# #
CFLAGS += -DWITH_PETSCII CFLAGS += -DWITH_PETSCII
@ -44,10 +44,10 @@ ifeq ($(MAKECMDGOALS),disk)
endif endif
endif endif
DISK = ${basename ${wildcard *.$(TARGET)}}.d71 DISK = $(CONTIKI_PROJECT).d71
disk: all disk: all
$(C1541) -format contiki,00 d71 $(DISK) $(C1541) -format contiki,00 d71 $(DISK)
$(C1541) -attach $(DISK) -write ${wildcard *.$(TARGET)} contiki $(C1541) -attach $(DISK) -write $(CONTIKI_PROJECT).$(TARGET) contiki
$(C1541) -attach $(DISK) -write $(CONTIKI)/tools/$(TARGET)/sample.cfg contiki.cfg $(C1541) -attach $(DISK) -write $(CONTIKI)/tools/$(TARGET)/sample.cfg contiki.cfg
$(C1541) -attach $(DISK) -write cs8900a.eth cs8900a.eth $(C1541) -attach $(DISK) -write cs8900a.eth cs8900a.eth
$(C1541) -attach $(DISK) -write lan91c96.eth lan91c96.eth $(C1541) -attach $(DISK) -write lan91c96.eth lan91c96.eth

View file

@ -30,7 +30,7 @@
# #
# Author: Oliver Schmidt <ol.sc@web.de> # Author: Oliver Schmidt <ol.sc@web.de>
# #
# $Id: Makefile.c64,v 1.4 2008/05/22 22:18:25 oliverschmidt Exp $ # $Id: Makefile.c64,v 1.5 2008/05/26 10:14:28 oliverschmidt Exp $
# #
CFLAGS += -DWITH_PETSCII CFLAGS += -DWITH_PETSCII
@ -44,10 +44,10 @@ ifeq ($(MAKECMDGOALS),disk)
endif endif
endif endif
DISK = ${basename ${wildcard *.$(TARGET)}}.d64 DISK = $(CONTIKI_PROJECT).d64
disk: all disk: all
$(C1541) -format contiki,00 d64 $(DISK) $(C1541) -format contiki,00 d64 $(DISK)
$(C1541) -attach $(DISK) -write ${wildcard *.$(TARGET)} contiki $(C1541) -attach $(DISK) -write $(CONTIKI_PROJECT).$(TARGET) contiki
$(C1541) -attach $(DISK) -write $(CONTIKI)/tools/$(TARGET)/sample.cfg contiki.cfg $(C1541) -attach $(DISK) -write $(CONTIKI)/tools/$(TARGET)/sample.cfg contiki.cfg
$(C1541) -attach $(DISK) -write cs8900a.eth cs8900a.eth $(C1541) -attach $(DISK) -write cs8900a.eth cs8900a.eth
$(C1541) -attach $(DISK) -write lan91c96.eth lan91c96.eth $(C1541) -attach $(DISK) -write lan91c96.eth lan91c96.eth