--- gforth/Makefile.in 2002/09/22 09:54:19 1.229 +++ gforth/Makefile.in 2002/12/28 17:18:26 1.238 @@ -30,7 +30,7 @@ # ------------- gforth version -VERSION = @VERSION@ +VERSION = @PACKAGE_VERSION@ DOSVERSION=`echo $(VERSION)|sed 's/\.//g'|sed 's/-.*//g'` # ------------- System specific variables @@ -170,7 +170,8 @@ KERN_SRC = \ kernel/saccept.fs \ kernel/doers.fs \ kernel/getdoers.fs \ - kernel/pass.fs + kernel/pass.fs \ + kernel/groups.fs EC_SRC = \ asm/README \ @@ -192,6 +193,7 @@ GFORTH_FI_SRC = \ blocked.fb \ blocks.fs \ bufio.fs \ + code.fs \ debug.fs \ debugs.fs \ ekey.fs \ @@ -228,7 +230,7 @@ GFORTH_FI_SRC = \ 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 httpd.fs proxy.fs \ @@ -238,7 +240,8 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) tt.fs sokoban.fs \ unbuffer.fs wordsets.fs \ test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs \ - test/string.fs test/other.fs test/signals.fs test/checkans.fs \ + test/string.fs test/float.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 \ moofglos.fs fixpath.fs \ @@ -332,14 +335,15 @@ VMGEN_EX2 = $(VMGEN_EX:vmgen-ex/%=vmgen- 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 \ + 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 peeprules.vmg engine/engine.c engine/main.c \ - engine/io.c engine/memcmpc.c engine/signals.c $(ARCHS) \ + engine/io.c engine/support.c engine/memcmpc.c engine/signals.c \ + $(ARCHS) \ engine/peephole.c 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 \ @@ -358,11 +362,14 @@ SOURCES = $(CVSDIRS) compat Makefile.in RCS_FILES = ToDo model high-level -GEN = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) gforth-prof$(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_GEN_ENGINE=engine/prim.i engine/prim_lab.i engine/prim_names.i engine/prim_superend.i engine/peephole.i engine/profile.i -FORTH_GEN0 = prim.b $(FORTH_GEN_ENGINE) 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/peephole.i engine/profile.i \ + engine/prim_num.i +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@ @@ -438,7 +445,7 @@ docclean: FORCE clean: mostlyclean -$(RM) -rf $(GEN) engine/gforth$(EXE) \ - engine/gforth-fast$(EXE) engine/gforth-itc$(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 @@ -542,8 +549,17 @@ uninstall: FORCE -$(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 test/string.fs -e bye | diff -c - $(srcdir)/test/coretest.out +check: gforths gforth.fi + make checkone ENGINE="./gforth --no-dynamic" &>/dev/null + make checkone ENGINE="./gforth-itc" &>/dev/null + make checkone ENGINE="./gforth-ditc" &>/dev/null + make checkone ENGINE="./gforth-fast --no-dynamic" &>/dev/null + make checkone ENGINE="./gforth" &>/dev/null + make checkone ENGINE="./gforth-fast" &>/dev/null + @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 -e bye | diff -c - $(srcdir)/test/coretest.out $(FORTH) test/other.fs -e bye $(FORTHS) test/signals.fs -e bye $(FORTH) code.fs test/checkans.fs -e bye | diff -c - $(srcdir)/test/checkans.out @@ -633,7 +649,7 @@ prim.b: prim peeprules.vmg m4 -s $(srcdir)/prim >$@ engine/prim.i: prim.b prims2x.fs - $(FORTHP) prims2x.fs -e "c-flag on s\" prim.i\" out-filename 2! s\" prim.b\" ' output-c ' output-c-combined 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) $@- @@ -679,8 +695,11 @@ kernel/prim.fs: prim.b prims2x.fs kernel $(CP) $@- $@ $(RM) $@- -prim-nums: prim.b prims2x.fs - $(FORTHP) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-prim-num dup process-file bye" >$@ +kernel/groups.fs: engine/prim_lab.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~ @@ -691,6 +710,10 @@ gforth-fast$(EXE): engines $(CP) engine/$@ $@ @GFORTHFAST_EXE@ +gforth-native$(EXE): engines + $(CP) engine/$@ $@ +#@GFORTHX_EXE@ + gforth-itc$(EXE): engines $(CP) engine/$@ $@ @GFORTHITC_EXE@ @@ -702,10 +725,10 @@ gforth-ditc$(EXE): engines gforth-prof$(EXE): engines $(CP) engine/$@ $@ -gforths: gforth$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) gforth-prof$(EXE) +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) + cd engine && $(MAKE) gforth$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) #gforth-prof$(EXE) gforth-native$(EXE) # ------------- additional C primitives @@ -818,28 +841,27 @@ doc: info doc/gforth doc/vmgen doc/gfor #Note: no target "$(srcdir)/configure", because that does not trigger #unless $(srcdir)!="." -configure: configure.in aclocal.m4 - cd $(srcdir) && autoconf +configure: configure.in aclocal.m4 + cd $(srcdir) && autoconf -aclocal.m4: acinclude.m4 configure.in +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 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_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