--- MiNT/src/makefile	2018/04/24 17:55:39	1.1.1.2
+++ MiNT/src/makefile	2018/04/24 17:57:00	1.1.1.4
@@ -44,11 +44,19 @@ NATIVELIBS = -liio
 
 
 
-YACC = bison -d
+#YACC = bison
 
-YTABC = asm_tab.c
+#YTABC = asm_tab.c
 
-YTABH = asm_tab.h
+#YTABH = asm_tab.h
+
+
+
+YACC = byacc -b y_
+
+YTABC = y_tab.c
+
+YTABH = y_tab.h
 
 
 
@@ -60,17 +68,29 @@ YTABH = asm_tab.h
 
 CC = gcc
 
+AS = gcc
+
 MODEL = -mshort
 
+MODEL030 = -mshort -m68020
+
 LIBS = -liio16
 
 
 
-# add -DEZMINT for smaller MiNT
+# add -DMULTITOS for a MultiTOS kernel
+
+# add -DONLY030 for a version of MiNT that needs a 680x0, x>=3
+
+# add -DDEBUG_INFO for debugging information
 
 
 
-DEFS = -DFASTTEXT -DOWN_LIB
+DEFS = -DMULTITOS -DDEBUG_INFO
+
+#DEFS030 = -DMULTITOS -DONLY030
+
+DEFS030 = -DONLY030
 
 
 
@@ -88,7 +108,11 @@ DEFS = -DFASTTEXT -DOWN_LIB
 
 CFLAGS = -G -Wall -O2 -fomit-frame-pointer $(MODEL) $(DEFS)
 
+ASFLAGS = $(MODEL)
+
+CFLAGS030 = -G -Wall -O2 -fomit-frame-pointer $(MODEL030) $(DEFS030)
 
+ASFLAGS030 = $(MODEL030)
 
 
 
@@ -98,32 +122,78 @@ COBJS = bios.o xbios.o console.o dos.o d
 
 	biosfs.o pipefs.o procfs.o tosfs.o debug.o rendez.o \
 
-	unifs.o shmfs.o fasttext.o
+	unifs.o shmfs.o fasttext.o welcome.o nalloc2.o memprot.o realloc.o
 
 
 
-CSRCS = bios.c xbios.c console.c dos.c dosdir.c dosfile.c dosmem.c dossig.c \
+COBJS030 = bios.o0 xbios.o0 console.o0 dos.o0 dosdir.o0 dosfile.o0 dosmem.o0 dossig.o0 \
+
+	filesys.o0 main.o0 mem.o0 proc.o0 signal.o0 timeout.o0 tty.o0 util.o0 \
+
+	biosfs.o0 pipefs.o0 procfs.o0 tosfs.o0 debug.o0 rendez.o0 \
+
+	unifs.o0 shmfs.o0 fasttext.o0 welcome.o0 nalloc2.o0 memprot.o realloc.o0
+
+
+
+CFILES = bios.c xbios.c console.c dos.c dosdir.c dosfile.c dosmem.c dossig.c \
 
 	filesys.c main.c mem.c proc.c signal.c timeout.c tty.c util.c \
 
 	biosfs.c pipefs.c procfs.c tosfs.c debug.c rendez.c \
 
-	unifs.c shmfs.c fasttext.c
+	unifs.c shmfs.c fasttext.c welcome.c nalloc2.c memprot.c realloc.c
+
+
+
+HFILES = assert.h atarierr.h basepage.h cookie.h ctype.h fasttext.h \
+
+	file.h inline.h mem.h mint.h proc.h proto.h signal.h sproto.h \
+
+	types.h version.h xbra.h
+
+
+
+SFILES = context.spp cpu.spp intr.spp syscall.spp quickzer.spp \
+
+	quickmov.spp magic.i
 
 
 
 SOBJS = context.o intr.o syscall.o quickzer.o quickmov.o cpu.o
 
+SOBJS030 = context.o0 intr.o0 syscall.o0 quickzer.o0 quickmov.o0 cpu.o0
+
 
 
 OBJS = $(COBJS) $(SOBJS)
 
+OBJS030 = $(COBJS030) $(SOBJS030)
+
+
+
+#all: mint.prg mint030.prg
+
 
 
 mint.prg: $(OBJS)
 
 	$(CC) $(CFLAGS) -o mint.prg $(OBJS) $(LIBS)
 
+	prgflags 7 7 mint.prg
+
+	strip mint.prg
+
+
+
+mint030.prg: $(OBJS030)
+
+	$(CC) $(CFLAGS030) -o mint030.prg $(OBJS030) $(LIBS)
+
+	prgflags 7 7 mint030.prg
+
+	strip mint030.prg
+
 
 
 $(SOBJS): proc.h
@@ -132,12 +202,34 @@ $(COBJS): mint.h proc.h file.h
 
 
 
