--- gforth/Makefile.in 1998/12/25 22:50:47 1.140 +++ gforth/Makefile.in 2003/01/27 22:00:10 1.251 @@ -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' @@ -30,14 +30,14 @@ # ------------- gforth version -VERSION = @VERSION@ -DOSVERSION=`echo $(VERSION)|sed 's/\.//g'` +VERSION = @PACKAGE_VERSION@ +DOSVERSION=`echo $(VERSION)|sed 's/\.//g'|sed 's/-.*//g'` # ------------- System specific variables machine=@machine@ kernel_fi=@kernel_fi@ -EXE=@EXE@ +EXE=@EXEEXT@ # this is the type of machine # used to extend the include path with ./arch/$machine @@ -53,7 +53,7 @@ osclass = @OSCLASS@ SHELL = /bin/sh RM = rm RMTREE = rm -rf -CP = cp +CP = cp -p MV = mv TAR = tar cf - INSTALL = @INSTALL@ @@ -62,18 +62,35 @@ INSTALL_DATA = @INSTALL_DATA@ LN_S = @LN_S@ GCC = @CC@ CC = $(GCC) -FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(datadir)/gforth/site-forth$(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 = ./gforth --die-on-signal -p $(FORTHPATH)$(PATHSEP)$(srcdir) +FORTHS_ARGS = -p $(FORTHPATH)$(PATHSEP)$(srcdir) +FORTH_ARGS = --die-on-signal $(FORTHS_ARGS) +ENGINE = ./gforth +FORTH = $(ENGINE) $(FORTH_ARGS) +FORTHS = $(ENGINE) $(FORTHS_ARGS) +# the (existing) forth system to use for cross compiling and primitives tables +# per default we use the one in this directory for a rebuild. It is also +# possible to override this variable at the command line for an initial build (jaw) +BUILDFORTH = $(ENGINE) --die-on-signal -m 4M -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi) +# the forth system plus flags we use to build +FORTHB = $(BUILDFORTH) -e 'fpath= .|~+|$(srcdir)' +# the Forth system for running prims2x.fs +FORTHP = $(FORTH) +ENGINE_FAST = $(ENGINE)-fast +FORTH_FAST = $(ENGINE_FAST) $(FORTH_ARGS) FORTHKFLAGS= --die-on-signal -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi) -FORTHK = ./gforth $(FORTHKFLAGS) -FORTHP = ./gforth --die-on-signal -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 @@ -82,7 +99,7 @@ XDEFINES = @DEFS@ SWITCHES = $(XCFLAGS) $(XDEFINES) #-DNDEBUG #turn off assertions ENGINE_FLAGS = @ENGINE_FLAGS@ -fno-defer-pop -fcaller-saves DEBUGFLAG = @DEBUGFLAG@ -CFLAGS = $(DEBUGFLAG) -I$(srcdir)/engine -I$(srcdir)/arch/$(machine) -O4 -Wall $(SWITCHES) -DDEFAULTPATH=\"$(FORTHPATH)\" +CFLAGS = $(DEBUGFLAG) -I$(srcdir)/engine -I$(srcdir)/arch/$(machine) -O3 -Wall $(SWITCHES) -DDEFAULTPATH=\"$(FORTHPATH)\" #John Wavrik should use -Xlinker -N to get a writable text (executable) XLDFLAGS = @LDFLAGS@ @@ -106,22 +123,27 @@ man1dir= $(mandir)/man1 man1ext= .1 #older emacses have their site-lisp in $(libdir)/emacs/ 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 KERN_SRC = \ + mach16b.fs mach16l.fs mach32b.fs mach32l.fs mach64b.fs mach64l.fs \ + machpc.fs.in \ kernel/aliases0.fs \ kernel/aliases.fs \ kernel/args.fs \ chains.fs \ + kernel/cbr.fs \ + kernel/cloop.fs \ kernel/cond.fs \ kernel/cond-old.fs \ cross.fs \ @@ -133,7 +155,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 \ @@ -142,11 +164,14 @@ 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 \ + kernel/groups.fs EC_SRC = \ asm/README \ @@ -157,23 +182,26 @@ 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 \ + backtrac.fs \ blocked.fb \ blocks.fs \ bufio.fs \ + code.fs \ debug.fs \ debugs.fs \ + ekey.fs \ savesys.fs \ environ.fs \ errors.fs \ + exboot.fs \ + except.fs \ extend.fs \ float.fs \ glocals.fs \ @@ -182,9 +210,11 @@ GFORTH_FI_SRC = \ intcomp.fs \ locals.fs \ look.fs \ + quotes.fs \ search.fs \ see.fs \ see-ext.fs \ + simp-see.fs \ source.fs \ startup.fs \ struct.fs \ @@ -194,26 +224,28 @@ 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 \ + 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 \ - mach16b.fs mach16l.fs mach32b.fs mach32l.fs mach64b.fs mach64l.fs \ - machpc.fs more.fs other.fs prims2x.fs random.fs \ - siteinit.fs table.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 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 \ + test/string.fs test/float.fs test/gforth.fs \ + test/other.fs test/signals.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 + oof.fs oofsampl.fs objects.fs objexamp.fs mini-oof.fs moof-exm.fs \ + moofglos.fs fixpath.fs \ + add.fs lib.fs sieve.fs unix/socket.fs COMPAT = compat/README \ compat/anslocal.fs \ @@ -223,11 +255,14 @@ COMPAT = compat/README \ compat/exception.fs \ compat/loops.fs \ compat/required.fs \ + compat/strcomp.fs \ compat/struct.fs \ compat/vocabulary.fs GFORTH_TEXI = doc/gforth.texi doc/version.texi +VMGEN_TEXI = doc/vmgen.texi doc/version.texi doc/fdl.texi + ALLSUBDIRS = engine ARCHS = \ @@ -240,7 +275,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 \ @@ -276,40 +313,71 @@ 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 + +VMGEN_EX = vmgen-ex/CVS vmgen-ex/Makefile vmgen-ex/README vmgen-ex/disasm.c \ + vmgen-ex/engine.c vmgen-ex/fib.mini \ + vmgen-ex/mini-inst.vmg vmgen-ex/mini-super.vmg vmgen-ex/mini.h \ + vmgen-ex/mini.l vmgen-ex/mini.y vmgen-ex/peephole-blacklist \ + vmgen-ex/peephole.c vmgen-ex/profile.c vmgen-ex/seq2rule.awk \ + vmgen-ex/simple.mini vmgen-ex/stat.awk vmgen-ex/support.c \ + vmgen-ex/test.mini vmgen-ex/test.out + +VMGEN_EX2 = $(VMGEN_EX:vmgen-ex/%=vmgen-ex2/%) -SOURCES = $(CVSDIRS) compat Makefile.in Makedist.in engine/Makefile.in gforthmi.in \ +SOURCES = $(CVSDIRS) compat Makefile.in Makedist.in engine/Makefile.in \ + gforthmi.in vmgen.in README.vmgen NEWS.vmgen \ configure.in configure config.sub config.guess elisp-comp missing \ - acconfig.h acinclude.m4 engine/config.h.in stamp-h.in \ - install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS model \ - COPYING AUTHORS ChangeLog Benchres aclocal.m4 \ + engine/config.h.in stamp-h.in \ + iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS model \ + COPYING COPYING.DOC AUTHORS ChangeLog Benchres aclocal.m4 \ doc/gforth.ds doc/texinfo.tex doc/gforth.1 doc/version.texi.in \ + doc/vmgen.texi doc/fdl.texi \ gforth.el \ - prim engine/engine.c engine/main.c engine/io.c engine/memcmpc.c \ + prim peeprules.vmg engine/engine.c engine/main.c \ + engine/io.c engine/support.c engine/signals.c \ $(ARCHS) \ + engine/profile.c \ engine/getopt.c engine/getopt1.c engine/getopt.h engine/select.c \ engine/ecvt.c engine/memcmp.c engine/strtol.c engine/strtoul.c \ 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 \ + 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 + $(INCLUDES) $(FORTH_SRC) $(COMPAT) $(VMGEN_EX) $(VMGEN_EX2) \ + timings.sc \ + test/coretest.out test/checkans.out RCS_FILES = ToDo model high-level -GEN = gforth$(EXE) gforth-ditc$(EXE) kernel/version.fs +GEN = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) kernel/version.fs +#gforth-native$(EXE) gforth-prof$(EXE) # things that need a working forth system to be generated -FORTH_GEN0 = prim.b engine/prim.i engine/prim_lab.i kernel/aliases.fs kernel/prim.fs +FORTH_GEN_ENGINE=engine/prim.i engine/prim_lab.i engine/prim_names.i \ + engine/prim_superend.i engine/profile.i \ + engine/prim_num.i engine/prim_grp.i \ + engine/config.h +FORTH_GEN0 = prim.b $(FORTH_GEN_ENGINE) kernel/aliases.fs kernel/prim.fs kernel/groups.fs FORTH_GEN = $(FORTH_GEN0) @KERNEL@ gforth.fi # this is used for antidependences, FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ +#kernel dependencies +KERN_DEPS = $(KERN_SRC) kernel/version.fs machpc.fs $(FORTH_GEN0) compat/strcomp.fs + #distributed documentation DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.ps @@ -317,7 +385,10 @@ KERNLS = kernl16b.fi- kernl16l.fi- \ kernl32b.fi- kernl32l.fi- \ kernl64b.fi- kernl64l.fi- -GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) doc/gforth.texi doc/gforth.dvi doc/gforth.ps Makefile Makedist engine/Makefile configure +GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) \ + doc/gforth.texi doc/gforth.dvi doc/gforth.ps \ + doc/vmgen.dvi doc/vmgen.ps \ + Makefile Makedist engine/Makefile configure #standards.info recommends this: .SUFFIXES: @@ -330,7 +401,7 @@ all: kernel/version.fs more FORCE: ; #this rule avoids remaking everything after minor changes in Makefile.in -version: Makefile.in +version: Makefile.in configure.in if test -r $@ && test x'$(VERSION)' = x`cat $@` ; then true ; else echo $(VERSION) > $@ ; fi # With dos we use normal dos echo @@ -342,7 +413,7 @@ kernel/version.fs: version $(MAKE) gforth$(EXE) echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs -more: engine $(FORTH_GEN) gforth$(EXE) +more: engines $(FORTH_GEN) $(GEN) #from the gcc Makefile: #"Deletion of files made during compilation. @@ -365,19 +436,29 @@ mostlyclean: FORCE doc/gforth.toc doc/gforth.tp doc/gforth.vr html \ gforth-$(VERSION).tar.gz +# Just the stuff needed to rebuild the documentation nac03feb1999 +docclean: FORCE + -$(RM) -rf doc/crossdoc.fd doc/doc.fd doc/gforth.texi doc/gforth.fns \ + doc/gforth.aux doc/gforth.cp doc/gforth.cps \ + doc/gforth.dvi doc/gforth.fn doc/gforth.ky doc/gforth.log \ + doc/gforth.pg \ + doc/gforth.toc doc/gforth.tp doc/gforth.vr html + clean: mostlyclean - -$(RM) -rf $(GEN) engine/gforth$(EXE) engine/gforth-ditc$(EXE) \ + -$(RM) -rf $(GEN) engine/gforth$(EXE) \ + engine/gforth-fast$(EXE) engine/gforth-native$(EXE) engine/gforth-itc$(EXE) \ + engine/gforth-ditc$(EXE) engine/gforth-prof$(EXE) \ *.o engine/*.o arch/*/*.o version distclean: clean -$(RM) config.cache config.log config.status \ engine/config.h Makefile Makedist engine/Makefile \ stamp-h engine/stamp-h \ - doc/version.texi gforthmi + doc/version.texi gforthmi vmgen #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 @@ -413,70 +494,110 @@ 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) -install: gforth$(EXE) $(FORTH_SRC) $(kernel_fi) gforth.fi gforthmi doc/gforth.1 prim install.TAGS installdirs - touch $(datadir)/gforth/site-forth/siteinit.fs - -$(RM) $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforthmi +#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 vmgen doc/gforth.1 prim install.TAGS installdirs + touch $(siteforthdir)/siteinit.fs + -$(RM) $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforthmi $(bindir)/vmgen + -$(RM) $(bindir)/gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE) $(INSTALL_PROGRAM) -s gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) - $(LN_S) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforth$(EXE) + (cd $(bindir) && $(LN_S) gforth-$(VERSION)$(EXE) gforth$(EXE)) + $(INSTALL_PROGRAM) -s gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE) + (cd $(bindir) && $(LN_S) gforth-fast-$(VERSION)$(EXE) gforth-fast$(EXE)) $(INSTALL_PROGRAM) gforthmi $(bindir)/gforthmi-$(VERSION) - $(LN_S) $(bindir)/gforthmi-$(VERSION) $(bindir)/gforthmi + $(INSTALL_PROGRAM) vmgen $(bindir)/vmgen-$(VERSION) + $(INSTALL_PROGRAM) gforth-ditc $(libdir)/gforth/$(VERSION) + (cd $(bindir) && $(LN_S) gforthmi-$(VERSION) gforthmi) + (cd $(bindir) && $(LN_S) vmgen-$(VERSION) vmgen) -$(INSTALL_DATA) $(srcdir)/doc/gforth.1 $(man1dir) -for i in $(srcdir)/doc/gforth.info*; do $(INSTALL_DATA) $$i $(infodir); done for i in $(FORTH_SRC) $(COMPAT) prim; do \ $(INSTALL_DATA) $(srcdir)/$$i $(datadir)/gforth/$(VERSION)/$$i; \ done $(INSTALL_DATA) $(kernel_fi) $(datadir)/gforth/$(VERSION) - $(RM) gforth.fi - GFORTHD="./gforth-ditc -p$(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." install-strip: install installdirs: mkinstalldirs - $(srcdir)/mkinstalldirs $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(datadir)/gforth/site-forth + for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir); do \ + $(srcdir)/mkinstalldirs $$i; \ + done 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) (bindir)/vmgen-$(VERSION) + @echo -e "To remove Gforth completely, type\n$(RM) -rf $(bindir)/gforth$(EXE) $(bindir)/gforth-fast$(EXE) $(bindir)/gforthmi $(bindir)/vmgen $(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 +check: gforths gforth.fi + $(MAKE) checkone ENGINE="./gforth --no-dynamic" >/dev/null 2>&1 + $(MAKE) checkone ENGINE="./gforth-itc" >/dev/null 2>&1 + $(MAKE) checkone ENGINE="./gforth-ditc" >/dev/null 2>&1 + $(MAKE) checkone ENGINE="./gforth-fast --no-dynamic" >/dev/null 2>&1 + $(MAKE) checkone ENGINE="./gforth" >/dev/null 2>&1 + $(MAKE) checkone ENGINE="./gforth-fast" >/dev/null 2>&1 + @echo "*** Check successful ***" + +checkone test: gforth$(EXE) gforth.fi + $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs test/float.fs test/gforth.fs -e bye | tr -d '\015' | 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 "s\" $(srcdir)/prim.b\"' output-c process-file bye"| diff -c - $(srcdir)/engine/prim.i + $(FORTHS) test/signals.fs -e bye + $(FORTH) code.fs test/checkans.fs -e bye | tr -d '\015' | diff -c - $(srcdir)/test/checkans.out + $(FORTH) prims2x.fs -e \ + "c-flag on s\" prim.i\" out-filename 2! s\" $(srcdir)/prim.b\" ' output-c ' output-c-combined process-file bye"| \ + tr -d '\015' | diff -c - $(srcdir)/engine/prim.i -bench: gforth$(EXE) gforth.fi +bench: gforth-fast$(EXE) gforth.fi @echo 'Each benchmark takes about 30s on a 486-66 (gcc-2.6.3 -DFORCE_REG)' - time $(FORTH) siev.fs -e "main bye" - time $(FORTH) bubble.fs -e "main bye" - time $(FORTH) -m 160000 matrix.fs -e "main bye" - time $(FORTH) fib.fs -e "main bye" + time $(FORTH_FAST) siev.fs -e "main bye" + time $(FORTH_FAST) bubble.fs -e "main bye" + time $(FORTH_FAST) matrix.fs -e "main bye" + time $(FORTH_FAST) fib.fs -e "main bye" + +onebench: + @\time -f "siev %U" $(FORTH_FAST) siev.fs -e "main bye" + @\time -f "bubble %U" $(FORTH_FAST) -e "warnings off" bubble.fs -e "main bye" + @\time -f "matrix %U" $(FORTH_FAST) matrix.fs -e "main bye" + @\time -f "fib %U" $(FORTH_FAST) fib.fs -e "main bye" + +all-bench: gforth-fast$(EXE) gforth$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) gforth.fi + @echo "*** gforth-fast dynamic:" + @$(MAKE) onebench ENGINE_FAST="gforth-fast --dynamic" + @echo "*** gforth-fast not dynamic:" + @$(MAKE) onebench ENGINE_FAST="gforth-fast --no-dynamic" + @echo "*** gforth dynamic:" + @$(MAKE) onebench ENGINE_FAST="gforth --dynamic" + @echo "*** gforth not dynamic:" + @$(MAKE) onebench ENGINE_FAST="gforth --no-dynamic" + @echo "*** gforth-itc:" + @$(MAKE) onebench ENGINE_FAST=gforth-itc + @echo "*** gforth-ditc:" + @$(MAKE) onebench ENGINE_FAST=gforth-ditc # ------------- Make forth images -# Hot to make new images: +# How to make new images: # 1. Produce an image called kernlXYZ.fi- # the original kernel.fi is not touched because it's needed for creation # 2. copy old kernlXYZ.fi to kernlXYZ.fi~ @@ -484,35 +605,33 @@ bench: gforth$(EXE) gforth.fi # 3. copy new kernels to kernlXYZ.fi # these are the ones we want to use now -kernl16l.fi-: $(KERN_SRC) kernel/version.fs mach16l.fs $(FORTH_GEN0) - $(FORTHK) -e 's" mach16l.fs"' kernel/main.fs -e "save-cross kernl16l.fi- $(bindir)/gforth-$(VERSION) bye" +kernl16l.fi-: $(KERN_DEPS) mach16l.fs + $(FORTHB) -e 's" mach16l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16l.fi- $(bindir)/gforth-$(VERSION) bye" -kernl16b.fi-: $(KERN_SRC) kernel/version.fs mach16b.fs $(FORTH_GEN0) - $(FORTHK) -e 's" mach16b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16b.fi- $(bindir)/gforth-$(VERSION) bye" +kernl16b.fi-: $(KERN_DEPS) mach16b.fs + $(FORTHB) -e 's" mach16b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16b.fi- $(bindir)/gforth-$(VERSION) bye" -kernl32l.fi-: $(KERN_SRC) kernel/version.fs mach32l.fs $(FORTH_GEN0) - $(FORTHK) -e 's" mach32l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl32l.fi- $(bindir)/gforth-$(VERSION) bye" +kernl32l.fi-: $(KERN_DEPS) mach32l.fs + $(FORTHB) -e 's" mach32l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl32l.fi- $(bindir)/gforth-$(VERSION) bye" -kernl32b.fi-: $(KERN_SRC) kernel/version.fs mach32b.fs $(FORTH_GEN0) - $(FORTHK) -e 's" mach32b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl32b.fi- $(bindir)/gforth-$(VERSION) bye" +kernl32b.fi-: $(KERN_DEPS) mach32b.fs + $(FORTHB) -e 's" mach32b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl32b.fi- $(bindir)/gforth-$(VERSION) bye" -kernl64l.fi-: $(KERN_SRC) kernel/version.fs mach64l.fs $(FORTH_GEN0) - $(FORTHK) -e 's" mach64l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64l.fi- $(bindir)/gforth-$(VERSION) bye" +kernl64l.fi-: $(KERN_DEPS) mach64l.fs + $(FORTHB) -e 's" mach64l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64l.fi- $(bindir)/gforth-$(VERSION) bye" -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" +kernl64b.fi-: $(KERN_DEPS) mach64b.fs + $(FORTHB) -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) - $(FORTHK) -e 's" $<"' $(srcdir)/kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye" +kernl-%.fi: arch/%/mach.fs arch/%/prim.fs arch/%/asm.fs $(KERN_SRC) kernel/version.fs $(FORTH_GEN0) + $(FORTHB) -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~ @@ -542,47 +661,100 @@ kernl64l.fi: $(KERNLS) # -$(CP) $@ $@~ # -$(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 +gforth.fi: $(kernel_fi) gforthmi gforth$(EXE) gforth-ditc$(EXE) $(GFORTH_FI_SRC) comp-i.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 -prim.b: prim +prim.b: prim peeprules.vmg m4 -s $(srcdir)/prim >$@ engine/prim.i: prim.b prims2x.fs - $(FORTHK) prims2x.fs -e "s\" prim.b\" ' output-c process-file bye" >$@- + $(FORTHP) prims2x.fs -e "c-flag on s\" prim.i\" save-mem out-filename 2! s\" prim.b\" ' output-c ' output-c-combined process-file bye" >$@- $(CP) $@- $@ $(RM) $@- engine/prim_lab.i: prim.b prims2x.fs - $(FORTHK) prims2x.fs -e "s\" prim.b\" ' output-label process-file bye" >$@- + $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-label dup process-file bye" >$@- + $(CP) $@- $@ + $(RM) $@- + +engine/prim_grp.i: prim.b prims2x.fs + $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' noop dup process-file bye" >$@- + $(CP) $@- $@ + $(RM) $@- + +engine/prim_names.i: prim.b prims2x.fs + $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-forthname dup process-file bye" >$@- + $(CP) $@- $@ + $(RM) $@- + +engine/prim_superend.i: prim.b prims2x.fs + $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-superend dup process-file bye" >$@- + $(CP) $@- $@ + $(RM) $@- + +engine/peephole.i: prim.b prims2x.fs + $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' noop ' output-peephole process-file bye" >$@- + $(CP) $@- $@ + $(RM) $@- + +engine/profile.i: prim.b prims2x.fs + $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-profile ' output-profile-combined process-file bye" >$@- + $(CP) $@- $@ + $(RM) $@- + +engine/costs.i: prim.b prims2x.fs + $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-costs dup process-file bye" >$@- $(CP) $@- $@ $(RM) $@- kernel/aliases.fs: prim.b prims2x.fs kernel/aliases0.fs $(CP) kernel/aliases0.fs $@- - $(FORTHK) prims2x.fs -e "s\" prim.b\" ' output-alias process-file bye" >>$@- + $(FORTHP) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-alias dup 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 "s\" prim.b\" ' output-forth process-file bye" >>$@- + $(FORTHP) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-forth ' output-forth-combined process-file bye" >>$@- $(CP) $@- $@ $(RM) $@- +kernel/groups.fs: engine/prim_grp.i + grep GROUP $< | cut -f2 -d, | sed -e 's/)/ ,/g' >$@ + +engine/prim_num.i: prim.b prims2x.fs + $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-c-prim-num ' noop process-file bye" >$@ + gforth$(EXE): engines -$(CP) gforth$(EXE) gforth~ $(CP) engine/$@ $@ @GFORTH_EXE@ +gforth-fast$(EXE): engines + $(CP) engine/$@ $@ + @GFORTHFAST_EXE@ + +gforth-native$(EXE): engines + $(CP) engine/$@ $@ +#@GFORTHX_EXE@ + +gforth-itc$(EXE): engines + $(CP) engine/$@ $@ + @GFORTHITC_EXE@ + gforth-ditc$(EXE): engines $(CP) engine/$@ $@ @GFORTHDITC_EXE@ -engines: FORCE - cd engine && $(MAKE) gforth$(EXE) gforth-ditc$(EXE) +gforth-prof$(EXE): engines + $(CP) engine/$@ $@ + +gforths: gforth$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) #gforth-prof$(EXE) gforth-native$(EXE) + +engines: FORCE $(FORTH_GEN_ENGINE) engine/Makefile + cd engine && $(MAKE) gforth$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) #gforth-prof$(EXE) gforth-native$(EXE) # ------------- additional C primitives @@ -598,82 +770,124 @@ engines: FORCE TAGS: gforth.TAGS $(CP) gforth.TAGS $@ +tags: gforth.tags + $(CP) 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 +gforth.tags: @kernel_fi@ gforth$(EXE) $(GFORTH_FI_SRC) prim.tags kernel.tags + $(FORTHK) tags.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 + #$(FORTHP) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag dup process-file bye" | sed -f prim.TAGS.sed >$@- + $(FORTHP) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag dup process-file bye" >$@- + $(CP) $@- $@ + $(RM) $@- + +prim.tags: prim.b prims2x.fs + #echo '2c\' >prim.TAGS.sed + #echo $(srcdir)/prim >>prim.TAGS.sed + #$(FORTHP) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag dup process-file bye" | sed -f prim.TAGS.sed >$@- + $(FORTHP) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-vi-tag dup process-file bye" >$@- $(CP) $@- $@ $(RM) $@- -doc/doc.fd: doc/makedoc.fs $(GFORTH_FI_SRC) code.fs objects.fs oof.fs mini-oof.fs - $(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs startup.fs code.fs objects.fs oof.fs mini-oof.fs -e bye +kernel.TAGS: + rm kernl16l.fi-; $(MAKE) @kernel_fi@ + +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 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" >$@- + $(FORTHP) ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc ' noop 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) ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc ' noop process-file" doc/crossdoc.fd doc/doc.fd answords.fs -e bye -grep unknown doc/gforth.texi -dvi: doc/gforth.dvi +dvi: doc/gforth.dvi doc/vmgen.dvi doc/gforth.dvi doc/gforth.fns: $(GFORTH_TEXI) cd doc; $(TEXI2DVI) gforth.texi +doc/vmgen.dvi: $(VMGEN_TEXI) + cd doc; $(TEXI2DVI) vmgen.texi + doc/gforth.ps: doc/gforth.dvi $(DVI2PS) doc/gforth.dvi -o $@ -info: doc/gforth.info +doc/vmgen.ps: doc/vmgen.dvi + $(DVI2PS) doc/vmgen.dvi -o $@ + +info: doc/gforth.info doc/vmgen.info + +doc/gforth.info: $(GFORTH_TEXI) + cd doc; $(MAKEINFO) gforth.texi + +doc/vmgen.info: $(VMGEN_TEXI) + cd doc; $(MAKEINFO) vmgen.texi -doc/gforth.info doc/gforth.info-*: $(GFORTH_TEXI) - -cd doc; $(MAKEINFO) gforth.texi -html: $(GFORTH_TEXI) - -$(RMTREE) html - -mkdir html - cd html; $(TEXI2HTML) -menu -split_node ../doc/gforth.texi +### need makeinfo 4.2 to generate html with these rules +doc/gforth: $(GFORTH_TEXI) + cd doc; $(MAKEINFO) --html gforth.texi + +doc/vmgen: $(VMGEN_TEXI) + cd doc; $(MAKEINFO) --html vmgen.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/vmgen.txt: $(VMGEN_TEXI) + -cd doc; $(MAKEINFO) --no-headers --no-split vmgen.texi >vmgen.txt + +doc: info doc/gforth doc/vmgen doc/gforth.ps doc/vmgen.ps doc/gforth.txt doc/vmgen.txt TAGS # For an explanation of the following Makefile rules, see node # `Automatic Remaking' in GNU Autoconf documentation. -$(srcdir)/configure: configure.in aclocal.m4 - cd $(srcdir) && autoconf -aclocal.m4: acinclude.m4 configure.in +#Note: no target "$(srcdir)/configure", because that does not trigger +#unless $(srcdir)!="." +configure: configure.in aclocal.m4 + cd $(srcdir) && autoconf + +aclocal.m4: configure.in aclocal # autoheader might not change config.h.in, so touch a stamp file. -engine/config.h.in: stamp-h.in -stamp-h.in: configure.in acconfig.h - cd $(srcdir) && autoheader - echo timestamp > $(srcdir)/stamp-h.in - -engine/config.h: stamp-h -stamp-h: engine/config.h.in config.status - CONFIG_FILES=$@ CONFIG_HEADERS=engine/config.h ./config.status - echo timestamp > stamp-h +engine/config.h.in: stamp-h.in +stamp-h.in: configure.in aclocal.m4 + cd $(srcdir) && autoheader + echo timestamp > $(srcdir)/stamp-h.in + +engine/config.h: stamp-h +stamp-h: engine/config.h.in config.status + ./config.status -Makefile Makedist engine/Makefile gforthmi: Makefile.in Makedist.in engine/Makefile.in gforthmi.in config.status - CONFIG_FILES="$@" CONFIG_HEADERS=engine/config.h ./config.status +Makedist engine/Makefile gforthmi vmgen machpc.fs doc/version.texi: Makefile.in Makedist.in engine/Makefile.in gforthmi.in vmgen.in machpc.fs.in doc/version.texi.in config.status configure.in + ./config.status -config.status: configure - ./config.status --recheck +config.status: configure + ./config.status --recheck #create files for DOS, because DOS cannot do it itself