--- gforth/Makefile.in 2000/04/09 20:57:25 1.167 +++ gforth/Makefile.in 2000/07/15 19:58:46 1.180 @@ -72,12 +72,13 @@ 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 @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 @@ -118,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/shboom/CVS INCLUDES = engine/forth.h engine/threaded.h engine/io.h @@ -129,6 +130,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 \ @@ -182,6 +185,7 @@ GFORTH_FI_SRC = \ savesys.fs \ environ.fs \ errors.fs \ + exboot.fs \ exceptions.fs \ extend.fs \ float.fs \ @@ -203,9 +207,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 \ @@ -222,7 +226,8 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) 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 \ @@ -249,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 \ @@ -287,6 +293,14 @@ ARCHS = \ 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 + SOURCES = $(CVSDIRS) compat Makefile.in Makedist.in engine/Makefile.in gforthmi.in \ configure.in configure config.sub config.guess elisp-comp missing \ acconfig.h acinclude.m4 engine/config.h.in stamp-h.in \ @@ -301,6 +315,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 \ @@ -395,8 +410,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 @@ -437,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 @@ -455,10 +471,9 @@ install: gforth$(EXE) $(FORTH_SRC) $(ker 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 + 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); \ @@ -477,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' @@ -535,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~ @@ -566,7 +582,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 --die-on-signal -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 @@ -608,7 +624,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 @@ -629,7 +645,7 @@ 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 + $(FORTHK) etags.fs exceptions.fs startup.fs -e bye cat TAGS prim.TAGS kernel.TAGS >gforth.TAGS rm TAGS @@ -639,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 startup.fs code.fs objects.fs oof.fs moofglos.fs -e bye + $(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs exceptions.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 @@ -671,8 +687,8 @@ html: $(GFORTH_TEXI) -$(RMTREE) html -mkdir html ### 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 + 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