--- gforth/Makefile.in 1996/10/31 17:41:15 1.73 +++ gforth/Makefile.in 1997/02/16 20:51:05 1.86 @@ -23,14 +23,20 @@ # (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 +#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) @@ -78,13 +84,17 @@ emacssitelispdir=$(datadir)/emacs/site-l INCLUDES = forth.h threading.h io.h KERN_SRC = \ - add.fs \ + aliases0.fs \ aliases.fs \ + args.fs \ + conditionals.fs \ + cond-old.fs \ cross.fs \ errore.fs \ - extend.fs \ + files.fs \ kernel.fs \ main.fs \ + primitives0.fs \ search-order.fs \ special.fs \ tools.fs \ @@ -100,6 +110,8 @@ GFORTH_FI_SRC = \ debugging.fs \ dumpimage.fs \ environ.fs \ + errors.fs \ + extend.fs \ float.fs \ glocals.fs \ hash.fs \ @@ -108,6 +120,7 @@ GFORTH_FI_SRC = \ look.fs \ search-order.fs \ see.fs \ + see-ext.fs \ source.fs \ startup.fs \ struct.fs \ @@ -119,13 +132,13 @@ 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 \ etags.fs filedump.fs \ glosgen.fs gray.fs \ - makedoc.fs \ + makedoc.fs comp-image.fs \ mach16b.fs mach16l.fs mach32b.fs mach32l.fs mach64b.fs mach64l.fs \ more.fs other.fs prims2x.fs random.fs \ sieve.fs \ @@ -134,7 +147,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 \ @@ -146,8 +159,8 @@ SOURCES = CVS compat Makefile.in configu ecvt.c memcmp.c strtol.c strtoul.c ansidecl.h memmove.c pow10.c atanh.c \ strerror.c strsignal.c dblsub.c \ INSTALL.DOS makefile.dos mkdosmf.sed configure.bat dosconf.h \ - startup.dos history.dos \ - os2conf.h makefile.os2 \ + startup.dos history.dos mkinstalldirs \ + configure.cmd mkos2mf.sed os2conf.h makefile.os2 \ glosgen.glo glossaries.doc \ $(INCLUDES) $(FORTH_SRC) @@ -158,7 +171,7 @@ GEN = gforth version.fs OBJECTS = engine.o io.o main.o memcasecmp.o @LIBOBJS@ @getopt_long@ # things that need a working forth system to be generated -FORTH_GEN0 = primitives.b primitives.i prim_labels.i aliases.fs +FORTH_GEN0 = primitives.b primitives.i prim_labels.i aliases.fs primitives.fs FORTH_GEN = $(FORTH_GEN0) @KERNEL@ gforth.fi # this is used for antidependences, FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ @@ -183,14 +196,18 @@ 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)\" ;" >$@ -more: $(FORTH_GEN) gforth +more: $(OBJECTS) $(FORTH_GEN) gforth #from the gcc Makefile: #"Deletion of files made during compilation. @@ -228,39 +245,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_GEN) $(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_GEN0) @KERNEL@ $(DOCDIST) $(BINONLYDIST) - -rm -rf gforth-$(VERSION) + -$(RMTREE) gforth-$(VERSION) mkdir 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! @@ -270,11 +295,11 @@ bindist: $(SOURCES) $(FORTH_GEN0) @KERNE #then just has to unpack the source and his favourite binonly into the #same directory and has a full binary distribution. binonlydist: $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) $(BINONLYDIST) - -rm -rf gforth-$(VERSION) + -$(RMTREE) gforth-$(VERSION) mkdir 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 @@ -283,22 +308,20 @@ 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) - for i in $(srcdir)/gforth.info*; do $(INSTALL_DATA) $$i $(infodir); done + -$(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 + $(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION) + 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 \ @@ -309,17 +332,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)' @@ -335,56 +361,18 @@ gforth: $(OBJECTS) $(GCC) $(LDFLAGS) $(OBJECTS) $(LDLIBS) -o $@ @MAKE_EXE@ -kernl16l.fi-: $(KERN_SRC) version.fs mach16l.fs $(FORTH_GEN0) - $(FORTHK) -e 's" mach16l.fs"' main.fs -e "save-cross kernl16l.fi- $(bindir)/gforth-$(VERSION) bye" - -kernl16b.fi-: $(KERN_SRC) version.fs mach16b.fs $(FORTH_GEN0) - $(FORTHK) -e 's" mach16b.fs"' main.fs -e "save-cross kernl16b.fi- $(bindir)/gforth-$(VERSION) bye" +kernl%.fi-: mach%.fs $(KERN_SRC) version.fs $(FORTH_GEN0) + $(FORTHK) -e 's" $<"' main.fs -e "save-cross $@ $(bindir)/gforth-$(VERSION) bye" -kernl32l.fi-: $(KERN_SRC) version.fs mach32l.fs $(FORTH_GEN0) - $(FORTHK) -e 's" mach32l.fs"' main.fs -e "save-cross kernl32l.fi- $(bindir)/gforth-$(VERSION) bye" - -kernl32b.fi-: $(KERN_SRC) version.fs mach32b.fs $(FORTH_GEN0) - $(FORTHK) -e 's" mach32b.fs"' main.fs -e "save-cross kernl32b.fi- $(bindir)/gforth-$(VERSION) bye" - -kernl64l.fi-: $(KERN_SRC) version.fs mach64l.fs $(FORTH_GEN0) - $(FORTHK) -e 's" mach64l.fs"' main.fs -e "save-cross kernl64l.fi- $(bindir)/gforth-$(VERSION) bye" - -kernl64b.fi-: $(KERN_SRC) version.fs mach64b.fs $(FORTH_GEN0) - $(FORTHK) -e 's" mach64b.fs"' main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye" - -kernl16b.fi: $(KERNLS) - -$(CP) kernl16b.fi kernl16b.fi~ - -$(CP) kernl16b.fi- kernl16b.fi - @LINK_KERNL16B@ - -kernl16l.fi: $(KERNLS) - -$(CP) kernl16l.fi kernl16l.fi~ - -$(CP) kernl16l.fi- kernl16l.fi - @LINK_KERNL16L@ - -kernl32b.fi: $(KERNLS) - -$(CP) kernl32b.fi kernl32b.fi~ - -$(CP) kernl32b.fi- kernl32b.fi - @LINK_KERNL32B@ - -kernl32l.fi: $(KERNLS) - -$(CP) kernl32l.fi kernl32l.fi~ - -$(CP) kernl32l.fi- kernl32l.fi - @LINK_KERNL32L@ - -kernl64b.fi: $(KERNLS) - -$(CP) kernl64b.fi kernl64b.fi~ - -$(CP) kernl64b.fi- kernl64b.fi - @LINK_KERNL64B@ - -kernl64l.fi: $(KERNLS) - -$(CP) kernl64l.fi kernl64l.fi~ - -$(CP) kernl64l.fi- kernl64l.fi - @LINK_KERNL64L@ +kernl%.fi: kernl%.fi- $(KERNLS) + -$(CP) $@ $@~ + -$(CP) $< $@ + @LINK_KERNL@ 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 @@ -415,11 +403,13 @@ 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" >$@ - -primitives.fs: primitives.b prims2x.fs - $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-forth 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 primitives0.fs + $(CP) primitives0.fs primitives.fs + $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-forth process-file bye" >>$@ primitives.TAGS: primitives.b prims2x.fs $(FORTHK) prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' output-tag process-file bye" >$@