--- gforth/Makefile.in 1996/10/31 17:41:15 1.73 +++ gforth/Makefile.in 1996/12/23 15:07:44 1.77 @@ -23,10 +23,17 @@ # (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@ @@ -119,7 +126,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 \ @@ -134,7 +141,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 \ @@ -147,7 +154,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) @@ -228,39 +235,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_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 +285,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 @@ -297,7 +312,7 @@ install: gforth $(FORTH_SRC) kernel.fi g $(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 + $(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); \ @@ -384,7 +399,9 @@ kernl64l.fi: $(KERNLS) @LINK_KERNL64L@ gforth.fi: @kernel_fi@ gforth $(GFORTH_FI_SRC) - $(FORTHK) $(FORTHSIZES) startup.fs -e "savesystem gforth.fi bye" + $(FORTHK) $(FORTHSIZES) startup.fs -e "savesystem gforth.fi1 bye" + $(FORTHK) --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