--- gforth/Makefile.in 1997/02/08 22:58:08 1.83 +++ gforth/Makefile.in 1997/04/10 15:00:03 1.98 @@ -1,6 +1,6 @@ #Makefile for Gforth -#Copyright (C) 1995, 1996 Free Software Foundation, Inc. +#Copyright (C) 1995-1997 Free Software Foundation, Inc. #This file is part of Gforth. @@ -25,8 +25,8 @@ #gforth version VERSION_MAJOR=0 -VERSION_MINOR=2 -VERSION_RELEASE=9 +VERSION_MINOR=3 +VERSION_RELEASE=1 VERSION =$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE) DOSVERSION=$(VERSION_MAJOR)$(VERSION_MINOR)$(VERSION_RELEASE) SHELL = /bin/sh @@ -44,7 +44,8 @@ PATHSEP = @PATHSEP@ FORTHPATH = $(libdir)/gforth/site-forth$(PATHSEP)$(datadir)/gforth/site-forth$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION)$(PATHSEP). FORTHSIZES = @FORTHSIZES@ FORTH = ./gforth -p $(FORTHPATH)$(PATHSEP)$(srcdir) -FORTHK = ./gforth -p .$(PATHSEP)$(srcdir) -i ./kernel.fi +FORTHKFLAGS= -p .$(PATHSEP)$(srcdir) -i ./kernel.fi +FORTHK = ./gforth $(FORTHKFLAGS) FORTHP = ./gforth -i ./kernel.fi STRIP = strip TEXI2DVI = texi2dvi @@ -86,12 +87,15 @@ INCLUDES = forth.h threading.h io.h KERN_SRC = \ aliases0.fs \ aliases.fs \ + args.fs \ conditionals.fs \ + cond-old.fs \ cross.fs \ errore.fs \ files.fs \ kernel.fs \ main.fs \ + primitives0.fs \ search-order.fs \ special.fs \ tools.fs \ @@ -117,6 +121,7 @@ GFORTH_FI_SRC = \ look.fs \ search-order.fs \ see.fs \ + see-ext.fs \ source.fs \ startup.fs \ struct.fs \ @@ -130,7 +135,7 @@ GFORTH_FI_SRC = \ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) \ ans-report.fs ansi.fs answords.fs \ checkans.fs \ - code.fs colorize.fs \ + code.fs colorize.fs comp-image.fs \ doskey.fs ds2texi.fs \ etags.fs filedump.fs \ glosgen.fs gray.fs \ @@ -141,11 +146,12 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) site-init.fs \ tt.fs sokoban.fs \ wordsets.fs \ - tester.fs coretest.fs postponetest.fs dbltest.fs \ + tester.fs coretest.fs postponetest.fs dbltest.fs other-tests.fs \ bubble.fs siev.fs matrix.fs fib.fs \ oof.fs oofsampl.fs objects.fs -SOURCES = CVS compat Makefile.in configure.in configure config.sub config.guess \ +SOURCES = CVS compat Makefile.in gforth-makeimage \ + configure.in configure config.sub config.guess \ acconfig.h config.h.in stamp-h.in \ install-sh INSTALL README ToDo BUGS model COPYING Benchres \ gforth.ds texinfo.tex gforth.1 gforth.el \ @@ -155,16 +161,18 @@ SOURCES = CVS compat Makefile.in configu ecvt.c memcmp.c strtol.c strtoul.c ansidecl.h memmove.c pow10.c atanh.c \ strerror.c strsignal.c dblsub.c \ INSTALL.DOS makefile.dos mkdosmf.sed configure.bat dosconf.h \ - startup.dos history.dos \ - configure.cmd mkos2mf.sed os2conf.h makefile.os2 \ + gforth-makeimage.bat startup.dos history.dos mkinstalldirs \ + configure.cmd mkos2mf.sed os2conf.h makefile.os2 gforth-makeimage.cmd \ glosgen.glo glossaries.doc \ $(INCLUDES) $(FORTH_SRC) RCS_FILES = ToDo model high-level -GEN = gforth version.fs +GEN = gforth gforth-ditc version.fs version-stamp -OBJECTS = engine.o io.o main.o memcasecmp.o @LIBOBJS@ @getopt_long@ +OBJECTS0 = io.o memcasecmp.o @LIBOBJS@ @getopt_long@ +OBJECTS = engine.o main.o +OBJECTS_DITC = engine-ditc.o main-ditc.o # things that need a working forth system to be generated FORTH_GEN0 = primitives.b primitives.i prim_labels.i aliases.fs primitives.fs @@ -173,11 +181,13 @@ FORTH_GEN = $(FORTH_GEN0) @KERNEL@ gfor FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ #distributed documentation -DOCDIST = gforth.info* gforth.ps +DOCDIST = gforth.info gforth.info-* gforth.ps #stuff in a binonly distribution -BINONLYDIST = config.status Makefile gforth $(OBJECTS) \ - machine.h config.h kernel.fi stamp-h version.h version.fs \ +BINONLYDIST = config.status Makefile gforth gforth-ditc \ + $(OBJECTS0) $(OBJECTS) $(OBJECTS_DITC)\ + machine.h config.h kernel.fi \ + stamp-h version.h version.fs version-stamp \ INSTALL.BINDIST KERNLS = kernl16b.fi- kernl16l.fi- \ @@ -194,7 +204,7 @@ all: version.fs more #this rule avoids remaking everything after minor changes in Makefile.in version-stamp: Makefile.in - test x'$(VERSION)' = x`cat $@` || echo $(VERSION) >$@ + if test -r $@ && test x'$(VERSION)' = x`cat $@` ; then true ; else echo $(VERSION) > $@ ; fi version.h: version-stamp echo "static char gforth_version[]=\"$(VERSION)\" ;" >$@ @@ -251,7 +261,7 @@ dist: $(SOURCES) $(FORTH_GEN0) @KERNEL@ dosdist: $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) -$(RMTREE) gforth.$(DOSVERSION) mkdir gforth.$(DOSVERSION) - $(CP) -rp $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) gforth.$(DOSVERSION) + $(CP) -rp $(SOURCES) $(FORTH_GEN) $(DOCDIST) gforth.$(DOSVERSION) zip -r9 gforth.zip gforth.$(DOSVERSION)/* -$(RMTREE) gforth.$(DOSVERSION) @@ -317,7 +327,7 @@ install: gforth $(FORTH_SRC) kernel.fi g $(INSTALL_DATA) kernel.fi $(libdir)/gforth/$(VERSION) $(RM) gforth.fi; $(MAKE) gforth.fi #gforth.fi contains some path names $(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION) - sed s:^$(srcdir)/:$(datadir)/gforth/$(VERSION)/: gforth.TAGS >TAGS; $(INSTALL_DATA) TAGS $(datadir)/gforth/$(VERSION) + sed 's:^$(srcdir)/:$(datadir)/gforth/$(VERSION)/:' gforth.TAGS >TAGS; $(INSTALL_DATA) TAGS $(datadir)/gforth/$(VERSION) if test -d $(emacssitelispdir); then \ $(INSTALL_DATA) $(srcdir)/gforth.el $(emacssitelispdir); \ else \ @@ -339,9 +349,10 @@ uninstall: check test: gforth gforth.fi $(FORTH) tester.fs coretest.fs postponetest.fs dbltest.fs -e bye + $(FORTH) other-tests.fs -e bye $(FORTH) code.fs checkans.fs -e bye @echo 'Expect no differences' - $(FORTH) -m 100000 prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' output-c process-file bye"| diff -c - $(srcdir)/primitives.i + $(FORTH) -m 100000 prims2x.fs -e "s\" $(srcdir)/primitives.b\"' output-c process-file bye"| diff -c - $(srcdir)/primitives.i bench: gforth gforth.fi @echo 'Each benchmark takes about 30s on a 486-66 (gcc-2.6.3 -DFORCE_REG)' @@ -352,23 +363,66 @@ bench: gforth gforth.fi dvi: gforth.dvi -gforth: $(OBJECTS) +gforth: $(OBJECTS) $(OBJECTS0) -$(CP) gforth gforth~ - $(GCC) $(LDFLAGS) $(OBJECTS) $(LDLIBS) -o $@ - @MAKE_EXE@ + $(GCC) $(LDFLAGS) $(OBJECTS) $(OBJECTS0) $(LDLIBS) -o $@ + @GFORTH_EXE@ + +gforth-ditc: $(OBJECTS_DITC) $(OBJECTS0) + $(GCC) $(LDFLAGS) $(OBJECTS_DITC) $(OBJECTS0) $(LDLIBS) -o $@ + @GFORTHDITC_EXE@ + +kernl16l.fi-: $(KERN_SRC) version.fs mach16l.fs $(FORTH_GEN0) + $(FORTHK) -e 's" mach16l.fs"' main.fs -e "save-cross kernl16l.fi- $(bindir)/gforth-$(VERSION) bye" + +kernl16b.fi-: $(KERN_SRC) version.fs mach16b.fs $(FORTH_GEN0) + $(FORTHK) -e 's" mach16b.fs"' main.fs -e "save-cross kernl16b.fi- $(bindir)/gforth-$(VERSION) bye" + +kernl32l.fi-: $(KERN_SRC) version.fs mach32l.fs $(FORTH_GEN0) + $(FORTHK) -e 's" mach32l.fs"' main.fs -e "save-cross kernl32l.fi- $(bindir)/gforth-$(VERSION) bye" + +kernl32b.fi-: $(KERN_SRC) version.fs mach32b.fs $(FORTH_GEN0) + $(FORTHK) -e 's" mach32b.fs"' main.fs -e "save-cross kernl32b.fi- $(bindir)/gforth-$(VERSION) bye" + +kernl64l.fi-: $(KERN_SRC) version.fs mach64l.fs $(FORTH_GEN0) + $(FORTHK) -e 's" mach64l.fs"' main.fs -e "save-cross kernl64l.fi- $(bindir)/gforth-$(VERSION) bye" + +kernl64b.fi-: $(KERN_SRC) version.fs mach64b.fs $(FORTH_GEN0) + $(FORTHK) -e 's" mach64b.fs"' main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye" kernl%.fi-: mach%.fs $(KERN_SRC) version.fs $(FORTH_GEN0) $(FORTHK) -e 's" $<"' main.fs -e "save-cross $@ $(bindir)/gforth-$(VERSION) bye" +kernl16b.fi: $(KERNLS) + -$(CP) kernl16b.fi kernl16b.fi~ + -$(CP) kernl16b.fi- kernl16b.fi + +kernl16l.fi: $(KERNLS) + -$(CP) kernl16l.fi kernl16l.fi~ + -$(CP) kernl16l.fi- kernl16l.fi + +kernl32b.fi: $(KERNLS) + -$(CP) kernl32b.fi kernl32b.fi~ + -$(CP) kernl32b.fi- kernl32b.fi + +kernl32l.fi: $(KERNLS) + -$(CP) kernl32l.fi kernl32l.fi~ + -$(CP) kernl32l.fi- kernl32l.fi + +kernl64b.fi: $(KERNLS) + -$(CP) kernl64b.fi kernl64b.fi~ + -$(CP) kernl64b.fi- kernl64b.fi + +kernl64l.fi: $(KERNLS) + -$(CP) kernl64l.fi kernl64l.fi~ + -$(CP) kernl64l.fi- kernl64l.fi + kernl%.fi: kernl%.fi- $(KERNLS) -$(CP) $@ $@~ -$(CP) $< $@ - @LINK_KERNL@ -gforth.fi: @kernel_fi@ gforth $(GFORTH_FI_SRC) - $(FORTHK) --clear-dictionary $(FORTHSIZES) startup.fs -e "savesystem gforth.fi1 bye" - $(FORTHK) --clear-dictionary --offset-image $(FORTHSIZES) startup.fs -e "savesystem gforth.fi2 bye" - $(FORTHK) -m 100000 startup.fs comp-image.fs -e "comp-image gforth.fi1 gforth.fi2 gforth.fi bye" +gforth.fi: @kernel_fi@ gforth-makeimage gforth gforth-ditc $(GFORTH_FI_SRC) + GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc -p .$(PATHSEP)$(srcdir) -i kernel.fi startup.fs" $(srcdir)/gforth-makeimage gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) startup.fs #TAGS is a GNU standard target TAGS: gforth.TAGS @@ -385,45 +439,61 @@ engine.s: engine.c primitives.i prim_lab engine.o: engine.c primitives.i prim_labels.i machine.h threading.h $(INCLUDES) config.h $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -c $(srcdir)/engine.c +engine-ditc.o: engine.c primitives.i prim_labels.i machine.h threading.h $(INCLUDES) config.h + $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -DDOUBLY_INDIRECT -o $@ -c $(srcdir)/engine.c + main.o: main.c machine.h threading.h $(INCLUDES) config.h version.h $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -c $(srcdir)/main.c +main-ditc.o: main.c machine.h threading.h $(INCLUDES) config.h version.h + $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -DDOUBLY_INDIRECT -o $@ -c $(srcdir)/main.c + strtoul.o: strtoul.c strtol.c primitives.b: primitives m4 -s $(srcdir)/primitives >$@ primitives.i : primitives.b prims2x.fs - $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-c process-file bye" >$@ + $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-c process-file bye" >$@- + $(CP) $@- $@ + $(RM) $@- prim_labels.i : primitives.b prims2x.fs - $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-label process-file bye" >$@ + $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-label process-file bye" >$@- + $(CP) $@- $@ + $(RM) $@- aliases.fs: primitives.b prims2x.fs aliases0.fs - $(CP) aliases0.fs aliases.fs - $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-alias process-file bye" >>$@ - -primitives.fs: primitives.b prims2x.fs aliases0.fs - $(CP) aliases0.fs primitives.fs - $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-forth process-file bye" >>$@ + $(CP) aliases0.fs $@- + $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-alias process-file bye" >>$@- + $(CP) $@- $@ + $(RM) $@- + +primitives.fs: primitives.b prims2x.fs primitives0.fs + $(CP) primitives0.fs primitives.fs- + $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-forth process-file bye" >>$@- + $(CP) $@- $@ + $(RM) $@- primitives.TAGS: primitives.b prims2x.fs - $(FORTHK) prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' output-tag process-file bye" >$@ + $(FORTHK) prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' output-tag process-file bye" >$@- + $(CP) $@- $@ + $(RM) $@- -doc.fd: makedoc.fs float.fs search-order.fs glocals.fs environ.fs \ - toolsext.fs wordinfo.fs \ - vt100.fs colorize.fs see.fs bufio.fs debug.fs history.fs \ - doskey.fs vt100key.fs startup.fs assert.fs debugging.fs code.fs +doc.fd: makedoc.fs $(GFORTH_FI_SRC) $(FORTHK) -e "s\" doc.fd\"" makedoc.fs startup.fs code.fs -e bye crossdoc.fd: $(KERN_SRC) version.fs $(FORTH_GEN0) $(FORTHK) -e 's" mach32l.fs"' main.fs -e bye gforth.texi: gforth.ds primitives.b ds2texi.fs prims2x.fs doc.fd crossdoc.fd - $(FORTHK) -m 100000 ds2texi.fs prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' register-doc process-file" crossdoc.fd doc.fd -e "s\" $(srcdir)/gforth.ds\" r/o open-file throw ds2texi bye" >$@ - -checkdoc: gforth.ds primitives.b ds2texi.fs prims2x.fs doc.fd crossdoc.fd answords.fs - $(FORTHK) ds2texi.fs answords.fs -e bye + $(FORTHK) -m 100000 ds2texi.fs prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' register-doc process-file" crossdoc.fd doc.fd -e "s\" $(srcdir)/gforth.ds\" r/o open-file throw ds2texi bye" >$@- + $(CP) $@- $@ + $(RM) $@- + +checkdoc: gforth.ds primitives.b ds2texi.fs prims2x.fs doc.fd crossdoc.fd answords.fs gforth.texi + $(FORTHK) ds2texi.fs prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' register-doc process-file" crossdoc.fd doc.fd answords.fs -e bye + -grep unknown gforth.texi dvi: gforth.dvi @@ -435,7 +505,7 @@ gforth.ps: gforth.dvi info: gforth.info -gforth.info: gforth.texi +gforth.info gforth.info-*: gforth.texi -$(MAKEINFO) gforth.texi html: gforth.texi