--- gforth/Makefile.in 1999/05/20 14:44:38 1.157 +++ gforth/Makefile.in 2000/05/16 09:51:21 1.170 @@ -73,11 +73,11 @@ FORTHKFLAGS= --die-on-signal -p ".$(PATH FORTHK = $(ENGINE) $(FORTHKFLAGS) FORTHP = $(ENGINE) --die-on-signal -i ./$(kernel_fi) STRIP = strip -TEXI2DVI = texi2dvi +TEXI2DVI = texi2dvi -e DVI2PS = dvips -Z #you can get texi2html from http://wwwcn.cern.ch/dci/texi2html/ -TEXI2HTML = texi2html MAKEINFO = makeinfo +TEXI2HTML = texi2html # ------------- Compiler Flags @@ -165,11 +165,9 @@ 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 = \ @@ -180,9 +178,11 @@ GFORTH_FI_SRC = \ bufio.fs \ debug.fs \ debugs.fs \ + ekey.fs \ savesys.fs \ environ.fs \ errors.fs \ + exceptions.fs \ extend.fs \ float.fs \ glocals.fs \ @@ -212,10 +212,10 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) code.fs colorize.fs comp-i.fs \ doskey.fs ds2texi.fs \ envos.fs envos.dos envos.os2 etags.fs filedump.fs fi2c.fs \ - glosgen.fs gray.fs \ - doc/makedoc.fs \ + glosgen.fs gray.fs httpd.fs \ + make-app.fs doc/makedoc.fs \ more.fs other.fs prims2x.fs random.fs \ - table.fs \ + table.fs string.fs \ tt.fs sokoban.fs \ unbuffered.fs wordsets.fs \ test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs \ @@ -307,7 +307,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 @@ -457,6 +458,8 @@ install: gforth$(EXE) $(FORTH_SRC) $(ker GFORTHD="./gforth-ditc -p$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) startup.fs" ./gforthmi gforth.fi $(FORTHSIZES) startup.fs #gforth.fi contains some path names $(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION) $(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS + # after install, remove these because they are owned by ROOT + $(RM) gforth.fi install.TAGS @if test -d "$(emacssitelispdir)"; then \ $(INSTALL_DATA) $(srcdir)/gforth.el $(emacssitelispdir); \ else \ @@ -483,12 +486,9 @@ 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' + $(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 @@ -528,17 +528,14 @@ kernl64l.fi-: $(KERN_SRC) kernel/version kernl64b.fi-: $(KERN_SRC) kernel/version.fs mach64b.fs $(FORTH_GEN0) $(FORTHK) -e 's" mach64b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye" -kernl-%.fi: arch/%/mach.fs \ - $(KERN_SRC) kernel/version.fs $(FORTH_GEN0) +kernl-%.fi: arch/%/mach.fs $(KERN_SRC) kernel/version.fs $(FORTH_GEN0) $(FORTHK) -e 's" $<"' $(srcdir)/kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye" if [ -f `echo $< | sed s/fs/sh/` ]; \ then sh `echo $< | sed s/fs/sh/` $@; \ else $(CP) $@- $@; \ fi -arch/%/mach.fs: arch/%/prim.fs - -arch/%/prim.fs: arch/%/asm.fs +arch/%/mach.fs: arch/%/prim.fs arch/%/asm.fs kernl16b.fi: $(KERNLS) -$(CP) kernl16b.fi kernl16b.fi~ @@ -569,7 +566,7 @@ kernl64l.fi: $(KERNLS) # -$(CP) $< $@ gforth.fi: $(kernel_fi) gforthmi gforth$(EXE) gforth-ditc$(EXE) $(GFORTH_FI_SRC) - GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) startup.fs" ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) startup.fs + GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc --die-on-signal -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) startup.fs" ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) startup.fs # ------------- Make c-engine @@ -611,7 +608,7 @@ gforth-ditc$(EXE): engines $(CP) engine/$@ $@ @GFORTHDITC_EXE@ -engines: FORCE engine/Makefile +engines: FORCE engine/Makefile engine/prim.i engine/prim_lab.i cd engine && $(MAKE) gforth$(EXE) gforth-fast$(EXE) gforth-ditc$(EXE) # ------------- additional C primitives @@ -673,16 +670,21 @@ doc/gforth.info doc/gforth.info-*: $(GFO html: $(GFORTH_TEXI) -$(RMTREE) html -mkdir html - cd html; $(TEXI2HTML) -menu -split_node ../doc/gforth.texi +### need makeinfo 4.0 to generate html. Otherwise, use texi2html.. + cd html; $(MAKEINFO) --html -I ../doc ../doc/gforth.texi +### cd html; $(TEXI2HTML) -menu -split_node ../doc/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 TAGS # 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