--- gforth/Makefile.in 1998/06/17 16:55:04 1.112 +++ gforth/Makefile.in 1998/12/13 23:29:58 1.130 @@ -1,6 +1,6 @@ #Makefile for Gforth -#Copyright (C) 1995-1997 Free Software Foundation, Inc. +#Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc. #This file is part of Gforth. @@ -31,12 +31,13 @@ # ------------- gforth version VERSION = @VERSION@ -DOSVERSION=`echo $VERSION|sed 's/\.//g'` +DOSVERSION=`echo $(VERSION)|sed 's/\.//g'` # ------------- System specific variables machine=@machine@ kernel_fi=@kernel_fi@ +EXE=@EXE@ # this is the type of machine # used to extend the include path with ./arch/$machine @@ -53,6 +54,7 @@ SHELL = /bin/sh RM = rm RMTREE = rm -rf CP = cp +MV = mv TAR = tar cf - INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -68,7 +70,7 @@ FORTHK = ./gforth $(FORTHKFLAGS) FORTHP = ./gforth --die-on-signal -i ./$(kernel_fi) STRIP = strip TEXI2DVI = texi2dvi -DVI2PS = dvips -D300 +DVI2PS = dvips -Z #you can get texi2html from http://wwwcn.cern.ch/dci/texi2html/ TEXI2HTML = texi2html MAKEINFO = makeinfo @@ -84,8 +86,7 @@ CFLAGS = $(DEBUGFLAG) -I$(srcdir)/engine #John Wavrik should use -Xlinker -N to get a writable text (executable) XLDFLAGS = @LDFLAGS@ -GCCLDFLAGS = @GCCLDFLAGS@ -LDFLAGS = $(DEBUGFLAG) $(XLDFLAGS) $(GCCLDFLAGS) +LDFLAGS = $(DEBUGFLAG) $(XLDFLAGS) LDLIBS = @LIBS@ # ------------ Install Directorys @@ -106,13 +107,21 @@ man1ext= .1 #older emacses have their site-lisp in $(libdir)/emacs/ emacssitelispdir=@lispdir@ -INCLUDES = engine/CVS engine/forth.h engine/threaded.h engine/io.h +CVSDIRS = CVS engine/CVS kernel/CVS doc/CVS asm/CVS ec/CVS test/CVS \ + compat/CVS \ + arch/CVS arch/generic/CVS arch/m68k/CVS arch/mips/CVS \ + arch/386/CVS arch/hppa/CVS arch/sparc/CVS arch/power/CVS \ + arch/alpha/CVS arch/4stack/CVS arch/misc/CVS arch/6502/CVS \ + arch/8086/CVS arch/avr/CVS arch/c165/CVS arch/h8/CVS \ + arch/shboom/CVS \ + +INCLUDES = engine/forth.h engine/threaded.h engine/io.h KERN_SRC = \ - kernel/CVS \ kernel/aliases0.fs \ kernel/aliases.fs \ kernel/args.fs \ + chains.fs \ kernel/cond.fs \ kernel/cond-old.fs \ cross.fs \ @@ -140,14 +149,13 @@ KERN_SRC = \ kernel/getdoers.fs EC_SRC = \ - asm/00-readme \ + asm/README \ asm/bitmask.fs \ asm/numref.fs \ asm/basic.fs \ asm/generic.fs \ asm/target.fs \ - ec/00-readme \ - ec/crossdoc.fd \ + ec/README \ ec/mirror.fs \ ec/mirrors.fs \ ec/shex.fs \ @@ -194,33 +202,36 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) ans-report.fs ansi.fs answords.fs \ code.fs colorize.fs comp-i.fs \ doskey.fs ds2texi.fs \ - etags.fs filedump.fs \ + envos.fs envos.dos envos.os2 etags.fs filedump.fs fi2c.fs \ glosgen.fs gray.fs \ doc/makedoc.fs \ mach16b.fs mach16l.fs mach32b.fs mach32l.fs mach64b.fs mach64l.fs \ - more.fs other.fs prims2x.fs random.fs \ - siteinit.fs \ + machpc.fs more.fs other.fs prims2x.fs random.fs \ + siteinit.fs table.fs \ tt.fs sokoban.fs \ - wordsets.fs \ + unbuffered.fs wordsets.fs \ test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs \ - test/other.fs test/checkans.fs test/CVS \ + test/other.fs test/checkans.fs \ bubble.fs siev.fs matrix.fs fib.fs \ - oof.fs oofsampl.fs objects.fs + oof.fs oofsampl.fs objects.fs objexamp.fs mini-oof.fs moof-exm.fs -COMPAT = compat/CVS compat/README compat/control.fs compat/anslocal.fs \ +COMPAT = compat/README compat/control.fs compat/anslocal.fs \ compat/struct.fs compat/loops.fs GFORTH_TEXI = doc/gforth.texi doc/version.texi ALLSUBDIRS = engine -ARCHS = arch/generic/machine.h \ +ARCHS = \ + arch/generic/machine.h \ arch/m68k/machine.h \ arch/mips/machine.h \ arch/386/machine.h \ arch/hppa/machine.h \ + arch/hppa/cache.c \ arch/sparc/machine.h \ arch/power/machine.h \ + arch/power/_sync_cache_range.c \ arch/alpha/machine.h \ arch/4stack/README \ arch/4stack/asm.fs \ @@ -259,30 +270,31 @@ ARCHS = arch/generic/machine.h \ arch/shboom/sh.p \ arch/shboom/doers.fs -SOURCES = CVS compat Makefile.in engine/Makefile.in gforthmi \ - configure.in configure config.sub config.guess \ - acconfig.h engine/config.h.in stamp-h.in \ +SOURCES = $(CVSDIRS) compat Makefile.in engine/Makefile.in gforthmi \ + 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 \ - COPYING Benchres aclocal.m4 \ - doc/gforth.ds doc/texinfo.tex doc/gforth.1 gforth.el \ + COPYING AUTHORS ChangeLog Benchres aclocal.m4 \ + doc/gforth.ds doc/texinfo.tex doc/gforth.1 doc/version.texi.in \ + gforth.el \ prim engine/engine.c engine/main.c engine/io.c engine/memcmpc.c \ $(ARCHS) \ - engine/cache.c engine/32bit.h \ engine/getopt.c engine/getopt1.c engine/getopt.h engine/select.c \ engine/ecvt.c engine/memcmp.c engine/strtol.c engine/strtoul.c \ engine/ansidecl.h engine/memmove.c \ engine/pow10.c engine/atanh.c engine/cleanalign.c \ - engine/strerror.c engine/strsignal.c engine/strsig.c engine/dblsub.c \ + engine/strerror.c engine/strsignal.c engine/dblsub.c \ INSTALL.DOS makefile.dos engine/makefile.dos mkdosmf.sed config.bat \ - dosconf.h gforthmi.bat startup.dos history.dos mkinstalldirs \ + dosconf.h gforthmi.bat mkinstalldirs \ + versions.bsh \ configure.cmd mkos2mf.sed os2conf.h makefile.os2 engine/makefile.os2 \ gforthmi.cmd glosgen.glo doc/glossaries.doc \ $(INCLUDES) $(FORTH_SRC) $(COMPAT) \ - testclean testdist testdist1 timings.sc + timings.sc RCS_FILES = ToDo model high-level -GEN = gforth gforth-ditc kernel/version.fs version-stamp +GEN = gforth$(EXE) gforth-ditc$(EXE) kernel/version.fs version-stamp # 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 @@ -291,12 +303,12 @@ FORTH_GEN = $(FORTH_GEN0) @KERNEL@ gfor FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ #distributed documentation -DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.ps +DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.txt doc/gforth.ps #stuff in a binonly distribution -BINONLYDIST = config.status Makefile gforth gforth-ditc \ +BINONLYDIST = config.status Makefile gforth$(EXE) gforth-ditc$(EXE) \ $(OBJECTS0) $(OBJECTS) $(OBJECTS_DITC)\ - arch/$(machine)/machine.h engine/config.h engione/Makefile \ + arch/$(machine)/machine.h engine/config.h engine/Makefile \ stamp-h kernel/version.fs version-stamp \ INSTALL.BINDIST @@ -326,10 +338,10 @@ version: Makefile.in # shell und file utilities. kernel/version.fs: version - $(MAKE) gforth - $(SHELL) versions.bsh $(VERSION) + $(MAKE) gforth$(EXE) + echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs -more: engine $(FORTH_GEN) gforth +more: engine $(FORTH_GEN) gforth$(EXE) #from the gcc Makefile: #"Deletion of files made during compilation. @@ -343,7 +355,8 @@ more: engine $(FORTH_GEN) gforth # `realclean' also deletes everything that could be regenerated automatically." mostlyclean: FORCE - -$(RM) -rf *.s gforth.fi *.fi~ *.fi- kernel/version.fs *TAGS \ + -$(RM) -rf engine/*.s gforth.fi *.fi~ *.fi- kernel/version.fs \ + *TAGS gforth~ \ doc/crossdoc.fd doc/doc.fd doc/gforth.texi doc/gforth.fns \ doc/gforth.aux doc/gforth.cp doc/gforth.cps \ doc/gforth.dvi doc/gforth.fn doc/gforth.ky doc/gforth.log \ @@ -352,11 +365,14 @@ mostlyclean: FORCE gforth-$(VERSION).tar.gz clean: mostlyclean - -$(RM) -rf $(GEN) *.o engine/*.o engine/*.a + -$(RM) -rf $(GEN) engine/gforth$(EXE) engine/gforth-ditc$(EXE) \ + *.o engine/*.o arch/*/*.o version distclean: clean - -$(RM) config.cache config.log \ - config.status engine/config.h Makefile engine/Makefile stamp-h + -$(RM) config.cache config.log config.status \ + engine/config.h Makefile engine/Makefile \ + stamp-h engine/stamp-h \ + doc/version.texi #realclean is useless, but dangerous, so it's commented out #realclean: distclean @@ -382,6 +398,10 @@ dosdist: $(SOURCES) $(FORTH_GEN0) @KERNE 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) @@ -443,11 +463,11 @@ binonlydist: $(SOURCES) $(FORTH_GEN0) @K #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 doc/gforth.1 prim gforth.TAGS installdirs +install: gforth$(EXE) $(FORTH_SRC) $(kernel_fi) gforth.fi doc/gforth.1 prim gforth.TAGS installdirs touch $(datadir)/gforth/site-forth/siteinit.fs - -$(RM) $(bindir)/gforth $(bindir)/gforth-$(VERSION) - $(INSTALL_PROGRAM) -s gforth $(bindir) - ln $(bindir)/gforth $(bindir)/gforth-$(VERSION) + -$(RM) $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) + $(INSTALL_PROGRAM) -s gforth$(EXE) $(bindir) + ln $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) -$(INSTALL_DATA) $(srcdir)/doc/gforth.1 $(man1dir) -for i in $(srcdir)/gforth.info*; do $(INSTALL_DATA) $$i $(infodir); done for i in $(FORTH_SRC) prim; do \ @@ -476,14 +496,16 @@ uninstall: FORCE -$(RM) -rf $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(bindir)/gforth-$(VERSION) @echo -e "Type\n$(RM) -rf $(bindir)/gforth $(man1dir)/gforth.1 $(infodir)/gforth.info* $(datadir)/gforth $(libdir)/gforth\nto remove Gforth completely" -check test: gforth gforth.fi +check test: gforth$(EXE) gforth.fi $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs -e bye $(FORTH) test/other.fs -e bye + @echo "Expect 'Missing: EKEY EKEY>CHAR EKEY? EMIT?'" + @echo "Expect 'Missing: EDITOR FORGET'" $(FORTH) code.fs test/checkans.fs -e bye @echo 'Expect no differences' $(FORTHK) -m 100000 prims2x.fs -e "s\" $(srcdir)/prim.b\"' output-c process-file bye"| diff -c - $(srcdir)/engine/prim.i -bench: gforth gforth.fi +bench: gforth$(EXE) gforth.fi @echo 'Each benchmark takes about 30s on a 486-66 (gcc-2.6.3 -DFORCE_REG)' time $(FORTH) siev.fs -e "main bye" time $(FORTH) bubble.fs -e "main bye" @@ -518,14 +540,18 @@ kernl64l.fi-: $(KERN_SRC) kernel/version kernl64b.fi-: $(KERN_SRC) kernel/version.fs mach64b.fs $(FORTH_GEN0) $(FORTHK) -e 's" mach64b.fs"' kernel/main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye" -kernl-%.fi: arch/%/mach.fs $(KERN_SRC) kernel/version.fs $(FORTH_GEN0) \ - arch/%/prim.fs arch/%/asm.fs +kernl-%.fi: arch/%/mach.fs \ + $(KERN_SRC) kernel/version.fs $(FORTH_GEN0) $(FORTHK) -e 's" $<"' kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye" if [ -f `echo $< | sed s/fs/sh/` ]; \ then sh `echo $< | sed s/fs/sh/` $@; \ else $(CP) $@- $@; \ fi +arch/%/mach.fs: arch/%/prim.fs + +arch/%/prim.fs: arch/%/asm.fs + kernl16b.fi: $(KERNLS) -$(CP) kernl16b.fi kernl16b.fi~ -$(CP) kernl16b.fi- kernl16b.fi @@ -554,7 +580,7 @@ kernl64l.fi: $(KERNLS) # -$(CP) $@ $@~ # -$(CP) $< $@ -gforth.fi: $(kernel_fi) gforthmi gforth gforth-ditc $(GFORTH_FI_SRC) +gforth.fi: $(kernel_fi) gforthmi gforth$(EXE) gforth-ditc$(EXE) $(GFORTH_FI_SRC) GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) startup.fs" $(srcdir)/gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) startup.fs # ------------- Make c-engine @@ -584,17 +610,18 @@ kernel/prim.fs: prim.b prims2x.fs kernel $(CP) $@- $@ $(RM) $@- -gforth: FORCE - -$(CP) gforth gforth~ - cd engine; make gforth; cd .. +gforth$(EXE): engines + -$(CP) gforth$(EXE) gforth~ $(CP) engine/$@ $@ @GFORTH_EXE@ -gforth-ditc: FORCE - cd engine; make gforth-ditc; cd .. +gforth-ditc$(EXE): engines $(CP) engine/$@ $@ @GFORTHDITC_EXE@ +engines: FORCE + cd engine && $(MAKE) gforth$(EXE) gforth-ditc$(EXE) + # ------------- additional C primitives %.c: %.pri prim2cl.fs @@ -619,8 +646,8 @@ prim.TAGS: prim.b prims2x.fs $(CP) $@- $@ $(RM) $@- -doc/doc.fd: doc/makedoc.fs $(GFORTH_FI_SRC) code.fs objects.fs oof.fs - $(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs startup.fs code.fs objects.fs oof.fs -e bye +doc/doc.fd: doc/makedoc.fs $(GFORTH_FI_SRC) code.fs objects.fs oof.fs mini-oof.fs + $(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs startup.fs code.fs objects.fs oof.fs mini-oof.fs -e bye doc/crossdoc.fd: $(KERN_SRC) kernel/version.fs $(FORTH_GEN0) $(FORTHK) -e 's" mach32l.fs"' kernel/main.fs -e bye @@ -632,7 +659,7 @@ doc/gforth.texi: doc/gforth.ds prim.b ds $(RM) $@- checkdoc: doc/gforth.ds prim.b ds2texi.fs prims2x.fs doc/doc.fd doc/crossdoc.fd answords.fs doc/gforth.texi - $(FORTHK) ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc process-file" doc/crossdoc.fd doc/doc.fd answords.fs -e bye + $(FORTHK) -m 1M ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc process-file" doc/crossdoc.fd doc/doc.fd answords.fs -e bye -grep unknown doc/gforth.texi dvi: doc/gforth.dvi @@ -649,11 +676,14 @@ doc/gforth.info doc/gforth.info-*: $(GFO -cd doc; $(MAKEINFO) gforth.texi html: $(GFORTH_TEXI) - -$(RM) html/* + -$(RMTREE) html -mkdir html cd html; $(TEXI2HTML) -menu -split_node ../doc/gforth.texi -doc: doc/gforth.ps html +doc/gforth.txt: $(GFORTH_TEXI) + -cd doc; $(MAKEINFO) --no-headers --no-split gforth.texi >gforth.txt + +doc: doc/gforth.ps html doc/gforth.txt # For an explanation of the following Makefile rules, see node # `Automatic Remaking' in GNU Autoconf documentation. @@ -664,22 +694,19 @@ aclocal.m4: acinclude.m4 configure.in aclocal # autoheader might not change config.h.in, so touch a stamp file. -config.h.in: stamp-h.in +engine/config.h.in: stamp-h.in stamp-h.in: configure.in acconfig.h cd $(srcdir) && autoheader echo timestamp > $(srcdir)/stamp-h.in engine/config.h: stamp-h -stamp-h: config.h.in config.status +stamp-h: engine/config.h.in config.status CONFIG_FILES=$@ CONFIG_HEADERS=engine/config.h ./config.status - echo > stamp-h + echo timestamp > stamp-h -Makefile: Makefile.in config.status +Makefile: Makefile.in engine/Makefile.in config.status CONFIG_FILES="$@ engine/$@" CONFIG_HEADERS=engine/config.h ./config.status -engine/Makefile: engine/Makefile.in config.status - CONFIG_FILES="$@ engine/$@" CONFIG_HEADERS=engine/config.h ./config.status - config.status: configure ./config.status --recheck @@ -696,14 +723,3 @@ makefile.os2: mkos2mf.sed Makefile.in en echo ' $$(GCC) $$(CFLAGS) -c $$<' >>makefile.os2 echo '%.o: %.c' >>engine/makefile.os2 echo ' $$(GCC) $$(CFLAGS) -c $$<' >>engine/makefile.os2 - -# Garbage: -# to be deleted! - -# history is a little bit different now! JAW -# history.dos: history.fs Makefile.in -# sed -e "s,~/\.gforth-history,/gforth.his,g" history.dos - -# startup.dos: startup.fs Makefile.in -# sed -e "s/\\\\ include doskey/include doskey/g" \ -# -e "s/include vt100key/\\\\ include vt100key/g" startup.dos