--- gforth/Makefile.in 2000/07/02 08:27:19 1.177 +++ gforth/Makefile.in 2000/08/26 13:29:47 1.182 @@ -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 @@ -119,7 +119,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 INCLUDES = engine/forth.h engine/threaded.h engine/io.h @@ -175,7 +175,7 @@ EC_SRC = \ GFORTH_FI_SRC = \ assert.fs \ - backtrace.fs \ + backtrac.fs \ blocked.fb \ blocks.fs \ bufio.fs \ @@ -186,7 +186,7 @@ GFORTH_FI_SRC = \ environ.fs \ errors.fs \ exboot.fs \ - exceptions.fs \ + except.fs \ extend.fs \ float.fs \ glocals.fs \ @@ -207,8 +207,9 @@ GFORTH_FI_SRC = \ vt100.fs \ vt100key.fs \ wordinfo.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/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 \ @@ -220,7 +221,7 @@ 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 \ @@ -253,6 +254,7 @@ ARCHS = \ arch/sparc/machine.h \ arch/power/machine.h \ arch/power/_sync_cache_range.c \ + arch/power/elf32ppc.x \ arch/alpha/machine.h \ arch/4stack/README \ arch/4stack/asm.fs \ @@ -289,14 +291,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 \ @@ -449,6 +452,7 @@ binonlydist: Makedist FORCE #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) +#gforth.fi and install.TAGS is rm'ed after installing 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 @@ -470,7 +474,6 @@ 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)" ./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); \ @@ -489,7 +492,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' @@ -547,7 +550,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~ @@ -640,8 +644,8 @@ 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 @@ -651,7 +655,7 @@ prim.TAGS: prim.b prims2x.fs $(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 @@ -689,7 +693,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.