From e76d7aa478e37292647829f0a64f0276b82154ce Mon Sep 17 00:00:00 2001 From: "B. Watson" <yalhcru@gmail.com> Date: Fri, 15 Mar 2019 06:56:02 -0400 Subject: Rearrange Makefile, nove license to doc/ --- doc/LICENSE.txt | 29 +++++++++++++++++++++++++ src/Makefile | 67 +++++++++++++++------------------------------------------ src/mkdisk.sh | 1 - 3 files changed, 46 insertions(+), 51 deletions(-) create mode 100644 doc/LICENSE.txt diff --git a/doc/LICENSE.txt b/doc/LICENSE.txt new file mode 100644 index 0000000..005c720 --- /dev/null +++ b/doc/LICENSE.txt @@ -0,0 +1,29 @@ +Copyright (c) 2019, B. Watson. + +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. 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 FujiChat Atari 8-bit IRC client. + +FujiChat incorporates the uIP stack, copyright (c) Adam Dunkels. diff --git a/src/Makefile b/src/Makefile index a942af8..43ab9a8 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,47 +1,22 @@ -# Copyright (c) 2001, 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. 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 uIP TCP/IP stack. -# -# $Id: Makefile,v 1.13 2006/06/11 21:55:03 adam Exp $ -# - -all: uip fujiconf.xex aexec.xex fujimenu.xex makeauto.xex about.xex loadmkau.xex loadmenu.xex keybuf.o clear_rts +# This file is part of the FujiChat Atari 8-bit IRC client. +# Copyright (c) 2019, B. Watson. +# All rights reserved. See doc/LICENSE.txt for legalese. CC = cl65 AR = ar65 APPS = telnet resolv CFLAGS = -t atari -I../uip/uip -I. -O +# Default target: build all the binaries. +all: fujichat.xex fujiconf.xex aexec.xex fujimenu.xex makeauto.xex about.xex loadmkau.xex loadmenu.xex keybuf.o + +# The uIP Makefile: -include Makefile.include uip: $(addprefix $(OBJECTDIR)/, fujichat.o common.o commands.o rs232dev.o clock-arch.o) keybuf.o apps.a uip.a fujiput.s -#fujichat.o: common.h features.h fujichat.h # no worky? +fujichat.xex: uip + mv uip fujichat.xex keybuf.o: keybuf.s ca65 -t atari -l -o keybuf.o keybuf.s @@ -58,12 +33,6 @@ fujimenu.xex: fujimenu.c fujichat.h aexec.xex common.o about.xex: about.c fujichat.h aexec.xex common.o $(CC) $(CFLAGS) -o about.xex about.c common.o -#loadchat.xex: loadchat.c fujichat.h -# $(CC) $(CFLAGS) -o loadchat.xex loadchat.c - -#loadchat.xex: loadchat.dasm -#dasm loadchat.dasm -f3 -oloadchat.xex - makeauto.xex: makeauto.c $(CC) $(CFLAGS) -o makeauto.xex makeauto.c common.o @@ -76,24 +45,22 @@ loadmkau.xex: loadmkau.dasm aexec.xex: aexec.dasm dasm aexec.dasm -f3 -oaexec.xex -test: newdisk +test: disk atariserver fujitest.atr sudo sh ./start_slip.sh -disk: newdisk - -newdisk: all +disk: all sh mkdisk.sh -old_disk: uip - cat rvert.com uip > autorun.sys - axe -w autorun.sys uiptest.atr - #xterm -e atariserver uiptest.atr - clean: - rm -fr *.xex obj/ *.o *~ *core uip $(OBJECTDIR) *.a + rm -rf *.xex obj/ *.o *~ *core $(OBJECTDIR) *.a mkdir obj +distclean: clean + rm -rf ../uip/uip/uip.o + +## Old test targets, not used, maybe not working any more: + keybuftest.xex: keybuftest.c keybuf.o $(CC) $(CFLAGS) -o keybuftest.xex keybuftest.c keybuf.o diff --git a/src/mkdisk.sh b/src/mkdisk.sh index 5da6985..a24aca6 100644 --- a/src/mkdisk.sh +++ b/src/mkdisk.sh @@ -5,7 +5,6 @@ set -e rm -rf disk mkdir disk cp dos_20s.atr disk/fujichat.atr -cp uip fujichat.xex cp atari850.ser disk/atari850.ser cp bobvert.com disk/bobvert.ser cp prconn.ser disk/prconn.ser -- cgit v1.2.3