+$(SOBJS030): proc.h
+
+$(COBJS030): mint.h proc.h file.h
+
+
+
 main.o: version.h
 
+welcome.o: version.h
+
 bios.o: inline.h
 
 
 
+memprot.o: memprot.c mint.h proc.h file.h
+
+	$(CC) $(CFLAGS) -m68020 -c memprot.c
+
+
+
+main.o0: version.h
+
+welcome.o0: version.h
+
+bios.o0: inline.h
+
+
+
 #
 
 # assembler source files are now handled in a radically different
@@ -176,6 +268,8 @@ ATRANSOBJ = asmtab.o trutil.o trans.o
 
 ATRANS = asmtrans.ttp
 
+ATRANSSRC = asm.y amstab.c asmtab.h asmtrans.h trutil.c trans.c
+
 
 
 $(ATRANS): $(ATRANSOBJ)
@@ -188,19 +282,19 @@ $(ATRANS): $(ATRANSOBJ)
 
 asmtab.o: asmtab.c asmtrans.h
 
-	$(NATIVECC) $(NATIVECFLAGS) -o $@ -c $<
+	$(NATIVECC) $(NATIVECFLAGS) -o $@ -c asmtab.c
 
 
 
 trutil.o: trutil.c asmtrans.h
 
-	$(NATIVECC) $(NATIVECFLAGS) -o $@ -c $<
+	$(NATIVECC) $(NATIVECFLAGS) -o $@ -c trutil.c
 
 
 
 trans.o: trans.c asmtrans.h
 
-	$(NATIVECC) $(NATIVECFLAGS) -o $@ -c $<
+	$(NATIVECC) $(NATIVECFLAGS) -o $@ -c trans.c
 
 
 
@@ -208,7 +302,7 @@ trans.o: trans.c asmtrans.h
 
 asmtab.c asmtab.h:	asm.y
 
-	$(YACC) asm.y
+	$(YACC) -d asm.y
 
 	mv $(YTABC) asmtab.c
 
@@ -268,13 +362,29 @@ magic.i: $(GENMAGICPRG)
 
 #
 
-.SUFFIXES: .spp
+.SUFFIXES: .spp .o0
+
+
+
+.spp.o:
 
+	$(ATRANS) $(DEFS) -gas -o $*.s $<
 
+	$(AS) $(ASFLAGS) -o $@ -c $*.s
 
-.spp.s:
+	$(RM) $*.s
 
-	$(ATRANS) -gas -o $@ $<
+.spp.o0:
+
+	$(ATRANS) $(DEFS030) -gas -o $*.s $<
+
+	$(AS) $(ASFLAGS0) -o $@ -c $*.s
+
+	$(RM) $*.s
+
+.c.o0:
+
+	$(CC) $(CFLAGS030) -o $@ -c $<
 
 
 
@@ -292,6 +402,20 @@ cpu.o: cpu.spp $(ATRANS)
 
 
 
+context.o0: context.spp magic.i $(ATRANS)
+
+intr.o0: intr.spp magic.i $(ATRANS)
+
+syscall.o0: syscall.spp magic.i $(ATRANS)
+
+quickzer.o0: quickzer.spp $(ATRANS)
+
+quickmov.o0: quickmov.spp $(ATRANS)
+
+cpu.o0: cpu.spp $(ATRANS)
+
+
+
 #
 
 # mkptypes generates prototypes from C source code. If you don't have it,
@@ -308,9 +432,9 @@ cpu.o: cpu.spp $(ATRANS)
 
 #
 
-proto.h: $(CSRCS)
+proto.h: $(CFILES)
 
-	mkptypes $(CSRCS) >proto.h
+	mkptypes $(CFILES) >proto.h
 
 
 
@@ -320,7 +444,7 @@ proto.h: $(CSRCS)
 
 #
 
-GENFILES= $(OBJS) $(ATRANSOBJ) $(ATRANS) $(GENMAGICPRG)
+GENFILES= $(OBJS) $(OBJS030) $(ATRANSOBJ) $(ATRANS) $(GENMAGICPRG)
 
 EXTRAS= asmtab.c asmtab.h mint.prg
 
@@ -336,3 +460,31 @@ realclean:
 
 	$(RM) $(GENFILES) $(EXTRAS)
 
+
+
+#
+
+# misc. files and subdirectories to include in the distribution
+
+#
+
+MISCFILES = copying readme changes makefile makefile.lcc mintlc.prj \
+
+	genmagic.c purec asmtrans.ttp
+
+
+
+#
+
+# macros for making distribution packages
+
+#
+
+
+
+dist:
+
+	zoo a//h mintsrc.zoo $(MISCFILES) $(CFILES) $(HFILES) $(SFILES) \
+
+	 $(ATRANSSRC)
+