--- gforth/Makefile.in 1996/10/02 09:48:53 1.67 +++ gforth/Makefile.in 1996/10/25 17:09:43 1.71 @@ -37,10 +37,10 @@ INSTALL_DIR = $(srcdir)/install-sh -d LN_S = @LN_S@ GCC = @CC@ CC = $(GCC) -PATHSEP = : +PATHSEP = @PATHSEP@ FORTHPATH = $(libdir)/gforth/site-forth$(PATHSEP)$(datadir)/gforth/site-forth$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION)$(PATHSEP). FORTH = ./gforth -p $(FORTHPATH)$(PATHSEP)$(srcdir) -FORTHK = $(FORTH) -p .$(PATHSEP)$(srcdir) -i ./kernel.fi +FORTHK = ./gforth -p .$(PATHSEP)$(srcdir) -i ./kernel.fi FORTHP = ./gforth -i ./kernel.fi STRIP = strip TEXI2DVI = texi2dvi @@ -145,10 +145,11 @@ SOURCES = CVS compat Makefile.in configu primitives engine.c main.c io.c memcasecmp.c \ m68k.h mips.h 386.h hppa.h cache.c sparc.h power.h alpha.h 32bit.h \ getopt.c getopt1.c getopt.h select.c \ - ecvt.c memcmp.c strtol.c strtoul.c ansidecl.h memmove.c pow10.c \ + 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 \ glosgen.glo glossaries.doc \ $(INCLUDES) $(FORTH_SRC) @@ -165,7 +166,7 @@ FORTH_GEN = $(FORTH_GEN0) @KERNEL@ gfor FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ #distributed documentation -DOCDIST = gforth.ps gforth.info* +DOCDIST = gforth.info* gforth.ps KERNLS = kernl16b.fi- kernl16l.fi- \ kernl32b.fi- kernl32l.fi- \ @@ -179,8 +180,8 @@ GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) gf all: version.fs more -version.c: Makefile.in - echo "char gforth_version[]=\"$(VERSION)\" ;" >$@ +version.h: Makefile.in + echo "static char gforth_version[]=\"$(VERSION)\" ;" >$@ version.fs: Makefile.in $(MAKE) gforth @@ -203,7 +204,7 @@ mostlyclean: -$(RM) -rf *.s gforth.fi *.fi~ *.fi- version.fs *TAGS \ crossdoc.fd doc.fd gforth.texi gforth.fns gforth.aux gforth.cp gforth.cps \ gforth.dvi gforth.fn gforth.ky gforth.log gforth.pg \ - gforth.toc gforth.tp gforth.vr html + gforth.toc gforth.tp gforth.vr html gforth-$(VERSION).tar.gz clean: mostlyclean -$(RM) -rf $(GEN) *.o @@ -221,13 +222,31 @@ virtualclean: mostlyclean gforth-$(VERSION).tar.gz config.cache *~ */*~ #use dist targets only when srcdir=. -dist: $(SOURCES) $(FORTH_GEN) $(DOCDIST) +dist: $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) -rm -rf 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) +#A source distribution contains only the things needed to install gforth, +#without the documents. +srcdist: $(SOURCES) $(FORTH_GEN0) @KERNEL@ + -rm -rf 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) + +#A document distribution contains only the documents, which can be created +#with MAKE. +docdist: $(DOCDIST) + -rm -rf 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) + #a binary distribution contains the complete source distribution, # the objects, the executable and the links. the objects are there for making # make happy. @@ -253,11 +272,13 @@ binonlydist: $(SOURCES) $(FORTH_GEN) gfo tar cvf - gforth-$(VERSION)|gzip -9 >gforth-$(VERSION)-binonly-@host@.tar.gz - #strip gforth, because the debugging stuff is hardly useful once # gforth manages to execute more than a few primitives -install: gforth $(FORTH_SRC) kernel.fi gforth.fi gforth.1 gforth.info primitives gforth.TAGS +#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 @@ -278,6 +299,8 @@ install: gforth $(FORTH_SRC) kernel.fi g else \ echo ">>>>>Please install $(srcdir)/gforth.el in your .../emacs/site-lisp directory"; \ fi + echo ">>>>> Please make an entry for Gforth in your info dir file; e.g.:"; \ + echo "* Gforth: (gforth). A fast implementation of the Forth language." install-strip: install @@ -373,7 +396,7 @@ engine.s: engine.c primitives.i prim_lab engine.o: engine.c primitives.i prim_labels.i machine.h threading.h $(INCLUDES) config.h $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -c $(srcdir)/engine.c -main.o: main.c machine.h threading.h $(INCLUDES) config.h +main.o: main.c machine.h threading.h $(INCLUDES) config.h version.h $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -c $(srcdir)/main.c strtoul.o: strtoul.c strtol.c @@ -414,7 +437,7 @@ checkdoc: gforth.ds primitives.b ds2texi dvi: gforth.dvi gforth.dvi gforth.fns: gforth.texi - $(TEXI2DVI) $(srcdir)/gforth.texi + $(TEXI2DVI) gforth.texi gforth.ps: gforth.dvi $(DVI2PS) gforth.dvi -o $@ @@ -433,23 +456,23 @@ doc: gforth.ps html # For an explanation of the following Makefile rules, see node # `Automatic Remaking' in GNU Autoconf documentation. -${srcdir}/configure: configure.in - cd ${srcdir} && autoconf - +$(srcdir)/configure: configure.in + cd $(srcdir) && autoconf + # autoheader might not change config.h.in, so touch a stamp file. -${srcdir}/config.h.in: stamp-h.in -${srcdir}/stamp-h.in: configure.in acconfig.h - cd ${srcdir} && autoheader - echo timestamp > ${srcdir}/stamp-h.in +$(srcdir)/config.h.in: stamp-h.in +$(srcdir)/stamp-h.in: configure.in acconfig.h + cd $(srcdir) && autoheader + echo timestamp > $(srcdir)/stamp-h.in -config.h: stamp-h -stamp-h: config.h.in config.status +config.h: stamp-h +stamp-h: config.h.in config.status CONFIG_FILES=$@ CONFIG_HEADERS=config.h ./config.status echo > stamp-h -Makefile: Makefile.in config.status +Makefile: Makefile.in config.status CONFIG_FILES=$@ CONFIG_HEADERS=config.h ./config.status -config.status: configure +config.status: configure ./config.status --recheck @@ -457,6 +480,11 @@ config.status: configure makefile.dos: mkdosmf.sed Makefile.in sed -f mkdosmf.sed makefile.dos +makefile.os2: mkos2mf.sed Makefile.in + sed -f mkos2mf.sed makefile.os2 + echo '%.o: %.c' >>makefile.os2 + echo ' $$(GCC) $$(CFLAGS) -c $$<' >>makefile.os2 + history.dos: history.fs Makefile.in sed -e "s,~/\.gforth-history,/gforth.his,g" history.dos