--- gforth/Makefile.in 1998/12/11 23:03:39 1.128 +++ gforth/Makefile.in 1998/12/22 21:17:13 1.135 @@ -31,7 +31,7 @@ # ------------- gforth version VERSION = @VERSION@ -DOSVERSION=`echo $VERSION|sed 's/\.//g'` +DOSVERSION=`echo $(VERSION)|sed 's/\.//g'` # ------------- System specific variables @@ -54,6 +54,7 @@ SHELL = /bin/sh RM = rm RMTREE = rm -rf CP = cp +MV = mv TAR = tar cf - INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -64,7 +65,7 @@ CC = $(GCC) FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(datadir)/gforth/site-forth$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION) FORTHSIZES = @FORTHSIZES@ FORTH = ./gforth --die-on-signal -p $(FORTHPATH)$(PATHSEP)$(srcdir) -FORTHKFLAGS= --die-on-signal -p .$(PATHSEP)$(srcdir) -i ./$(kernel_fi) +FORTHKFLAGS= --die-on-signal -p .$(PATHSEP)$\~+$(PATHSEP)$(srcdir) -i $(kernel_fi) FORTHK = ./gforth $(FORTHKFLAGS) FORTHP = ./gforth --die-on-signal -i ./$(kernel_fi) STRIP = strip @@ -214,8 +215,16 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) bubble.fs siev.fs matrix.fs fib.fs \ oof.fs oofsampl.fs objects.fs objexamp.fs mini-oof.fs moof-exm.fs -COMPAT = compat/README compat/control.fs compat/anslocal.fs \ - compat/struct.fs compat/loops.fs +COMPAT = compat/README \ + compat/anslocal.fs \ + compat/assert.fs \ + compat/control.fs \ + compat/defer.fs \ + compat/exception.fs \ + compat/loops.fs \ + compat/required.fs \ + compat/struct.fs \ + compat/vocabulary.fs GFORTH_TEXI = doc/gforth.texi doc/version.texi @@ -269,7 +278,7 @@ ARCHS = \ arch/shboom/sh.p \ arch/shboom/doers.fs -SOURCES = $(CVSDIRS) compat Makefile.in engine/Makefile.in gforthmi \ +SOURCES = $(CVSDIRS) compat Makefile.in Makedist.in engine/Makefile.in gforthmi.in \ configure.in configure config.sub config.guess elisp-comp missing \ acconfig.h acinclude.m4 engine/config.h.in stamp-h.in \ install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS model \ @@ -305,7 +314,7 @@ FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.txt doc/gforth.ps #stuff in a binonly distribution -BINONLYDIST = config.status Makefile gforth$(EXE) gforth-ditc$(EXE) \ +BINONLYDIST = config.status Makefile Makedist gforth$(EXE) gforth-ditc$(EXE) \ $(OBJECTS0) $(OBJECTS) $(OBJECTS_DITC)\ arch/$(machine)/machine.h engine/config.h engine/Makefile \ stamp-h kernel/version.fs version-stamp \ @@ -315,7 +324,7 @@ KERNLS = kernl16b.fi- kernl16l.fi- \ kernl32b.fi- kernl32l.fi- \ kernl64b.fi- kernl64l.fi- -GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) doc/gforth.texi doc/gforth.dvi doc/gforth.ps Makefile engine/Makefile configure +GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) doc/gforth.texi doc/gforth.dvi doc/gforth.ps Makefile Makedist engine/Makefile configure #standards.info recommends this: .SUFFIXES: @@ -338,7 +347,7 @@ version: Makefile.in kernel/version.fs: version $(MAKE) gforth$(EXE) - $(SHELL) versions.bsh $(VERSION) + echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs more: engine $(FORTH_GEN) gforth$(EXE) @@ -369,9 +378,9 @@ clean: mostlyclean distclean: clean -$(RM) config.cache config.log config.status \ - engine/config.h Makefile engine/Makefile \ + engine/config.h Makefile Makedist engine/Makefile \ stamp-h engine/stamp-h \ - doc/version.texi + doc/version.texi gforthmi #realclean is useless, but dangerous, so it's commented out #realclean: distclean @@ -382,74 +391,32 @@ virtualclean: mostlyclean -$(RM) -rf gforth.fns gforth.texi gforth.ps gforth.info* \ gforth-$(VERSION).tar.gz config.cache *~ */*~ -#use dist targets only when srcdir=. -dist: $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) - -$(RMTREE) gforth-$(VERSION) - mkdir gforth-$(VERSION) - $(TAR) $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) | \ - (cd gforth-$(VERSION); tar xf -) - $(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) - $(TAR) $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) | \ - (cd gforth.$(DOSVERSION); tar xf -) - zip -r9 gf$(DOSVERSION)dos.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@ - -$(RMTREE) gforth-$(VERSION) - mkdir gforth-$(VERSION) - $(TAR) $(SOURCES) $(FORTH_GEN0) @KERNEL@ | \ - (cd gforth-$(VERSION); tar xf -) - $(TAR) gforth-$(VERSION)|gzip -9 >gforth-src-$(VERSION).tar.gz - -$(RMTREE) gforth-$(VERSION) - -srconlydist: $(SOURCES) - -$(RMTREE) gforth-$(VERSION) - mkdir gforth-$(VERSION) - $(TAR) $(SOURCES) | \ - (cd gforth-$(VERSION); tar xf -) - $(TAR) gforth-$(VERSION)|gzip -9 >gforth-srconly-$(VERSION).tar.gz - -$(RMTREE) gforth-$(VERSION) - -#A document distribution contains only the documents, which can be created -#with MAKE. -docdist: $(DOCDIST) - -$(RMTREE) gforth-$(VERSION) - mkdir gforth-$(VERSION) - $(TAR) $(DOCDIST) | (cd gforth-$(VERSION); tar xf -) - $(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) - -$(RMTREE) gforth-$(VERSION) - mkdir gforth-$(VERSION) - $(TAR) $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) $(BINONLYDIST) | (cd gforth-$(VERSION); tar xf -) - strip gforth-$(VERSION)/gforth - $(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! -#This is useful if you want to distribute many binary versions in -#little space (e.g., on floppy disk): Put the source package and -#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_GEN0) @KERNEL@ $(DOCDIST) $(BINONLYDIST) - -$(RMTREE) gforth-$(VERSION) - mkdir gforth-$(VERSION) - $(TAR) $(BINONLYDIST) | (cd gforth-$(VERSION); tar xf -) - strip gforth-$(VERSION)/gforth - $(TAR) gforth-$(VERSION)|gzip -9 >gforth-$(VERSION)-binonly-@host@.tar.gz +#Some makes (Ultrix, SunOS, IRIX) are so broken, they cannot read the +#Makefile if it contains our dist rules. Therefore we have put these +#rules in Makedist (you can use them with GNU make on these systems). +dist: Makedist + $(MAKE) -f Makedist d$@ + +dosdist: Makedist + $(MAKE) -f Makedist d$@ + +srcdist: Makedist + $(MAKE) -f Makedist d$@ + +srconlydist: Makedist + $(MAKE) -f Makedist d$@ + +docdist: Makedist + $(MAKE) -f Makedist d$@ + +htmldist: Makedist + $(MAKE) -f Makedist d$@ + +bindist: Makedist + $(MAKE) -f Makedist d$@ + +binonlydist: Makedist + $(MAKE) -f Makedist d$@ #strip gforth, because the debugging stuff is hardly useful once @@ -458,20 +425,23 @@ 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$(EXE) $(FORTH_SRC) $(kernel_fi) gforth.fi doc/gforth.1 prim gforth.TAGS installdirs +install: gforth$(EXE) $(FORTH_SRC) $(kernel_fi) gforth.fi gforthmi doc/gforth.1 prim install.TAGS installdirs touch $(datadir)/gforth/site-forth/siteinit.fs - -$(RM) $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) - $(INSTALL_PROGRAM) -s gforth$(EXE) $(bindir) - ln $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) + -$(RM) $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforthmi + $(INSTALL_PROGRAM) -s gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) + $(LN_S) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforth$(EXE) + $(INSTALL_PROGRAM) gforthmi $(bindir)/gforthmi-$(VERSION) + $(LN_S) $(bindir)/gforthmi-$(VERSION) $(bindir)/gforthmi -$(INSTALL_DATA) $(srcdir)/doc/gforth.1 $(man1dir) - -for i in $(srcdir)/gforth.info*; do $(INSTALL_DATA) $$i $(infodir); done - for i in $(FORTH_SRC) prim; do \ - $(INSTALL_DATA) $(srcdir)/$$i $(datadir)/gforth/$(VERSION); \ + -for i in $(srcdir)/doc/gforth.info*; do $(INSTALL_DATA) $$i $(infodir); done + for i in $(FORTH_SRC) $(COMPAT) prim; do \ + $(INSTALL_DATA) $(srcdir)/$$i $(datadir)/gforth/$(VERSION)/$$i; \ done $(INSTALL_DATA) $(kernel_fi) $(datadir)/gforth/$(VERSION) - $(RM) gforth.fi; $(MAKE) gforth.fi #gforth.fi contains some path names + $(RM) gforth.fi + GFORTHD="./gforth-ditc -i $(kernel_fi)" GFORTH="./gforth-ditc -i $(kernel_fi) startup.fs" ./gforthmi gforth.fi $(FORTHSIZES) startup.fs #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) + $(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS @if test -d $(emacssitelispdir); then \ $(INSTALL_DATA) $(srcdir)/gforth.el $(emacssitelispdir); \ else \ @@ -484,16 +454,22 @@ install-strip: install installdirs: mkinstalldirs $(srcdir)/mkinstalldirs $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(datadir)/gforth/site-forth + for i in $(CVSDIRS); do \ + $(srcdir)/mkinstalldirs $(datadir)/gforth/$(VERSION)/`dirname $$i`; \ + done + $(RM) -rf $(datadir)/gforth/$(VERSION)/arch $(datadir)/gforth/$(VERSION)/engine #deinstall all files specific to this version of gforth #to uninstall version foo, type `make uninstall VERSION=foo' uninstall: FORCE - -$(RM) -rf $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(bindir)/gforth-$(VERSION) - @echo -e "Type\n$(RM) -rf $(bindir)/gforth $(man1dir)/gforth.1 $(infodir)/gforth.info* $(datadir)/gforth $(libdir)/gforth\nto remove Gforth completely" + -$(RM) -rf $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforthmi-$(VERSION) + @echo -e "To remove Gforth completely, type\n$(RM) -rf $(bindir)/gforth$(EXE) $(bindir)/gforthmi $(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 -e bye $(FORTH) test/other.fs -e bye + @echo "Expect 'Missing: EKEY EKEY>CHAR EKEY? EMIT?'" + @echo "Expect 'Missing: EDITOR FORGET'" $(FORTH) code.fs test/checkans.fs -e bye @echo 'Expect no differences' $(FORTHK) -m 100000 prims2x.fs -e "s\" $(srcdir)/prim.b\"' output-c process-file bye"| diff -c - $(srcdir)/engine/prim.i @@ -519,23 +495,23 @@ kernl16l.fi-: $(KERN_SRC) kernel/version $(FORTHK) -e 's" mach16l.fs"' kernel/main.fs -e "save-cross kernl16l.fi- $(bindir)/gforth-$(VERSION) bye" kernl16b.fi-: $(KERN_SRC) kernel/version.fs mach16b.fs $(FORTH_GEN0) - $(FORTHK) -e 's" mach16b.fs"' kernel/main.fs -e "save-cross kernl16b.fi- $(bindir)/gforth-$(VERSION) bye" + $(FORTHK) -e 's" mach16b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16b.fi- $(bindir)/gforth-$(VERSION) bye" kernl32l.fi-: $(KERN_SRC) kernel/version.fs mach32l.fs $(FORTH_GEN0) - $(FORTHK) -e 's" mach32l.fs"' kernel/main.fs -e "save-cross kernl32l.fi- $(bindir)/gforth-$(VERSION) bye" + $(FORTHK) -e 's" mach32l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl32l.fi- $(bindir)/gforth-$(VERSION) bye" kernl32b.fi-: $(KERN_SRC) kernel/version.fs mach32b.fs $(FORTH_GEN0) - $(FORTHK) -e 's" mach32b.fs"' kernel/main.fs -e "save-cross kernl32b.fi- $(bindir)/gforth-$(VERSION) bye" + $(FORTHK) -e 's" mach32b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl32b.fi- $(bindir)/gforth-$(VERSION) bye" kernl64l.fi-: $(KERN_SRC) kernel/version.fs mach64l.fs $(FORTH_GEN0) - $(FORTHK) -e 's" mach64l.fs"' kernel/main.fs -e "save-cross kernl64l.fi- $(bindir)/gforth-$(VERSION) bye" + $(FORTHK) -e 's" mach64l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64l.fi- $(bindir)/gforth-$(VERSION) bye" kernl64b.fi-: $(KERN_SRC) kernel/version.fs mach64b.fs $(FORTH_GEN0) - $(FORTHK) -e 's" mach64b.fs"' kernel/main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye" + $(FORTHK) -e 's" mach64b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye" kernl-%.fi: arch/%/mach.fs \ $(KERN_SRC) kernel/version.fs $(FORTH_GEN0) - $(FORTHK) -e 's" $<"' kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye" + $(FORTHK) -e 's" $<"' $(srcdir)/kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye" if [ -f `echo $< | sed s/fs/sh/` ]; \ then sh `echo $< | sed s/fs/sh/` $@; \ else $(CP) $@- $@; \ @@ -574,7 +550,7 @@ kernl64l.fi: $(KERNLS) # -$(CP) $< $@ gforth.fi: $(kernel_fi) gforthmi gforth$(EXE) gforth-ditc$(EXE) $(GFORTH_FI_SRC) - GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) startup.fs" $(srcdir)/gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) startup.fs + GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) startup.fs" ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) startup.fs # ------------- Make c-engine @@ -603,17 +579,18 @@ kernel/prim.fs: prim.b prims2x.fs kernel $(CP) $@- $@ $(RM) $@- -gforth$(EXE): FORCE +gforth$(EXE): engines -$(CP) gforth$(EXE) gforth~ - cd engine && $(MAKE) gforth$(EXE) $(CP) engine/$@ $@ @GFORTH_EXE@ -gforth-ditc$(EXE): FORCE - cd engine && $(MAKE) gforth-ditc$(EXE) +gforth-ditc$(EXE): engines $(CP) engine/$@ $@ @GFORTHDITC_EXE@ +engines: FORCE + cd engine && $(MAKE) gforth$(EXE) gforth-ditc$(EXE) + # ------------- additional C primitives %.c: %.pri prim2cl.fs @@ -628,6 +605,9 @@ gforth-ditc$(EXE): FORCE TAGS: gforth.TAGS $(CP) gforth.TAGS $@ +install.TAGS: gforth.TAGS + sed 's:^\$(srcdir)/:$(datadir)/gforth/$(VERSION)/:' gforth.TAGS >install.TAGS + gforth.TAGS: @kernel_fi@ gforth $(GFORTH_FI_SRC) prim.TAGS $(FORTHK) etags.fs startup.fs -e bye cat TAGS prim.TAGS kernel.TAGS >gforth.TAGS @@ -696,8 +676,8 @@ stamp-h: engine/config.h.in config.statu CONFIG_FILES=$@ CONFIG_HEADERS=engine/config.h ./config.status echo timestamp > stamp-h -Makefile: Makefile.in engine/Makefile.in config.status - CONFIG_FILES="$@ engine/$@" CONFIG_HEADERS=engine/config.h ./config.status +Makefile Makedist engine/Makefile gforthmi: Makefile.in Makedist.in engine/Makefile.in gforthmi.in config.status + CONFIG_FILES="$@" CONFIG_HEADERS=engine/config.h ./config.status config.status: configure ./config.status --recheck