--- gforth/Makefile.in 1999/05/17 13:37:53 1.155 +++ gforth/Makefile.in 2000/11/13 22:10:30 1.194 @@ -1,6 +1,6 @@ #Makefile for Gforth -#Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc. +#Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc. #This file is part of Gforth. @@ -16,7 +16,7 @@ #You should have received a copy of the GNU General Public License #along with this program; if not, write to the Free Software -#Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. # To change the values of `make' variables: instead of editing Makefiles, # (1) if the variable is set in `config.status', edit `config.status' @@ -31,7 +31,7 @@ # ------------- gforth version VERSION = @VERSION@ -DOSVERSION=`echo $(VERSION)|sed 's/\.//g'` +DOSVERSION=`echo $(VERSION)|sed 's/\.//g'|sed 's/-.*//g'` # ------------- System specific variables @@ -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 @@ -72,12 +72,15 @@ FORTH_FAST = $(ENGINE_FAST) $(FORTH_ARGS FORTHKFLAGS= --die-on-signal -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi) FORTHK = $(ENGINE) $(FORTHKFLAGS) FORTHP = $(ENGINE) --die-on-signal -i ./$(kernel_fi) +#the "-2 image-included-files +!" undoes the change to image-included-files +# in exboot.fs +STARTUP = -e 3 exboot.fs startup.fs @asm_fs@ @disasm_fs@ 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 @@ -113,12 +116,12 @@ emacssitelispdir=@lispdir@ siteforthdir=$(datadir)/gforth/site-forth CVSDIRS = CVS engine/CVS kernel/CVS doc/CVS asm/CVS ec/CVS test/CVS \ - compat/CVS \ + compat/CVS unix/CVS \ arch/CVS arch/generic/CVS arch/m68k/CVS arch/mips/CVS \ arch/386/CVS arch/hppa/CVS arch/sparc/CVS arch/power/CVS \ arch/alpha/CVS arch/4stack/CVS arch/misc/CVS arch/6502/CVS \ arch/8086/CVS arch/avr/CVS arch/c165/CVS arch/h8/CVS \ - arch/shboom/CVS \ + arch/shboom/CVS arch/sharc/CVS arch/ia64/CVS INCLUDES = engine/forth.h engine/threaded.h engine/io.h @@ -129,6 +132,8 @@ KERN_SRC = \ kernel/aliases.fs \ kernel/args.fs \ chains.fs \ + kernel/cbr.fs \ + kernel/cloop.fs \ kernel/cond.fs \ kernel/cond-old.fs \ cross.fs \ @@ -140,7 +145,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 \ @@ -149,11 +154,13 @@ KERN_SRC = \ kernel/int.fs \ kernel/comp.fs \ kernel/io.fs \ + kernel/input.fs \ kernel/license.fs \ kernel/nio.fs \ kernel/saccept.fs \ kernel/doers.fs \ - kernel/getdoers.fs + kernel/getdoers.fs \ + kernel/pass.fs EC_SRC = \ asm/README \ @@ -164,24 +171,25 @@ 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 \ + backtrac.fs \ blocked.fb \ blocks.fs \ bufio.fs \ debug.fs \ debugs.fs \ + ekey.fs \ savesys.fs \ environ.fs \ errors.fs \ + exboot.fs \ + except.fs \ extend.fs \ float.fs \ glocals.fs \ @@ -202,26 +210,27 @@ GFORTH_FI_SRC = \ vt100.fs \ vt100key.fs \ wordinfo.fs \ - lib.fs \ - sieve.fs \ - add.fs + arch/386/asm.fs arch/386/disasm.fs \ + arch/alpha/asm.fs arch/alpha/disasm.fs \ + arch/mips/asm.fs arch/mips/disasm.fs arch/mips/insts.fs FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_SRC) \ ans-report.fs ansi.fs answords.fs \ 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 proxy.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 \ + unbuffer.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 \ - moofglos.fs + moofglos.fs \ + add.fs lib.fs sieve.fs unix/socket.fs COMPAT = compat/README \ compat/anslocal.fs \ @@ -248,7 +257,9 @@ ARCHS = \ arch/sparc/machine.h \ arch/power/machine.h \ arch/power/_sync_cache_range.c \ + arch/power/elf32ppc.x \ arch/alpha/machine.h \ + arch/ia64/machine.h \ arch/4stack/README \ arch/4stack/asm.fs \ arch/4stack/mach.fs \ @@ -284,7 +295,14 @@ ARCHS = \ arch/shboom/prim.fs \ arch/shboom/dis2.fs \ arch/shboom/sh.p \ - arch/shboom/doers.fs + arch/shboom/doers.fs \ + arch/sharc/mach.fs \ + arch/sharc/machine.h \ + arch/sharc/compile.sharc \ + arch/sharc/unistd.h \ + arch/sharc/systypes.h \ + arch/sharc/types.h \ + arch/sharc/g21k-3.3.4-bp1.diff SOURCES = $(CVSDIRS) compat Makefile.in Makedist.in engine/Makefile.in gforthmi.in \ configure.in configure config.sub config.guess elisp-comp missing \ @@ -300,13 +318,15 @@ SOURCES = $(CVSDIRS) compat Makefile.in engine/ansidecl.h engine/memmove.c \ engine/pow10.c engine/atanh.c engine/cleanalign.c \ engine/strerror.c engine/strsignal.c engine/dblsub.c \ + engine/fnmatch.h engine/fnmatch.c \ INSTALL.DOS makefile.dos engine/makefile.dos mkdosmf.sed config.bat \ dosconf.h gforthmi.bat mkinstalldirs siteinit.fs \ versions.bsh \ 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 @@ -393,8 +413,8 @@ distclean: clean doc/version.texi gforthmi #realclean is useless, but dangerous, so it's commented out -#realclean: distclean -# -$(RM) $(GEN_PRECIOUS) +realclean: distclean + -$(RM) $(GEN_PRECIOUS) #mostlyclean, but also remove some of the stuff that is distributed virtualclean: mostlyclean @@ -430,11 +450,13 @@ binonlydist: Makedist FORCE #strip gforth, because the debugging stuff is hardly useful once -# gforth manages to execute more than a few primitives +# gforth manages to execute more than a few primitives. #install does not depend on gforth.info, because that would require #supplying a lot of files that can be easily generated (only info is -#hard to generate) +#hard to generate). +#we rebuild gforth.fi, because it contains some path names. +#we delete $build/gforth.fi and $build/install.TAGS after installation because of ownership. 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 @@ -452,15 +474,16 @@ install: gforth$(EXE) $(FORTH_SRC) $(ker $(INSTALL_DATA) $(srcdir)/$$i $(datadir)/gforth/$(VERSION)/$$i; \ done $(INSTALL_DATA) $(kernel_fi) $(datadir)/gforth/$(VERSION) - $(RM) gforth.fi - 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 @if test -d "$(emacssitelispdir)"; then \ $(INSTALL_DATA) $(srcdir)/gforth.el $(emacssitelispdir); \ else \ echo ">>>>>Please install $(srcdir)/gforth.el in your .../emacs/site-lisp directory"; \ fi + -$(RM) gforth.fi + 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)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP) + $(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION) + $(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS + $(RM) gforth.fi install.TAGS @echo ">>>>> Please make an entry for Gforth in your info dir file; e.g.:"; \ echo "* Gforth: (gforth). A fast interpreter for the Forth language." @@ -473,22 +496,19 @@ installdirs: mkinstalldirs for i in $(CVSDIRS); do \ $(srcdir)/mkinstalldirs $(datadir)/gforth/$(VERSION)/`dirname $$i`; \ done - $(RM) -rf $(datadir)/gforth/$(VERSION)/arch $(datadir)/gforth/$(VERSION)/engine + $(RM) -rf $(datadir)/gforth/$(VERSION)/engine #deinstall all files specific to this version of gforth #to uninstall version foo, type `make uninstall VERSION=foo' uninstall: FORCE - -$(RM) -rf $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforthmi-$(VERSION) - @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" + -$(RM) -rf $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE) $(bindir)/gforthmi-$(VERSION) + @echo -e "To remove Gforth completely, type\n$(RM) -rf $(bindir)/gforth$(EXE) $(bindir)/gforth-fast$(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 \ + $(FORTH) code.fs test/checkans.fs -e bye | diff -c - $(srcdir)/test/checkans.out + $(FORTH) -m 100000 prims2x.fs -e \ "c-flag on s\" $(srcdir)/prim.b\" ' output-c process-file bye"| \ diff -c - $(srcdir)/engine/prim.i @@ -527,17 +547,15 @@ 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 +#SunOS make does not like that +#arch/%/mach.fs: arch/%/prim.fs arch/%/asm.fs kernl16b.fi: $(KERNLS) -$(CP) kernl16b.fi kernl16b.fi~ @@ -568,7 +586,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)" ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) $(STARTUP) # ------------- Make c-engine @@ -576,24 +594,24 @@ prim.b: prim m4 -s $(srcdir)/prim >$@ engine/prim.i: prim.b prims2x.fs - $(FORTHK) prims2x.fs -e "c-flag on s\" prim.b\" ' output-c process-file bye" >$@- + $(FORTH) -m 1000000 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 "c-flag on s\" prim.b\" ' output-label process-file bye" >$@- + $(FORTH) -m 1000000 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 "forth-flag on s\" prim.b\" ' output-alias process-file bye" >>$@- + $(FORTH) -m 1000000 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 "forth-flag on s\" prim.b\" ' output-forth process-file bye" >>$@- + $(FORTH) -m 1000000 prims2x.fs -e "forth-flag on s\" prim.b\" ' output-forth process-file bye" >>$@- $(CP) $@- $@ $(RM) $@- @@ -610,7 +628,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 @@ -630,30 +648,35 @@ TAGS: gforth.TAGS install.TAGS: gforth.TAGS sed 's:^\$(srcdir)/:$(datadir)/gforth/$(VERSION)/:' gforth.TAGS >install.TAGS -gforth.TAGS: @kernel_fi@ gforth $(GFORTH_FI_SRC) prim.TAGS - $(FORTHK) etags.fs startup.fs -e bye +gforth.TAGS: @kernel_fi@ gforth$(EXE) $(GFORTH_FI_SRC) prim.TAGS kernel.TAGS + $(FORTHK) etags.fs except.fs startup.fs -e bye cat TAGS prim.TAGS kernel.TAGS >gforth.TAGS rm TAGS prim.TAGS: prim.b prims2x.fs - $(FORTHK) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag process-file bye" >$@- + echo '2c\' >prim.TAGS.sed + echo $(srcdir)/prim >>prim.TAGS.sed + $(FORTH) -m 1000000 prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag process-file bye" | sed -f prim.TAGS.sed >$@- $(CP) $@- $@ $(RM) $@- +kernel.TAGS: + rm kernl16l.fi-; $(MAKE) @kernel_fi@ + 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 + $(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs except.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 doc/gforth.texi: doc/gforth.ds prim.b ds2texi.fs prims2x.fs \ doc/doc.fd doc/crossdoc.fd - $(FORTHK) -m 100000 ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc process-file" doc/crossdoc.fd doc/doc.fd -e "s\" $(srcdir)/doc/gforth.ds\" r/o open-file throw ds2texi bye" >$@- + $(FORTH) -m 100000 ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc process-file" doc/crossdoc.fd doc/doc.fd -e "s\" $(srcdir)/doc/gforth.ds\" r/o open-file throw ds2texi bye" >$@- $(CP) $@- $@ $(RM) $@- checkdoc: doc/gforth.ds prim.b ds2texi.fs prims2x.fs doc/doc.fd doc/crossdoc.fd answords.fs doc/gforth.texi - $(FORTHK) -m 1M ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc process-file" doc/crossdoc.fd doc/doc.fd answords.fs -e bye + $(FORTH) -m 1M ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc process-file" doc/crossdoc.fd doc/doc.fd answords.fs -e bye -grep unknown doc/gforth.texi dvi: doc/gforth.dvi @@ -669,19 +692,24 @@ info: doc/gforth.info doc/gforth.info doc/gforth.info-*: $(GFORTH_TEXI) -cd doc; $(MAKEINFO) gforth.texi +### need makeinfo 4.0 to generate html. Otherwise, use texi2html.. html: $(GFORTH_TEXI) -$(RMTREE) html -mkdir html - cd html; $(TEXI2HTML) -menu -split_node ../doc/gforth.texi + 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 html doc/gforth.ps 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