--- gforth/Makefile.in 1998/12/20 11:20:28 1.132 +++ gforth/Makefile.in 1998/12/24 11:08:40 1.139 @@ -278,7 +278,7 @@ ARCHS = \ arch/shboom/sh.p \ arch/shboom/doers.fs -SOURCES = $(CVSDIRS) compat Makefile.in engine/Makefile.in gforthmi.in \ +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 \ @@ -302,7 +302,7 @@ SOURCES = $(CVSDIRS) compat Makefile.in RCS_FILES = ToDo model high-level -GEN = gforth$(EXE) gforth-ditc$(EXE) kernel/version.fs version-stamp +GEN = gforth$(EXE) gforth-ditc$(EXE) kernel/version.fs # things that need a working forth system to be generated FORTH_GEN0 = prim.b engine/prim.i engine/prim_lab.i kernel/aliases.fs kernel/prim.fs @@ -311,20 +311,13 @@ FORTH_GEN = $(FORTH_GEN0) @KERNEL@ gfor FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ #distributed documentation -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) \ - $(OBJECTS0) $(OBJECTS) $(OBJECTS_DITC)\ - arch/$(machine)/machine.h engine/config.h engine/Makefile \ - stamp-h kernel/version.fs version-stamp \ - INSTALL.BINDIST +DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.ps 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: @@ -378,7 +371,7 @@ 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 gforthmi @@ -391,78 +384,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 -) - $(MV) gforth.$(DOSVERSION)/engine/strsignal.c gforth.$(DOSVERSION)/engine/strsig.c - for i in 1 2 3 4 5 6 7 8; do \ - $(MV) gforth.$(DOSVERSION)/doc/gforth.info-$$i gforth.$(DOSVERSION)/doc/gforth.i$$i; \ - done - zip -r9 gf$(DOSVERSION)dos.zip gforth.$(DOSVERSION)/* - -$(RMTREE) gforth.$(DOSVERSION) +#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 FORCE + $(MAKE) -f Makedist d$@ + +dosdist: Makedist FORCE + $(MAKE) -f Makedist d$@ + +srcdist: Makedist FORCE + $(MAKE) -f Makedist d$@ + +srconlydist: Makedist FORCE + $(MAKE) -f Makedist d$@ -#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 +docdist: Makedist FORCE + $(MAKE) -f Makedist d$@ + +htmldist: Makedist FORCE + $(MAKE) -f Makedist d$@ + +bindist: Makedist FORCE + $(MAKE) -f Makedist d$@ + +binonlydist: Makedist FORCE + $(MAKE) -f Makedist d$@ #strip gforth, because the debugging stuff is hardly useful once @@ -473,7 +420,7 @@ binonlydist: $(SOURCES) $(FORTH_GEN0) @K #hard to generate) 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) + -$(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) @@ -485,10 +432,10 @@ install: gforth$(EXE) $(FORTH_SRC) $(ker done $(INSTALL_DATA) $(kernel_fi) $(datadir)/gforth/$(VERSION) $(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 + GFORTHD="./gforth-ditc -p$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) startup.fs" ./gforthmi gforth.fi $(FORTHSIZES) startup.fs #gforth.fi contains some path names $(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION) $(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS - @if test -d $(emacssitelispdir); then \ + @if test -d "$(emacssitelispdir)"; then \ $(INSTALL_DATA) $(srcdir)/gforth.el $(emacssitelispdir); \ else \ echo ">>>>>Please install $(srcdir)/gforth.el in your .../emacs/site-lisp directory"; \ @@ -722,10 +669,7 @@ 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 - -gforthmi: gforthmi.in 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