Simplified makefiles
diff --git a/contiki-c64/Makefile b/contiki-c64/Makefile
index d2d6ebc..14c0c26 100644
--- a/contiki-c64/Makefile
+++ b/contiki-c64/Makefile
@@ -30,7 +30,7 @@
#
# This file is part of the Contiki desktop environment
#
-# $Id: Makefile,v 1.6 2003/04/24 17:02:11 adamdunkels Exp $
+# $Id: Makefile,v 1.7 2003/07/30 22:48:49 adamdunkels Exp $
#
CONTIKI=../contiki
@@ -40,22 +40,19 @@
@echo "Make sure the Contiki sources is in the directory $(CONTIKI)"
@echo 'To compile Contiki, use "'$(MAKE)' target" where target'
@echo 'is one of the following:'
- @echo tfe
- @echo rs232 programs
- @echo rs232-conio programs
+ @echo all
+ @echo c64
+ @echo programs
@echo d64
@echo programs
@echo '(Also check the Makefile for more targets to try...)'
+all: clean c64 programs
+
programs:
$(MAKE) CONTIKI=$(CONTIKI) CONTIKICC65=$(CONTIKICC65) -f Makefile.programs
-tfe:
- $(MAKE) CONTIKI=$(CONTIKI) CONTIKICC65=$(CONTIKICC65) -f Makefile.c64-tfe
-rs232:
- $(MAKE) CONTIKI=$(CONTIKI) CONTIKICC65=$(CONTIKICC65) -f Makefile.c64-rs232
-rs232-conio:
- $(MAKE) CONTIKI=$(CONTIKI) CONTIKICC65=$(CONTIKICC65) -f Makefile.c64-rs232-conio
-
+c64:
+ $(MAKE) CONTIKI=$(CONTIKI) CONTIKICC65=$(CONTIKICC65) -f Makefile.c64
CCDEPFLAGS=-D__CBM__ -D__C64__ -DCTK_HIRES
diff --git a/contiki-c64/Makefile.c64-rs232 b/contiki-c64/Makefile.c64
similarity index 90%
rename from contiki-c64/Makefile.c64-rs232
rename to contiki-c64/Makefile.c64
index d550add..87e58bf 100644
--- a/contiki-c64/Makefile.c64-rs232
+++ b/contiki-c64/Makefile.c64
@@ -30,7 +30,7 @@
#
# This file is part of the Contiki desktop environment
#
-# $Id: Makefile.c64-rs232,v 1.5 2003/04/25 08:45:59 adamdunkels Exp $
+# $Id: Makefile.c64,v 1.1 2003/07/30 22:48:49 adamdunkels Exp $
#
all: contiki contiki-labels.o
@@ -40,14 +40,14 @@
include $(CONTIKICC65)/Makefile.common
CFLAGS:=$(CFLAGSCOMMON) \
- -DCTK_HIRES -DWITH_UIP -DWITH_RS232 -DWITH_LOADER_ARCH
+ -DCTK_HIRES -DWITH_UIP -DWITH_LOADER_ARCH -DWITH_ETHERNET
contiki: contiki-main.o petsciiconv.o \
ctk.o ek.o dispatcher.o loader-arch.o \
about-dsc.o netconf-dsc.o processes-dsc.o directory-dsc.o \
ctk-mouse.o ctk-mouse-asm.o \
ctk-hires.o ctk-hires-asm.o ctk-hires-theme-default.o \
- $(UIP) \
+ $(UIP) uip_arp.o \
program-handler.o
- cl65 -C c64.cfg -Ln contiki-labels -o contiki -t $(SYS) $^
+ cl65 -Ln contiki-labels -o contiki -t $(SYS) $^
diff --git a/contiki-c64/Makefile.c64-rs232-conio b/contiki-c64/Makefile.c64-rs232-conio
deleted file mode 100644
index a272ef2..0000000
--- a/contiki-c64/Makefile.c64-rs232-conio
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright (c) 2002, Adam Dunkels.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 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
-# products derived from this software without specific prior
-# written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# This file is part of the Contiki desktop environment
-#
-# $Id: Makefile.c64-rs232-conio,v 1.3 2003/04/24 17:02:11 adamdunkels Exp $
-#
-
-all: contiki contiki-labels.o
-
-include Makefile.common
-
-CFLAGS:=$(CFLAGS) \
- -DCTK_CONIO \
- -DWITH_UIP -DWITH_RS232 -DWITH_LOADER_ARCH
-
-contiki-labels.o: contiki-labels.s
- ca65 -o contiki-labels.o contiki-labels.s
-contiki-labels.s: contiki
- ./make-labels
-
-
-contiki: contiki-main.o petsciiconv.o \
- ctk.o ek.o dispatcher.o loader-arch.o \
- fire.o \
- $(CTK_CONIO) \
- $(UIP) rs232dev.o \
- program-handler.o
- cl65 -C c64.cfg -Ln contiki-labels -o contiki -t $(SYS) $^
diff --git a/contiki-c64/Makefile.c64-tfe b/contiki-c64/Makefile.c64-tfe
deleted file mode 100644
index e5735d9..0000000
--- a/contiki-c64/Makefile.c64-tfe
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright (c) 2002, Adam Dunkels.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 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
-# products derived from this software without specific prior
-# written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# This file is part of the Contiki desktop environment
-#
-# $Id: Makefile.c64-tfe,v 1.2 2003/04/08 19:08:23 adamdunkels Exp $
-#
-
-all: contiki
-
-include Makefile.common
-
-CFLAGS:=$(CFLAGS) \
- -DCTK_EYECANDY \
- -DWITH_UIP -DWITH_TFE -DWITH_ETHERNET\
- -DWITH_WWW
-
-contiki: contiki-main.o petsciiconv.o \
- ctk.o ek.o dispatcher.o \
- program-handler.o \
- fire.o \
- $(CTK_EYECANDY) \
- $(UIP) uip_arp.o cs8900a.o \
- about.o netconf.o processes.o \
- $(WWW)
- cl65 -Ln labels -o contiki -t $(SYS) $^
-