--- gforth/Makefile.in 1996/11/04 22:58:43 1.74 +++ gforth/Makefile.in 1997/02/06 21:22:56 1.82 @@ -23,8 +23,12 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. -VERSION =0.2.0#gforth version -DOSVERSION=020#gforth version +#gforth version +VERSION_MAJOR=0 +VERSION_MINOR=2 +VERSION_RELEASE=9 +VERSION =$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE) +DOSVERSION=$(VERSION_MAJOR)$(VERSION_MINOR)$(VERSION_RELEASE) SHELL = /bin/sh RM = rm RMTREE = rm -rf @@ -33,7 +37,6 @@ TAR = tar cf - INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -INSTALL_DIR = $(srcdir)/install-sh -d LN_S = @LN_S@ GCC = @CC@ CC = $(GCC) @@ -81,11 +84,12 @@ emacssitelispdir=$(datadir)/emacs/site-l INCLUDES = forth.h threading.h io.h KERN_SRC = \ - add.fs \ + aliases0.fs \ aliases.fs \ + conditionals.fs \ cross.fs \ errore.fs \ - extend.fs \ + files.fs \ kernel.fs \ main.fs \ search-order.fs \ @@ -103,6 +107,8 @@ GFORTH_FI_SRC = \ debugging.fs \ dumpimage.fs \ environ.fs \ + errors.fs \ + extend.fs \ float.fs \ glocals.fs \ hash.fs \ @@ -122,7 +128,7 @@ GFORTH_FI_SRC = \ wordinfo.fs FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) \ - ansi.fs answords.fs \ + ans-report.fs ansi.fs answords.fs \ checkans.fs \ code.fs colorize.fs \ doskey.fs ds2texi.fs \ @@ -137,7 +143,7 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) wordsets.fs \ tester.fs coretest.fs postponetest.fs dbltest.fs \ bubble.fs siev.fs matrix.fs fib.fs \ - oof.fs oofsampl.fs + oof.fs oofsampl.fs objects.fs SOURCES = CVS compat Makefile.in configure.in configure config.sub config.guess \ acconfig.h config.h.in stamp-h.in \ @@ -186,10 +192,14 @@ GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) gf all: version.fs more -version.h: Makefile.in +#this rule avoids remaking everything after minor changes in Makefile.in +version-stamp: Makefile.in + test x'$(VERSION)' = x`cat $@` || echo $(VERSION) >$@ + +version.h: version-stamp echo "static char gforth_version[]=\"$(VERSION)\" ;" >$@ -version.fs: Makefile.in +version.fs: version-stamp $(MAKE) gforth echo ": version-string s\" $(VERSION)\" ;" >$@ @@ -294,22 +304,19 @@ binonlydist: $(SOURCES) $(FORTH_GEN0) @K #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 $(FORTH_SRC) kernel.fi gforth.fi gforth.1 primitives gforth.TAGS - for i in $(bindir) $(mandir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(datadir)/gforth/site-forth; do \ - $(INSTALL_DIR) $$i; \ - done +install: gforth $(FORTH_SRC) kernel.fi gforth.fi gforth.1 primitives gforth.TAGS installdirs touch $(datadir)/gforth/site-forth/site-init.fs -$(RM) $(bindir)/gforth $(bindir)/gforth-$(VERSION) $(INSTALL_PROGRAM) -s gforth $(bindir) ln $(bindir)/gforth $(bindir)/gforth-$(VERSION) - $(INSTALL_DATA) $(srcdir)/gforth.1 $(mandir) + $(INSTALL_DATA) $(srcdir)/gforth.1 $(man1dir) for i in $(srcdir)/gforth.info*; do $(INSTALL_DATA) $$i $(infodir); done for i in $(FORTH_SRC) primitives; do \ $(INSTALL_DATA) $(srcdir)/$$i $(datadir)/gforth/$(VERSION); \ done $(INSTALL_DATA) kernel.fi $(libdir)/gforth/$(VERSION) - $(FORTHP) $(FORTHSIZES) startup.fs -e "savesystem $(libdir)/gforth/$(VERSION)/gforth.fi bye" #gforth.fi contains some path names - sed s:$(srcdir)/:$(datadir)/gforth/$(VERSION)/: gforth.TAGS >TAGS; $(INSTALL_DATA) TAGS $(datadir)/gforth/$(VERSION) + $(RM) gforth.fi; $(MAKE) gforth.fi #gforth.fi contains some path names + sed s:^$(srcdir)/:$(datadir)/gforth/$(VERSION)/: gforth.TAGS >TAGS; $(INSTALL_DATA) TAGS $(datadir)/gforth/$(VERSION) if test -d $(emacssitelispdir); then \ $(INSTALL_DATA) $(srcdir)/gforth.el $(emacssitelispdir); \ else \ @@ -320,17 +327,20 @@ install: gforth $(FORTH_SRC) kernel.fi g install-strip: install +installdirs: mkinstalldirs + $(srcdir)/mkinstalldirs $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(datadir)/gforth/site-forth + #deinstall all files specific to this version of gforth #to uninstall version foo, type `make uninstall VERSION=foo' uninstall: -$(RM) -rf $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(bindir)/gforth-$(VERSION) - @echo -e "Type\n$(RM) -rf $(bindir)/gforth $(mandir)/gforth.1 $(infodir)/gforth.info* $(datadir)/gforth $(libdir)/gforth\nto remove Gforth completely" + @echo -e "Type\n$(RM) -rf $(bindir)/gforth $(man1dir)/gforth.1 $(infodir)/gforth.info* $(datadir)/gforth $(libdir)/gforth\nto remove Gforth completely" check test: gforth gforth.fi $(FORTH) tester.fs coretest.fs postponetest.fs dbltest.fs -e bye $(FORTH) code.fs checkans.fs -e bye @echo 'Expect no differences' - $(FORTH) prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' output-c process-file bye"| diff -c - $(srcdir)/primitives.i + $(FORTH) -m 100000 prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' output-c process-file bye"| diff -c - $(srcdir)/primitives.i bench: gforth gforth.fi @echo 'Each benchmark takes about 30s on a 486-66 (gcc-2.6.3 -DFORCE_REG)' @@ -395,7 +405,9 @@ kernl64l.fi: $(KERNLS) @LINK_KERNL64L@ gforth.fi: @kernel_fi@ gforth $(GFORTH_FI_SRC) - $(FORTHK) $(FORTHSIZES) startup.fs -e "savesystem gforth.fi bye" + $(FORTHK) --clear-dictionary $(FORTHSIZES) startup.fs -e "savesystem gforth.fi1 bye" + $(FORTHK) --clear-dictionary --offset-image $(FORTHSIZES) startup.fs -e "savesystem gforth.fi2 bye" + $(FORTHK) -m 100000 startup.fs comp-image.fs -e "comp-image gforth.fi1 gforth.fi2 gforth.fi bye" #TAGS is a GNU standard target TAGS: gforth.TAGS @@ -426,8 +438,9 @@ primitives.i : primitives.b prims2x.fs prim_labels.i : primitives.b prims2x.fs $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-label process-file bye" >$@ -aliases.fs: primitives.b prims2x.fs - $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-alias process-file bye" >$@ +aliases.fs: primitives.b prims2x.fs aliases0.fs + $(CP) aliases0.fs aliases.fs + $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-alias process-file bye" >>$@ primitives.fs: primitives.b prims2x.fs $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-forth process-file bye" >$@