--- gforth/Makefile.in 1996/09/30 13:16:06 1.66 +++ gforth/Makefile.in 1996/10/31 17:41:15 1.73 @@ -23,9 +23,6 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. -#To do: -#use $(srcdir) to make compilation in a non-srcdir possible - VERSION =0.2.0#gforth version SHELL = /bin/sh RM = rm @@ -37,9 +34,11 @@ INSTALL_DIR = $(srcdir)/install-sh -d LN_S = @LN_S@ GCC = @CC@ CC = $(GCC) -FORTHPATH = $(libdir)/gforth/site-forth:$(datadir)/gforth/site-forth:$(libdir)/gforth/$(VERSION):$(datadir)/gforth/$(VERSION):. -FORTH = ./gforth -p $(FORTHPATH):$(srcdir) -FORTHK = $(FORTH) -p .:$(srcdir) -i ./kernel.fi +PATHSEP = @PATHSEP@ +FORTHPATH = $(libdir)/gforth/site-forth$(PATHSEP)$(datadir)/gforth/site-forth$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION)$(PATHSEP). +FORTHSIZES = @FORTHSIZES@ +FORTH = ./gforth -p $(FORTHPATH)$(PATHSEP)$(srcdir) +FORTHK = ./gforth -p .$(PATHSEP)$(srcdir) -i ./kernel.fi FORTHP = ./gforth -i ./kernel.fi STRIP = strip TEXI2DVI = texi2dvi @@ -144,10 +143,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) @@ -164,7 +164,12 @@ FORTH_GEN = $(FORTH_GEN0) @KERNEL@ gfor FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ #distributed documentation -DOCDIST = gforth.ps gforth.info* +DOCDIST = gforth.info* gforth.ps + +#stuff in a binonly distribution +BINONLYDIST = config.status Makefile gforth $(OBJECTS) \ + machine.h config.h kernel.fi stamp-h version.h version.fs \ + INSTALL.BINDIST KERNLS = kernl16b.fi- kernl16l.fi- \ kernl32b.fi- kernl32l.fi- \ @@ -178,8 +183,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 @@ -202,13 +207,15 @@ 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 \ + version.h clean: mostlyclean -$(RM) -rf $(GEN) *.o distclean: clean - -$(RM) machine.h kernel.fi config.cache config.log config.status config.h Makefile + -$(RM) machine.h kernel.fi config.cache config.log \ + config.status config.h Makefile stamp-h #realclean is useless, but dangerous, so it's commented out #realclean: distclean @@ -220,20 +227,38 @@ 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. -bindist: $(SOURCES) $(FORTH_GEN) gforth $(OBJECTS) config.status Makefile +bindist: $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) $(BINONLYDIST) -rm -rf gforth-$(VERSION) mkdir gforth-$(VERSION) - $(CP) -rp -d $(SOURCES) config.status Makefile $(FORTH_GEN) gforth $(OBJECTS) machine.h kernel.fi 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 @@ -244,19 +269,21 @@ bindist: $(SOURCES) $(FORTH_GEN) gforth #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_GEN) gforth $(OBJECTS) +binonlydist: $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) $(BINONLYDIST) -rm -rf gforth-$(VERSION) mkdir gforth-$(VERSION) - $(CP) -p -d config.status Makefile gforth $(OBJECTS) machine.h kernel.fi gforth-$(VERSION) + $(CP) -p -d $(BINONLYDIST) gforth-$(VERSION) strip gforth-$(VERSION)/gforth 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 @@ -270,13 +297,15 @@ install: gforth $(FORTH_SRC) kernel.fi g $(INSTALL_DATA) $(srcdir)/$$i $(datadir)/gforth/$(VERSION); \ done $(INSTALL_DATA) kernel.fi $(libdir)/gforth/$(VERSION) - $(FORTHP) startup.fs -e "savesystem $(libdir)/gforth/$(VERSION)/gforth.fi bye" #gforth.fi contains some path names + $(FORTHP) $(FORTHSIZES) startup.fs -e "savesystem $(libdir)/gforth/$(VERSION)/gforth.fi bye" #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); \ 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 interpreter for the Forth language." install-strip: install @@ -286,10 +315,7 @@ uninstall: -$(RM) -rf $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(bindir)/gforth-$(VERSION) @echo -e "Type\n$(RM) -rf $(bindir)/gforth $(mandir)/gforth.1 $(infodir)/gforth.info* $(datadir)/gforth $(libdir)/gforth\nto remove Gforth completely" -check: test - touch test - -test: gforth gforth.fi +check test: gforth gforth.fi $(FORTH) tester.fs coretest.fs postponetest.fs dbltest.fs -e bye $(FORTH) code.fs checkans.fs -e bye @echo 'Expect no differences' @@ -358,11 +384,16 @@ kernl64l.fi: $(KERNLS) @LINK_KERNL64L@ gforth.fi: @kernel_fi@ gforth $(GFORTH_FI_SRC) - $(FORTHK) startup.fs -e "savesystem gforth.fi bye" + $(FORTHK) $(FORTHSIZES) startup.fs -e "savesystem gforth.fi bye" + +#TAGS is a GNU standard target +TAGS: gforth.TAGS + $(CP) gforth.TAGS $@ gforth.TAGS: @kernel_fi@ gforth $(GFORTH_FI_SRC) primitives.TAGS $(FORTHK) etags.fs startup.fs -e bye cat TAGS primitives.TAGS kernel.TAGS >gforth.TAGS + rm TAGS engine.s: engine.c primitives.i prim_labels.i machine.h threading.h $(INCLUDES) config.h $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -S $(srcdir)/engine.c @@ -370,7 +401,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 @@ -403,7 +434,7 @@ 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) 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" >$@ checkdoc: gforth.ds primitives.b ds2texi.fs prims2x.fs doc.fd crossdoc.fd answords.fs $(FORTHK) ds2texi.fs answords.fs -e bye @@ -411,7 +442,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 $@ @@ -430,23 +461,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 @@ -454,6 +485,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