--- gforth/Makefile.in 1999/01/10 22:00:22 1.144 +++ gforth/Makefile.in 1999/10/15 23:18:18 1.161 @@ -62,7 +62,7 @@ INSTALL_DATA = @INSTALL_DATA@ LN_S = @LN_S@ GCC = @CC@ CC = $(GCC) -FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION) +FORTHPATH = ~+$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION) FORTHSIZES = @FORTHSIZES@ FORTH_ARGS = --die-on-signal -p $(FORTHPATH)$(PATHSEP)$(srcdir) ENGINE = ./gforth @@ -70,8 +70,8 @@ FORTH = $(ENGINE) $(FORTH_ARGS) ENGINE_FAST = $(ENGINE)-fast FORTH_FAST = $(ENGINE_FAST) $(FORTH_ARGS) FORTHKFLAGS= --die-on-signal -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi) -FORTHK = ./gforth $(FORTHKFLAGS) -FORTHP = ./gforth --die-on-signal -i ./$(kernel_fi) +FORTHK = $(ENGINE) $(FORTHKFLAGS) +FORTHP = $(ENGINE) --die-on-signal -i ./$(kernel_fi) STRIP = strip TEXI2DVI = texi2dvi DVI2PS = dvips -Z @@ -86,7 +86,7 @@ XDEFINES = @DEFS@ SWITCHES = $(XCFLAGS) $(XDEFINES) #-DNDEBUG #turn off assertions ENGINE_FLAGS = @ENGINE_FLAGS@ -fno-defer-pop -fcaller-saves DEBUGFLAG = @DEBUGFLAG@ -CFLAGS = $(DEBUGFLAG) -I$(srcdir)/engine -I$(srcdir)/arch/$(machine) -O4 -Wall $(SWITCHES) -DDEFAULTPATH=\"$(FORTHPATH)\" +CFLAGS = $(DEBUGFLAG) -I$(srcdir)/engine -I$(srcdir)/arch/$(machine) -O3 -Wall $(SWITCHES) -DDEFAULTPATH=\"$(FORTHPATH)\" #John Wavrik should use -Xlinker -N to get a writable text (executable) XLDFLAGS = @LDFLAGS@ @@ -123,6 +123,8 @@ CVSDIRS = CVS engine/CVS kernel/CVS doc/ INCLUDES = engine/forth.h engine/threaded.h engine/io.h KERN_SRC = \ + mach16b.fs mach16l.fs mach32b.fs mach32l.fs mach64b.fs mach64l.fs \ + machpc.fs \ kernel/aliases0.fs \ kernel/aliases.fs \ kernel/args.fs \ @@ -138,7 +140,7 @@ KERN_SRC = \ kernel/main.fs \ kernel/prim0.fs \ search.fs \ - kernel/special.fs \ + kernel/quotes.fs \ kernel/tools.fs \ kernel/toolsext.fs \ kernel/vars.fs \ @@ -151,7 +153,8 @@ KERN_SRC = \ kernel/nio.fs \ kernel/saccept.fs \ kernel/doers.fs \ - kernel/getdoers.fs + kernel/getdoers.fs \ + kernel/pass.fs EC_SRC = \ asm/README \ @@ -162,15 +165,14 @@ EC_SRC = \ asm/target.fs \ ec/README \ ec/mirror.fs \ - ec/mirrors.fs \ ec/shex.fs \ ec/builttag.fs \ ec/dotx.fs \ - ec/mirrored.fs \ ec/nesting.fs GFORTH_FI_SRC = \ assert.fs \ + backtrace.fs \ blocked.fb \ blocks.fs \ bufio.fs \ @@ -209,16 +211,16 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) doskey.fs ds2texi.fs \ envos.fs envos.dos envos.os2 etags.fs filedump.fs fi2c.fs \ glosgen.fs gray.fs \ - doc/makedoc.fs \ - mach16b.fs mach16l.fs mach32b.fs mach32l.fs mach64b.fs mach64l.fs \ - machpc.fs more.fs other.fs prims2x.fs random.fs \ + make-app.fs doc/makedoc.fs \ + more.fs other.fs prims2x.fs random.fs \ table.fs \ tt.fs sokoban.fs \ unbuffered.fs wordsets.fs \ test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs \ test/other.fs test/checkans.fs \ bubble.fs siev.fs matrix.fs fib.fs \ - oof.fs oofsampl.fs objects.fs objexamp.fs mini-oof.fs moof-exm.fs + oof.fs oofsampl.fs objects.fs objexamp.fs mini-oof.fs moof-exm.fs \ + moofglos.fs COMPAT = compat/README \ compat/anslocal.fs \ @@ -291,7 +293,7 @@ SOURCES = $(CVSDIRS) compat Makefile.in doc/gforth.ds doc/texinfo.tex doc/gforth.1 doc/version.texi.in \ gforth.el \ prim engine/engine.c engine/main.c engine/io.c engine/memcmpc.c \ - $(ARCHS) \ + engine/signals.c $(ARCHS) \ engine/getopt.c engine/getopt1.c engine/getopt.h engine/select.c \ engine/ecvt.c engine/memcmp.c engine/strtol.c engine/strtoul.c \ engine/ansidecl.h engine/memmove.c \ @@ -303,7 +305,8 @@ SOURCES = $(CVSDIRS) compat Makefile.in configure.cmd mkos2mf.sed os2conf.h makefile.os2 engine/makefile.os2 \ gforthmi.cmd glosgen.glo doc/glossaries.doc \ $(INCLUDES) $(FORTH_SRC) $(COMPAT) \ - timings.sc + timings.sc \ + test/coretest.out test/checkans.out RCS_FILES = ToDo model high-level @@ -347,7 +350,7 @@ kernel/version.fs: version $(MAKE) gforth$(EXE) echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs -more: engine $(FORTH_GEN) gforth$(EXE) +more: engine $(FORTH_GEN) $(GEN) #from the gcc Makefile: #"Deletion of files made during compilation. @@ -370,6 +373,14 @@ mostlyclean: FORCE doc/gforth.toc doc/gforth.tp doc/gforth.vr html \ gforth-$(VERSION).tar.gz +# Just the stuff needed to rebuild the documentation nac03feb1999 +docclean: FORCE + -$(RM) -rf doc/crossdoc.fd doc/doc.fd doc/gforth.texi doc/gforth.fns \ + doc/gforth.aux doc/gforth.cp doc/gforth.cps \ + doc/gforth.dvi doc/gforth.fn doc/gforth.ky doc/gforth.log \ + doc/gforth.pg \ + doc/gforth.toc doc/gforth.tp doc/gforth.vr html + clean: mostlyclean -$(RM) -rf $(GEN) engine/gforth$(EXE) \ engine/gforth-fast$(EXE) engine/gforth-ditc$(EXE) \ @@ -427,12 +438,14 @@ binonlydist: Makedist FORCE install: gforth$(EXE) $(FORTH_SRC) $(kernel_fi) gforth.fi gforthmi doc/gforth.1 prim install.TAGS installdirs touch $(siteforthdir)/siteinit.fs -$(RM) $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforthmi + -$(RM) $(bindir)/gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE) $(INSTALL_PROGRAM) -s gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) - $(LN_S) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforth$(EXE) + (cd $(bindir) && $(LN_S) gforth-$(VERSION)$(EXE) gforth$(EXE)) $(INSTALL_PROGRAM) -s gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE) - $(LN_S) $(bindir)/gforth-fast-$(VERSION)$(EXE) $(bindir)/gforth-fast$(EXE) + (cd $(bindir) && $(LN_S) gforth-fast-$(VERSION)$(EXE) gforth-fast$(EXE)) $(INSTALL_PROGRAM) gforthmi $(bindir)/gforthmi-$(VERSION) - $(LN_S) $(bindir)/gforthmi-$(VERSION) $(bindir)/gforthmi + $(INSTALL_PROGRAM) gforth-ditc $(libdir)/gforth/$(VERSION) + (cd $(bindir) && $(LN_S) gforthmi-$(VERSION) gforthmi) -$(INSTALL_DATA) $(srcdir)/doc/gforth.1 $(man1dir) -for i in $(srcdir)/doc/gforth.info*; do $(INSTALL_DATA) $$i $(infodir); done for i in $(FORTH_SRC) $(COMPAT) prim; do \ @@ -469,13 +482,12 @@ uninstall: FORCE @echo -e "To remove Gforth completely, type\n$(RM) -rf $(bindir)/gforth$(EXE) $(bindir)/gforthmi $(man1dir)/gforth.1 $(infodir)/gforth.info* $(datadir)/gforth $(libdir)/gforth" check test: gforth$(EXE) gforth.fi - $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs -e bye + $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs -e bye | diff -c - $(srcdir)/test/coretest.out $(FORTH) test/other.fs -e bye - @echo "Expect 'Missing: EKEY EKEY>CHAR EKEY? EMIT?'" - @echo "Expect 'Missing: EDITOR FORGET'" - $(FORTH) code.fs test/checkans.fs -e bye - @echo 'Expect no differences' - $(FORTHK) -m 100000 prims2x.fs -e "s\" $(srcdir)/prim.b\"' output-c process-file bye"| diff -c - $(srcdir)/engine/prim.i + $(FORTH) code.fs test/checkans.fs -e bye | diff -c - $(srcdir)/test/checkans.out + $(FORTHK) -m 100000 prims2x.fs -e \ + "c-flag on s\" $(srcdir)/prim.b\" ' output-c process-file bye"| \ + diff -c - $(srcdir)/engine/prim.i bench: gforth-fast$(EXE) gforth.fi @echo 'Each benchmark takes about 30s on a 486-66 (gcc-2.6.3 -DFORCE_REG)' @@ -486,7 +498,7 @@ bench: gforth-fast$(EXE) gforth.fi # ------------- Make forth images -# Hot to make new images: +# How to make new images: # 1. Produce an image called kernlXYZ.fi- # the original kernel.fi is not touched because it's needed for creation # 2. copy old kernlXYZ.fi to kernlXYZ.fi~ @@ -495,7 +507,7 @@ bench: gforth-fast$(EXE) gforth.fi # these are the ones we want to use now kernl16l.fi-: $(KERN_SRC) kernel/version.fs mach16l.fs $(FORTH_GEN0) - $(FORTHK) -e 's" mach16l.fs"' kernel/main.fs -e "save-cross kernl16l.fi- $(bindir)/gforth-$(VERSION) bye" + $(FORTHK) -e 's" mach16l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16l.fi- $(bindir)/gforth-$(VERSION) bye" kernl16b.fi-: $(KERN_SRC) kernel/version.fs mach16b.fs $(FORTH_GEN0) $(FORTHK) -e 's" mach16b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16b.fi- $(bindir)/gforth-$(VERSION) bye" @@ -561,24 +573,24 @@ prim.b: prim m4 -s $(srcdir)/prim >$@ engine/prim.i: prim.b prims2x.fs - $(FORTHK) prims2x.fs -e "s\" prim.b\" ' output-c process-file bye" >$@- + $(FORTHK) prims2x.fs -e "c-flag on s\" prim.b\" ' output-c process-file bye" >$@- $(CP) $@- $@ $(RM) $@- engine/prim_lab.i: prim.b prims2x.fs - $(FORTHK) prims2x.fs -e "s\" prim.b\" ' output-label process-file bye" >$@- + $(FORTHK) prims2x.fs -e "c-flag on s\" prim.b\" ' output-label process-file bye" >$@- $(CP) $@- $@ $(RM) $@- kernel/aliases.fs: prim.b prims2x.fs kernel/aliases0.fs $(CP) kernel/aliases0.fs $@- - $(FORTHK) prims2x.fs -e "s\" prim.b\" ' output-alias process-file bye" >>$@- + $(FORTHK) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-alias process-file bye" >>$@- $(CP) $@- $@ $(RM) $@- kernel/prim.fs: prim.b prims2x.fs kernel/prim0.fs $(CP) kernel/prim0.fs kernel/prim.fs- - $(FORTHK) prims2x.fs -e "s\" prim.b\" ' output-forth process-file bye" >>$@- + $(FORTHK) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-forth process-file bye" >>$@- $(CP) $@- $@ $(RM) $@- @@ -625,8 +637,8 @@ prim.TAGS: prim.b prims2x.fs $(CP) $@- $@ $(RM) $@- -doc/doc.fd: doc/makedoc.fs $(GFORTH_FI_SRC) code.fs objects.fs oof.fs mini-oof.fs - $(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs startup.fs code.fs objects.fs oof.fs mini-oof.fs -e bye +doc/doc.fd: doc/makedoc.fs $(GFORTH_FI_SRC) code.fs objects.fs oof.fs moofglos.fs + $(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs startup.fs code.fs objects.fs oof.fs moofglos.fs -e bye doc/crossdoc.fd: $(KERN_SRC) kernel/version.fs $(FORTH_GEN0) $(FORTHK) -e 's" mach32l.fs"' kernel/main.fs -e bye @@ -662,11 +674,14 @@ html: $(GFORTH_TEXI) doc/gforth.txt: $(GFORTH_TEXI) -cd doc; $(MAKEINFO) --no-headers --no-split gforth.texi >gforth.txt -doc: doc/gforth.ps html doc/gforth.txt +doc: info doc/gforth.ps html doc/gforth.txt # For an explanation of the following Makefile rules, see node # `Automatic Remaking' in GNU Autoconf documentation. -$(srcdir)/configure: configure.in aclocal.m4 + +#Note: no target "$(srcdir)/configure", because that does not trigger +#unless $(srcdir)!="." +configure: configure.in aclocal.m4 cd $(srcdir) && autoconf aclocal.m4: acinclude.m4 configure.in