--- gforth/Makefile.in 2000/06/06 20:56:40 1.173 +++ gforth/Makefile.in 2000/09/14 19:16:23 1.186 @@ -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,7 +72,9 @@ 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) -STARTUP = -e 3 exboot.fs startup.fs +#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 -e DVI2PS = dvips -Z @@ -119,7 +121,7 @@ CVSDIRS = CVS engine/CVS kernel/CVS doc/ 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/sharc/CVS \ + arch/shboom/CVS arch/ia64/CVS INCLUDES = engine/forth.h engine/threaded.h engine/io.h @@ -175,7 +177,7 @@ EC_SRC = \ GFORTH_FI_SRC = \ assert.fs \ - backtrace.fs \ + backtrac.fs \ blocked.fb \ blocks.fs \ bufio.fs \ @@ -186,7 +188,7 @@ GFORTH_FI_SRC = \ environ.fs \ errors.fs \ exboot.fs \ - exceptions.fs \ + except.fs \ extend.fs \ float.fs \ glocals.fs \ @@ -207,9 +209,9 @@ 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 \ @@ -221,12 +223,13 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) more.fs other.fs prims2x.fs random.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 COMPAT = compat/README \ compat/anslocal.fs \ @@ -253,7 +256,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 \ @@ -289,14 +294,15 @@ ARCHS = \ arch/shboom/prim.fs \ arch/shboom/dis2.fs \ arch/shboom/sh.p \ - 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 + 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 \ @@ -312,6 +318,7 @@ 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 \ @@ -406,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 @@ -465,17 +472,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)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP) #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 \ 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) #gforth.fi contains some path names + $(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION) + $(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS + $(RM) gforth.fi install.TAGS #delete because of ownership @echo ">>>>> Please make an entry for Gforth in your info dir file; e.g.:"; \ echo "* Gforth: (gforth). A fast interpreter for the Forth language." @@ -488,7 +494,7 @@ 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' @@ -546,7 +552,8 @@ kernl-%.fi: arch/%/mach.fs $(KERN_SRC) k else $(CP) $@- $@; \ fi -arch/%/mach.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~ @@ -639,18 +646,20 @@ 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 exceptions.fs startup.fs -e bye +gforth.TAGS: @kernel_fi@ gforth$(EXE) $(GFORTH_FI_SRC) prim.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 + $(FORTHK) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag process-file bye" | sed -f prim.TAGS.sed >$@- $(CP) $@- $@ $(RM) $@- 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 exceptions.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 @@ -688,7 +697,7 @@ html: $(GFORTH_TEXI) doc/gforth.txt: $(GFORTH_TEXI) -cd doc; $(MAKEINFO) --no-headers --no-split gforth.texi >gforth.txt -doc: info doc/gforth.ps html doc/gforth.txt TAGS +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.