--- MiNT/src/makefile 2018/04/24 17:55:39 1.1.1.2 +++ 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 @@ -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 +# add -DFASTTEXT for the u:\dev\fasttext fast console driver + + + +DEFS = -DDEBUG_INFO + +#DEFS030 = -DONLY030 @@ -86,9 +106,13 @@ DEFS = -DFASTTEXT -DOWN_LIB # -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 -Wmissing-prototypes -O2 -fomit-frame-pointer $(MODEL030) $(DEFS030) +ASFLAGS030 = $(MODEL030) @@ -98,44 +122,112 @@ 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 + +COBJS030 = bios.o0 xbios.o0 console.o0 dos.o0 dosdir.o0 dosfile.o0 dosmem.o0 dossig.o0 \ -CSRCS = bios.c xbios.c console.c dos.c dosdir.c dosfile.c dosmem.c dossig.c \ + 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 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 + OBJS = $(COBJS) $(SOBJS) +OBJS030 = $(COBJS030) $(SOBJS030) + + + +#all: mint.prg mint030.prg + mint.prg: $(OBJS) $(CC) $(CFLAGS) -o mint.prg $(OBJS) $(LIBS) +# strip mint.prg + + + +mint030.prg: $(OBJS030) + + $(CC) $(CFLAGS030) -o mint030.prg $(OBJS030) $(LIBS) + +# 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 debug.h main.o: version.h +welcome.o: version.h + bios.o: inline.h +proc.o dos.o: loadave.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 + +proc.o0 dos.o0: loadave.h + # @@ -176,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) @@ -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 @@ -218,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 @@ -268,13 +378,29 @@ magic.i: $(GENMAGICPRG) # -.SUFFIXES: .spp +.SUFFIXES: .spp .o0 + + + +.spp.o: + + $(ATRANS) $(DEFS) -gas -o $*.s $< + + $(AS) $(ASFLAGS) -o $@ -c $*.s + + $(RM) $*.s +.spp.o0: + $(ATRANS) $(DEFS030) -gas -o $*.s $< -.spp.s: + $(AS) $(ASFLAGS0) -o $@ -c $*.s - $(ATRANS) -gas -o $@ $< + $(RM) $*.s + +.c.o0: + + $(CC) $(CFLAGS030) -o $@ -c $< @@ -292,6 +418,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 +448,9 @@ cpu.o: cpu.spp $(ATRANS) # -proto.h: $(CSRCS) +proto.h: $(CFILES) - mkptypes $(CSRCS) >proto.h + mkptypes $(CFILES) >proto.h @@ -320,7 +460,7 @@ proto.h: $(CSRCS) # -GENFILES= $(OBJS) $(ATRANSOBJ) $(ATRANS) $(GENMAGICPRG) +GENFILES= $(OBJS) $(OBJS030) $(ATRANSOBJ) $(ATRANS) $(GENMAGICPRG) EXTRAS= asmtab.c asmtab.h mint.prg @@ -336,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) +