Updated for the new kernel API
diff --git a/contiki-pet/Makefile b/contiki-pet/Makefile
index 7e4a76a..b319563 100644
--- a/contiki-pet/Makefile
+++ b/contiki-pet/Makefile
@@ -9,10 +9,7 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by Adam Dunkels.
-# 4. The name of the author may not be used to endorse or promote
+# 3. The name of the author may not be used to endorse or promote
# products derived from this software without specific prior
# written permission.
#
@@ -30,13 +27,14 @@
#
# This file is part of the Contiki desktop environment
#
-# $Id: Makefile,v 1.1 2003/04/11 20:29:28 adamdunkels Exp $
+# $Id: Makefile,v 1.2 2004/07/04 19:58:55 adamdunkels Exp $
#
all: contiki loader-arch-module.o contiki-labels.o \
about.prg processes.prg netconf.prg memstat.prg calc.prg
CONTIKI=../contiki
+CONTIKICC65=../contiki-cc65
SYS=pet
CC=cc65
@@ -87,6 +85,10 @@
$(CC) $(CFLAGS) $(OPT) -o $(patsubst %c, %s, $(notdir $<)) $<
$(AS) -o $@ $(AFLAGS) $(*).s
+%.o: $(CONTIKICC65)/apps/%.c
+ $(CC) $(CFLAGS) $(OPT) -o $(patsubst %c, %s, $(notdir $<)) $<
+ $(AS) -o $@ $(AFLAGS) $(*).s
+
%.o: apps/%.S
$(AS) -o $@ $(AFLAGS) $<
@@ -104,10 +106,10 @@
contiki-labels.o: contiki-labels.s
ca65 -o contiki-labels.o contiki-labels.s
contiki-labels.s: contiki
- ./make-labels
+ $(CONTIKICC65)/make-labels
contiki: contiki-main.o strncasecmp.o petsciiconv.o \
- ctk-conio.o ctk.o ek.o dispatcher.o \
+ ctk-conio.o ctk.o ek.o timer.o arg.o \
program-handler.o loader-arch.o
cl65 -Ln contiki-labels -o contiki -t $(SYS) $^