--- gforth/Makefile.in 1996/10/03 16:05:33 1.68 +++ gforth/Makefile.in 1996/10/28 17:24:31 1.72 @@ -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 @@ -39,8 +36,9 @@ GCC = @CC@ CC = $(GCC) 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 = $(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 +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) @@ -167,6 +166,11 @@ FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ #distributed documentation 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- \ kernl64b.fi- kernl64l.fi- @@ -179,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 @@ -203,7 +207,8 @@ 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-$(VERSION).tar.gz + gforth.toc gforth.tp gforth.vr html gforth-$(VERSION).tar.gz \ + version.h stamp-h clean: mostlyclean -$(RM) -rf $(GEN) *.o @@ -221,20 +226,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 @@ -245,10 +268,10 @@ 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 @@ -273,7 +296,7 @@ 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); \ @@ -281,7 +304,7 @@ install: gforth $(FORTH_SRC) kernel.fi g 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." + echo "* Gforth: (gforth). A fast interpreter for the Forth language." install-strip: install @@ -360,7 +383,7 @@ 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 @@ -377,7 +400,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 @@ -431,29 +454,29 @@ gforth.info: gforth.texi html: gforth.texi -$(RM) html/* -mkdir html - cd html; $(TEXI2HTML) -menu -split_node gforth.texi + cd html; $(TEXI2HTML) -menu -split_node ../gforth.texi 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 @@ -461,6 +484,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