--- gforth/Makefile.in 1997/03/19 18:27:09 1.91 +++ gforth/Makefile.in 1997/03/28 14:31:43 1.97 @@ -161,14 +161,14 @@ SOURCES = CVS compat Makefile.in gforth- 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 mkinstalldirs \ - configure.cmd mkos2mf.sed os2conf.h makefile.os2 \ + gforth-makeimage.bat startup.dos history.dos mkinstalldirs \ + configure.cmd mkos2mf.sed os2conf.h makefile.os2 gforth-makeimage.cmd \ glosgen.glo glossaries.doc \ $(INCLUDES) $(FORTH_SRC) RCS_FILES = ToDo model high-level -GEN = gforth version.fs +GEN = gforth gforth-ditc version.fs version-stamp OBJECTS0 = io.o memcasecmp.o @LIBOBJS@ @getopt_long@ OBJECTS = engine.o main.o @@ -181,12 +181,13 @@ FORTH_GEN = $(FORTH_GEN0) @KERNEL@ gfor FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ #distributed documentation -DOCDIST = gforth.info* gforth.ps +DOCDIST = gforth.info gforth.info-* gforth.ps #stuff in a binonly distribution BINONLYDIST = config.status Makefile gforth gforth-ditc \ $(OBJECTS0) $(OBJECTS) $(OBJECTS_DITC)\ - machine.h config.h kernel.fi stamp-h version.h version.fs \ + machine.h config.h kernel.fi \ + stamp-h version.h version.fs version-stamp \ INSTALL.BINDIST KERNLS = kernl16b.fi- kernl16l.fi- \ @@ -203,7 +204,7 @@ all: version.fs more #this rule avoids remaking everything after minor changes in Makefile.in version-stamp: Makefile.in - test x'$(VERSION)' = x`cat $@` || echo $(VERSION) >$@ + if test -r $@ && test x'$(VERSION)' = x`cat $@` ; then true ; else echo $(VERSION) > $@ ; fi version.h: version-stamp echo "static char gforth_version[]=\"$(VERSION)\" ;" >$@ @@ -326,7 +327,7 @@ install: gforth $(FORTH_SRC) kernel.fi g $(INSTALL_DATA) kernel.fi $(libdir)/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) + 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 \ @@ -351,7 +352,7 @@ check test: gforth gforth.fi $(FORTH) other-tests.fs -e bye $(FORTH) code.fs checkans.fs -e bye @echo 'Expect no differences' - $(FORTH) -m 100000 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)' @@ -365,11 +366,11 @@ dvi: gforth.dvi gforth: $(OBJECTS) $(OBJECTS0) -$(CP) gforth gforth~ $(GCC) $(LDFLAGS) $(OBJECTS) $(OBJECTS0) $(LDLIBS) -o $@ - @MAKE_EXE@ + @GFORTH_EXE@ gforth-ditc: $(OBJECTS_DITC) $(OBJECTS0) $(GCC) $(LDFLAGS) $(OBJECTS_DITC) $(OBJECTS0) $(LDLIBS) -o $@ - @MAKE_EXE@ + @GFORTHDITC_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" @@ -421,7 +422,7 @@ kernl%.fi: kernl%.fi- $(KERNLS) -$(CP) $< $@ gforth.fi: @kernel_fi@ gforth-makeimage gforth gforth-ditc $(GFORTH_FI_SRC) - GFORTHD="./gforth-ditc -p ." $(srcdir)/gforth-makeimage gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) startup.fs + GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" $(srcdir)/gforth-makeimage gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) startup.fs #TAGS is a GNU standard target TAGS: gforth.TAGS @@ -453,19 +454,31 @@ primitives.b: primitives m4 -s $(srcdir)/primitives >$@ primitives.i : primitives.b prims2x.fs - $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-c process-file bye" >$@ + $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-c process-file bye" >$@- + $(CP) $@- $@ + $(RM) $@- prim_labels.i : primitives.b prims2x.fs - $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-label process-file bye" >$@ + $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-label process-file bye" >$@- + $(CP) $@- $@ + $(RM) $@- aliases.fs: primitives.b prims2x.fs aliases0.fs - $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-alias process-file bye" |cat aliases0.fs - >$@ + $(CP) aliases0.fs $@- + $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-alias process-file bye" >>$@- + $(CP) $@- $@ + $(RM) $@- primitives.fs: primitives.b prims2x.fs primitives0.fs - $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-forth process-file bye"|cat primitives0.fs - >$@ + $(CP) primitives0.fs primitives.fs- + $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-forth process-file bye" >>$@- + $(CP) $@- $@ + $(RM) $@- primitives.TAGS: primitives.b prims2x.fs - $(FORTHK) prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' output-tag process-file bye" >$@ + $(FORTHK) prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' output-tag process-file bye" >$@- + $(CP) $@- $@ + $(RM) $@- doc.fd: makedoc.fs $(GFORTH_FI_SRC) $(FORTHK) -e "s\" doc.fd\"" makedoc.fs startup.fs code.fs -e bye @@ -474,7 +487,9 @@ 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) -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" >$@ + $(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" >$@- + $(CP) $@- $@ + $(RM) $@- checkdoc: gforth.ds primitives.b ds2texi.fs prims2x.fs doc.fd crossdoc.fd answords.fs gforth.texi $(FORTHK) ds2texi.fs prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' register-doc process-file" crossdoc.fd doc.fd answords.fs -e bye @@ -490,7 +505,7 @@ gforth.ps: gforth.dvi info: gforth.info -gforth.info: gforth.texi +gforth.info gforth.info-*: gforth.texi -$(MAKEINFO) gforth.texi html: gforth.texi