--- gforth/Makefile.in 1996/10/20 20:35:23 1.70 +++ gforth/Makefile.in 1996/12/28 17:19:23 1.78 @@ -23,22 +23,26 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. -#To do: -#use $(srcdir) to make compilation in a non-srcdir possible - -VERSION =0.2.0#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 CP = cp +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) PATHSEP = @PATHSEP@ FORTHPATH = $(libdir)/gforth/site-forth$(PATHSEP)$(datadir)/gforth/site-forth$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION)$(PATHSEP). +FORTHSIZES = @FORTHSIZES@ FORTH = ./gforth -p $(FORTHPATH)$(PATHSEP)$(srcdir) FORTHK = ./gforth -p .$(PATHSEP)$(srcdir) -i ./kernel.fi FORTHP = ./gforth -i ./kernel.fi @@ -121,7 +125,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 \ @@ -136,7 +140,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 \ @@ -149,7 +153,7 @@ SOURCES = CVS compat Makefile.in configu strerror.c strsignal.c dblsub.c \ INSTALL.DOS makefile.dos mkdosmf.sed configure.bat dosconf.h \ startup.dos history.dos \ - os2conf.h makefile.os2 \ + configure.cmd mkos2mf.sed os2conf.h makefile.os2 \ glosgen.glo glossaries.doc \ $(INCLUDES) $(FORTH_SRC) @@ -168,6 +172,11 @@ FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ #distributed documentation DOCDIST = gforth.info* gforth.ps +#stuff in a binonly distribution +BINONLYDIST = config.status Makefile gforth $(OBJECTS) \ + machine.h config.h kernel.fi stamp-h version.h version.fs \ + INSTALL.BINDIST + KERNLS = kernl16b.fi- kernl16l.fi- \ kernl32b.fi- kernl32l.fi- \ kernl64b.fi- kernl64l.fi- @@ -180,10 +189,14 @@ GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) gf all: version.fs more -version.c: Makefile.in - echo "char gforth_version[]=\"$(VERSION)\" ;" >$@ +#this rule avoids remaking everything after minor changes in Makefile.in +version-stamp: Makefile.in + if test x'$(VERSION)' != x`cat $@`; then echo $(VERSION) >$@; fi -version.fs: Makefile.in +version.h: version-stamp + echo "static char gforth_version[]=\"$(VERSION)\" ;" >$@ + +version.fs: version-stamp $(MAKE) gforth echo ": version-string s\" $(VERSION)\" ;" >$@ @@ -204,13 +217,15 @@ mostlyclean: -$(RM) -rf *.s gforth.fi *.fi~ *.fi- version.fs *TAGS \ crossdoc.fd doc.fd gforth.texi gforth.fns gforth.aux gforth.cp gforth.cps \ gforth.dvi gforth.fn gforth.ky gforth.log gforth.pg \ - gforth.toc gforth.tp gforth.vr html gforth-$(VERSION).tar.gz + gforth.toc gforth.tp gforth.vr html gforth-$(VERSION).tar.gz \ + version.h clean: mostlyclean -$(RM) -rf $(GEN) *.o distclean: clean - -$(RM) machine.h kernel.fi config.cache config.log config.status config.h Makefile + -$(RM) machine.h kernel.fi config.cache config.log \ + config.status config.h Makefile stamp-h #realclean is useless, but dangerous, so it's commented out #realclean: distclean @@ -223,39 +238,47 @@ virtualclean: mostlyclean #use dist targets only when srcdir=. dist: $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) - -rm -rf gforth-$(VERSION) + -$(RMTREE) gforth-$(VERSION) mkdir gforth-$(VERSION) $(CP) -rp $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) gforth-$(VERSION) - tar cvf - gforth-$(VERSION)|gzip -9 >gforth-$(VERSION).tar.gz - -rm -rf gforth-$(VERSION) + $(TAR) gforth-$(VERSION)|gzip -9 >gforth-$(VERSION).tar.gz + -$(RMTREE) gforth-$(VERSION) + +#use dist targets only when srcdir=. +dosdist: $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) + -$(RMTREE) gforth.$(DOSVERSION) + mkdir gforth.$(DOSVERSION) + $(CP) -rp $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) gforth.$(DOSVERSION) + zip -r9 gforth.zip gforth.$(DOSVERSION)/* + -$(RMTREE) gforth.$(DOSVERSION) #A source distribution contains only the things needed to install gforth, #without the documents. srcdist: $(SOURCES) $(FORTH_GEN0) @KERNEL@ - -rm -rf gforth-$(VERSION) + -$(RMTREE) gforth-$(VERSION) mkdir gforth-$(VERSION) $(CP) -rp $(SOURCES) $(FORTH_GEN0) @KERNEL@ gforth-$(VERSION) - tar cvf - gforth-$(VERSION)|gzip -9 >gforth-src-$(VERSION).tar.gz - -rm -rf gforth-$(VERSION) + $(TAR) gforth-$(VERSION)|gzip -9 >gforth-src-$(VERSION).tar.gz + -$(RMTREE) gforth-$(VERSION) #A document distribution contains only the documents, which can be created #with MAKE. docdist: $(DOCDIST) - -rm -rf gforth-$(VERSION) + -$(RMTREE) gforth-$(VERSION) mkdir gforth-$(VERSION) $(CP) -rp $(DOCDIST) gforth-$(VERSION) - tar cvf - gforth-$(VERSION)|gzip -9 >gforth-doc-$(VERSION).tar.gz - -rm -rf gforth-$(VERSION) + $(TAR) gforth-$(VERSION)|gzip -9 >gforth-doc-$(VERSION).tar.gz + -$(RMTREE) gforth-$(VERSION) #a binary distribution contains the complete source distribution, # the objects, the executable and the links. the objects are there for making # make happy. -bindist: $(SOURCES) $(FORTH_GEN) gforth $(OBJECTS) config.status Makefile - -rm -rf gforth-$(VERSION) +bindist: $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) $(BINONLYDIST) + -$(RMTREE) gforth-$(VERSION) mkdir gforth-$(VERSION) - $(CP) -rp -d $(SOURCES) config.status Makefile $(FORTH_GEN) gforth $(OBJECTS) machine.h kernel.fi gforth-$(VERSION) + $(CP) -rp -d $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) $(BINONLYDIST) gforth-$(VERSION) strip gforth-$(VERSION)/gforth - tar cvf - gforth-$(VERSION)|gzip -9 >gforth-$(VERSION)-@host@.tar.gz + $(TAR) gforth-$(VERSION)|gzip -9 >gforth-$(VERSION)-@host@.tar.gz #makes a package with only the stuff not present in the source #package. For installation the source package is still needed! @@ -264,12 +287,12 @@ bindist: $(SOURCES) $(FORTH_GEN) gforth #all the binonly packages you are interested in on the disk. The user #then just has to unpack the source and his favourite binonly into the #same directory and has a full binary distribution. -binonlydist: $(SOURCES) $(FORTH_GEN) gforth $(OBJECTS) - -rm -rf gforth-$(VERSION) +binonlydist: $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) $(BINONLYDIST) + -$(RMTREE) gforth-$(VERSION) mkdir gforth-$(VERSION) - $(CP) -p -d config.status Makefile gforth $(OBJECTS) machine.h kernel.fi gforth-$(VERSION) + $(CP) -p -d $(BINONLYDIST) gforth-$(VERSION) strip gforth-$(VERSION)/gforth - tar cvf - gforth-$(VERSION)|gzip -9 >gforth-$(VERSION)-binonly-@host@.tar.gz + $(TAR) gforth-$(VERSION)|gzip -9 >gforth-$(VERSION)-binonly-@host@.tar.gz #strip gforth, because the debugging stuff is hardly useful once @@ -278,32 +301,32 @@ binonlydist: $(SOURCES) $(FORTH_GEN) gfo #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) 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 \ echo ">>>>>Please install $(srcdir)/gforth.el in your .../emacs/site-lisp directory"; \ fi echo ">>>>> Please make an entry for Gforth in your info dir file; e.g.:"; \ - echo "* Gforth: (gforth). A fast implementation of the Forth language." + 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 + #deinstall all files specific to this version of gforth #to uninstall version foo, type `make uninstall VERSION=foo' uninstall: @@ -379,7 +402,9 @@ kernl64l.fi: $(KERNLS) @LINK_KERNL64L@ gforth.fi: @kernel_fi@ gforth $(GFORTH_FI_SRC) - $(FORTHK) 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 @@ -396,7 +421,7 @@ engine.s: engine.c primitives.i prim_lab engine.o: engine.c primitives.i prim_labels.i machine.h threading.h $(INCLUDES) config.h $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -c $(srcdir)/engine.c -main.o: main.c machine.h threading.h $(INCLUDES) config.h +main.o: main.c machine.h threading.h $(INCLUDES) config.h version.h $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -c $(srcdir)/main.c strtoul.o: strtoul.c strtol.c @@ -429,7 +454,7 @@ crossdoc.fd: $(KERN_SRC) version.fs $(FO $(FORTHK) -e 's" mach32l.fs"' main.fs -e bye gforth.texi: gforth.ds primitives.b ds2texi.fs prims2x.fs doc.fd crossdoc.fd - $(FORTHK) ds2texi.fs prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' register-doc process-file" crossdoc.fd doc.fd -e "s\" $(srcdir)/gforth.ds\" r/o open-file throw ds2texi bye" >$@ + $(FORTHK) -m 100000 ds2texi.fs prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' register-doc process-file" crossdoc.fd doc.fd -e "s\" $(srcdir)/gforth.ds\" r/o open-file throw ds2texi bye" >$@ checkdoc: gforth.ds primitives.b ds2texi.fs prims2x.fs doc.fd crossdoc.fd answords.fs $(FORTHK) ds2texi.fs answords.fs -e bye