--- MiNT/src/makefile	2018/04/24 17:56:15	1.1.1.3
+++ MiNT/src/makefile	2018/04/24 17:58:33	1.1.1.6
@@ -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
 
 
 
@@ -74,13 +82,15 @@ LIBS = -liio16
 
 # add -DONLY030 for a version of MiNT that needs a 680x0, x>=3
 
+# add -DDEBUG_INFO for debugging information
+
+# add -DFASTTEXT for the u:\dev\fasttext fast console driver
 
 
-DEFS = -DMULTITOS
 
-#DEFS030 = -DMULTITOS -DONLY030
+DEFS = -DDEBUG_INFO
 
-DEFS030 = -DONLY030
+#DEFS030 = -DONLY030
 
 
 
@@ -96,11 +106,11 @@ DEFS030 = -DONLY030
 
 #
 
-CFLAGS = -G -Wall -O2 -fomit-frame-pointer $(MODEL) $(DEFS)
+CFLAGS = -G -Wall -Wmissing-prototypes -O2 -fomit-frame-pointer $(MODEL) $(DEFS)
 
 ASFLAGS = $(MODEL)
 
-CFLAGS030 = -G -Wall -O2 -fomit-frame-pointer $(MODEL030) $(DEFS030)
+CFLAGS030 = -G -Wall -Wmissing-prototypes -O2 -fomit-frame-pointer $(MODEL030) $(DEFS030)
 
 ASFLAGS030 = $(MODEL030)
 
@@ -126,7 +136,7 @@ COBJS030 = bios.o0 xbios.o0 console.o0 d
 
 
 
-CSRCS = bios.c xbios.c console.c dos.c dosdir.c dosfile.c dosmem.c dossig.c \
+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 \
 
@@ -136,6 +146,20 @@ CSRCS = bios.c xbios.c console.c dos.c d
 
 
 
+HFILES = assert.h atarierr.h basepage.h cookie.h ctype.h debug.h fasttext.h \
+
+	file.h inline.h loadave.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
@@ -148,7 +172,7 @@ OBJS030 = $(COBJS030) $(SOBJS030)
 
 
 
-all: mint.prg mint030.prg
+#all: mint.prg mint030.prg
 
 
 
@@ -156,9 +180,7 @@ mint.prg: $(OBJS)
 
 	$(CC) $(CFLAGS) -o mint.prg $(OBJS) $(LIBS)
 
-	prgflags 7 7 mint.prg
-
-	strip mint.prg
+#	strip mint.prg
 
 
 
@@ -166,21 +188,19 @@ mint030.prg: $(OBJS030)
 
 	$(CC) $(CFLAGS030) -o mint030.prg $(OBJS030) $(LIBS)
 
-	prgflags 7 7 mint030.prg
-
-	strip mint030.prg
+#	strip mint030.prg
 
 
 
 $(SOBJS): proc.h
 
-$(COBJS): mint.h proc.h file.h
+$(COBJS): mint.h proc.h file.h debug.h
 
 
 
 $(SOBJS030): proc.h
 
-$(COBJS030): mint.h proc.h file.h
+$(COBJS030): mint.h proc.h file.h debug.h
 
 
 
@@ -190,6 +210,8 @@ welcome.o: version.h
 
 bios.o: inline.h
 
+proc.o dos.o: loadave.h
+
 
 
 memprot.o: memprot.c mint.h proc.h file.h
@@ -204,6 +226,8 @@ welcome.o0: version.h
 
 bios.o0: inline.h
 
+proc.o0 dos.o0: loadave.h
+
 
 
 #
@@ -244,6 +268,8 @@ ATRANSOBJ = asmtab.o trutil.o trans.o
 
 ATRANS = asmtrans.ttp
 
+ATRANSSRC = asm.y asmtab.c asmtab.h asmtrans.h trutil.c trans.c
+
 
 
 $(ATRANS): $(ATRANSOBJ)
@@ -276,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
 
@@ -286,11 +312,27 @@ asmtab.c asmtab.h:	asm.y
 
 # the magic number include file is generated automagically
 
+#
+
 # NOTE that of course, magic.i can only reliably be generated
 
 # on an Atari ST; if you're cross-compiling, you'll have
 
-# to edit magic.i by hand
+# to edit magic.i by hand (unless your machine's native compiler
+
+# happens to generate exactly the same offsets for structures as
+
+# its Atari cross compiler, which is *extremely* unlikely).
+
+# magic.i only needs to be updated if the structures in proc.h
+
+# change; otherwise, you can use the supplied magic.i.
+
+# If you do need to generate a new magic.i, cross-compile genmagic.ttp,
+
+# run it on an ST, and bring the output back to your cross compiler.
+
+#
 
 # for cross compilers; uncomment the following definitions
 
@@ -406,9 +448,9 @@ cpu.o0: cpu.spp $(ATRANS)
 
 #
 
-proto.h: $(CSRCS)
+proto.h: $(CFILES)
 
-	mkptypes $(CSRCS) >proto.h
+	mkptypes $(CFILES) >proto.h
 
 
 
@@ -434,3 +476,31 @@ realclean:
 
 	$(RM) $(GENFILES) $(EXTRAS)
 
+
+
+#
+
+# misc. files and subdirectories to include in the distribution
+
+#
+
+MISCFILES = copying readme.src 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)
+