--- gforth/Makefile.in 2003/02/03 08:59:29 1.254 +++ gforth/Makefile.in 2003/09/08 13:03:05 1.280 @@ -1,6 +1,6 @@ #Makefile for Gforth -#Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc. +#Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc. #This file is part of Gforth. @@ -59,12 +59,13 @@ TAR = tar cf - INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +INSTALL_INFO = @INSTALL_INFO@ LN_S = @LN_S@ GCC = @CC@ CC = $(GCC) FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION) FORTHSIZES = @FORTHSIZES@ -FORTHS_ARGS = -p $(FORTHPATH)$(PATHSEP)$(srcdir) +FORTHS_ARGS = -p "$(FORTHPATH)$(PATHSEP)$(srcdir)" FORTH_ARGS = --die-on-signal $(FORTHS_ARGS) ENGINE = ./gforth FORTH = $(ENGINE) $(FORTH_ARGS) @@ -74,7 +75,7 @@ FORTHS = $(ENGINE) $(FORTHS_ARGS) # possible to override this variable at the command line for an initial build (jaw) BUILDFORTH = $(ENGINE) --die-on-signal -m 4M -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi) # the forth system plus flags we use to build -FORTHB = $(BUILDFORTH) -e 'fpath= .|~+|$(srcdir)' except.fs +FORTHB = $(BUILDFORTH) -e 3 exboot.fs -e 'fpath= .|~+|$(srcdir)' # the Forth system for running prims2x.fs FORTHP = $(FORTH) ENGINE_FAST = $(ENGINE)-fast @@ -87,7 +88,8 @@ FORTHK = $(ENGINE) $(FORTHKFLAGS) STARTUP = -e 3 exboot.fs startup.fs @asm_fs@ @disasm_fs@ STRIP = strip TEXI2DVI = texi2dvi -e -DVI2PS = dvips -Z +TEXI2PDF = texi2dvi --pdf -e +DVI2PS = dvips -t letterSize -Z #you can get texi2html from http://wwwcn.cern.ch/dci/texi2html/ MAKEINFO = makeinfo TEXI2HTML = texi2html @@ -99,7 +101,7 @@ XDEFINES = @DEFS@ SWITCHES = $(XCFLAGS) $(XDEFINES) #-DNDEBUG #turn off assertions ENGINE_FLAGS = @ENGINE_FLAGS@ -fno-defer-pop -fcaller-saves DEBUGFLAG = @DEBUGFLAG@ -CFLAGS = $(DEBUGFLAG) -I$(srcdir)/engine -I$(srcdir)/arch/$(machine) -O3 -Wall $(SWITCHES) -DDEFAULTPATH=\"$(FORTHPATH)\" +CFLAGS = $(DEBUGFLAG) -I$(srcdir)/engine -I$(srcdir)/arch/$(machine) -O3 -Wall $(SWITCHES) -DDEFAULTPATH='"$(FORTHPATH)"' #John Wavrik should use -Xlinker -N to get a writable text (executable) XLDFLAGS = @LDFLAGS@ @@ -125,6 +127,9 @@ man1ext= .1 emacssitelispdir=@lispdir@ siteforthdir=$(datadir)/gforth/site-forth +PROFOBJS = @PROFOBJS@ +PROFEXES = @PROFEXES@ + CVSDIRS = CVS engine/CVS kernel/CVS doc/CVS asm/CVS ec/CVS test/CVS \ compat/CVS unix/CVS \ arch/CVS arch/generic/CVS arch/m68k/CVS arch/mips/CVS \ @@ -170,8 +175,7 @@ KERN_SRC = \ kernel/saccept.fs \ kernel/doers.fs \ kernel/getdoers.fs \ - kernel/pass.fs \ - kernel/groups.fs + kernel/pass.fs EC_SRC = \ asm/README \ @@ -231,13 +235,13 @@ GFORTH_FI_SRC = \ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_SRC) \ ans-report.fs ansi.fs answords.fs \ colorize.fs comp-i.fs \ - doskey.fs ds2texi.fs \ + dosekey.fs doskey.fs ds2texi.fs \ envos.fs envos.dos envos.os2 etags.fs filedump.fs fi2c.fs \ glosgen.fs gray.fs httpd.fs proxy.fs \ make-app.fs doc/makedoc.fs \ - more.fs other.fs prims2x.fs random.fs \ - table.fs string.fs \ - tt.fs sokoban.fs \ + locate.fs more.fs other.fs prims2x.fs random.fs \ + sokoban.fs string.fs table.fs tags.fs \ + tt.fs \ unbuffer.fs wordsets.fs \ test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs \ test/string.fs test/float.fs test/gforth.fs \ @@ -245,7 +249,7 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) bubble.fs siev.fs matrix.fs fib.fs \ oof.fs oofsampl.fs objects.fs objexamp.fs mini-oof.fs moof-exm.fs \ moofglos.fs fixpath.fs \ - add.fs lib.fs sieve.fs unix/socket.fs + add.fs lib.fs oldlib.fs fflib.fs sieve.fs unix/socket.fs COMPAT = compat/README \ compat/anslocal.fs \ @@ -275,7 +279,6 @@ ARCHS = \ arch/sparc/machine.h \ arch/power/machine.h \ arch/power/_sync_cache_range.c \ - arch/power/elf32ppc.x \ arch/alpha/machine.h \ arch/ia64/machine.h \ arch/4stack/README \ @@ -336,10 +339,11 @@ SOURCES = $(CVSDIRS) compat Makefile.in gforthmi.in vmgen.in README.vmgen NEWS.vmgen \ configure.in configure config.sub config.guess elisp-comp missing \ engine/config.h.in stamp-h.in \ - iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS model \ + iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS \ + BUILD-FROM-SCRATCH model \ COPYING COPYING.DOC AUTHORS ChangeLog Benchres aclocal.m4 \ doc/gforth.ds doc/texinfo.tex doc/gforth.1 doc/version.texi.in \ - doc/vmgen.texi doc/fdl.texi \ + doc/vmgen.texi doc/fdl.texi doc/gpl.texi \ gforth.el \ prim peeprules.vmg engine/engine.c engine/main.c \ engine/io.c engine/support.c engine/signals.c \ @@ -362,14 +366,17 @@ SOURCES = $(CVSDIRS) compat Makefile.in RCS_FILES = ToDo model high-level -GEN = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) kernel/version.fs -#gforth-native$(EXE) gforth-prof$(EXE) +ENGINES = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) $(PROFEXES) #gforth-native$(EXE) + +GEN = $(ENGINES) kernel/version.fs # things that need a working forth system to be generated FORTH_GEN_ENGINE=engine/prim.i engine/prim_lab.i engine/prim_names.i \ engine/prim_superend.i engine/profile.i \ - engine/prim_num.i engine/prim_grp.i -FORTH_GEN0 = prim.b $(FORTH_GEN_ENGINE) kernel/aliases.fs kernel/prim.fs kernel/groups.fs + engine/prim_num.i engine/prim_grp.i \ + engine/costs.i engine/super2.i +FORTH_GEN_PRIMB = $(FORTH_GEN_ENGINE) kernel/aliases.fs kernel/prim.fs +FORTH_GEN0 = prim.b $(FORTH_GEN_PRIMB) FORTH_GEN = $(FORTH_GEN0) @KERNEL@ gforth.fi # this is used for antidependences, FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ @@ -378,7 +385,8 @@ FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ KERN_DEPS = $(KERN_SRC) kernel/version.fs machpc.fs $(FORTH_GEN0) compat/strcomp.fs #distributed documentation -DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.ps +DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.ps \ + doc/vmgen.info doc/vmgen.info-* doc/vmgen.ps KERNLS = kernl16b.fi- kernl16l.fi- \ kernl32b.fi- kernl32l.fi- \ @@ -444,13 +452,13 @@ docclean: FORCE doc/gforth.toc doc/gforth.tp doc/gforth.vr html clean: mostlyclean - -$(RM) -rf $(GEN) engine/gforth$(EXE) \ - engine/gforth-fast$(EXE) engine/gforth-native$(EXE) engine/gforth-itc$(EXE) \ - engine/gforth-ditc$(EXE) engine/gforth-prof$(EXE) \ - *.o engine/*.o arch/*/*.o version + -$(RM) -rf $(GEN) *.o engine/*.o arch/*/*.o version \ + engine/gforth$(EXE) engine/gforth-fast$(EXE) \ + engine/gforth-native$(EXE) engine/gforth-itc$(EXE) \ + engine/gforth-ditc$(EXE) engine/gforth-prof$(EXE) distclean: clean - -$(RM) config.cache config.log config.status \ + -$(RM) -rf config.cache config.log config.status \ engine/config.h Makefile Makedist engine/Makefile \ stamp-h engine/stamp-h \ doc/version.texi gforthmi vmgen @@ -467,11 +475,16 @@ virtualclean: mostlyclean #Some makes (Ultrix, SunOS, IRIX) are so broken, they cannot read the #Makefile if it contains our dist rules. Therefore we have put these #rules in Makedist (you can use them with GNU make on these systems). -dist: Makedist FORCE + +dist: Makedist machpc.fs FORCE + -sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' machpc.fs $(MAKE) -f Makedist d$@ + -$(RM) machpc.fs -dosdist: Makedist FORCE +dosdist: Makedist machpc.fs FORCE + -sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' machpc.fs $(MAKE) -f Makedist d$@ + -$(RM) machpc.fs srcdist: Makedist FORCE $(MAKE) -f Makedist d$@ @@ -485,12 +498,20 @@ docdist: Makedist FORCE htmldist: Makedist FORCE $(MAKE) -f Makedist d$@ -bindist: Makedist FORCE +bindist: Makedist machpc.fs FORCE + -sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' machpc.fs $(MAKE) -f Makedist d$@ + -$(RM) machpc.fs -binonlydist: Makedist FORCE +binonlydist: Makedist machpc.fs FORCE + -sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' machpc.fs $(MAKE) -f Makedist d$@ + -$(RM) machpc.fs +#HPUX make breaks the cycle differently when the dates are equal, so +# touch some of the files if it acts up +hpux-workaround: + touch $(FORTH_GEN_PRIMB) #strip gforth, because the debugging stuff is hardly useful once # gforth manages to execute more than a few primitives. @@ -517,7 +538,7 @@ install: gforth$(EXE) $(FORTH_SRC) $(ker (cd $(bindir) && $(LN_S) gforthmi-$(VERSION) gforthmi) (cd $(bindir) && $(LN_S) vmgen-$(VERSION) vmgen) -$(INSTALL_DATA) $(srcdir)/doc/gforth.1 $(man1dir) - -for i in $(srcdir)/doc/gforth.info*; do $(INSTALL_DATA) $$i $(infodir); done + -for i in $(srcdir)/doc/gforth.info* $(srcdir)/doc/vmgen.info*; do $(INSTALL_DATA) $$i $(infodir); done for i in $(FORTH_SRC) $(COMPAT) prim; do \ $(INSTALL_DATA) $(srcdir)/$$i $(datadir)/gforth/$(VERSION)/$$i; \ done @@ -528,12 +549,12 @@ install: gforth$(EXE) $(FORTH_SRC) $(ker echo ">>>>>Please install $(srcdir)/gforth.el in your .../emacs/site-lisp directory"; \ fi -$(RM) gforth.fi - GFORTHD="./gforth-ditc -p$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) $(STARTUP)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP) + GFORTHD="./gforth-ditc -p $(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) $(STARTUP)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP) $(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION) $(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS $(RM) gforth.fi install.TAGS - @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_INFO) --info-dir=$(infodir) $(infodir)/gforth.info + $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/vmgen.info install-strip: install @@ -585,17 +606,17 @@ onebench: all-bench: gforth-fast$(EXE) gforth$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) gforth.fi @echo "*** gforth-fast dynamic:" - @$(MAKE) onebench ENGINE_FAST="gforth-fast --dynamic" + @$(MAKE) onebench ENGINE_FAST="./gforth-fast --dynamic" @echo "*** gforth-fast not dynamic:" - @$(MAKE) onebench ENGINE_FAST="gforth-fast --no-dynamic" + @$(MAKE) onebench ENGINE_FAST="./gforth-fast --no-dynamic" @echo "*** gforth dynamic:" - @$(MAKE) onebench ENGINE_FAST="gforth --dynamic" + @$(MAKE) onebench ENGINE_FAST="./gforth --dynamic" @echo "*** gforth not dynamic:" - @$(MAKE) onebench ENGINE_FAST="gforth --no-dynamic" + @$(MAKE) onebench ENGINE_FAST="./gforth --no-dynamic" @echo "*** gforth-itc:" - @$(MAKE) onebench ENGINE_FAST=gforth-itc + @$(MAKE) onebench ENGINE_FAST=./gforth-itc @echo "*** gforth-ditc:" - @$(MAKE) onebench ENGINE_FAST=gforth-ditc + @$(MAKE) onebench ENGINE_FAST=./gforth-ditc # ------------- Make forth images @@ -626,12 +647,12 @@ kernl64b.fi-: $(KERN_DEPS) mach64b.fs $(FORTHB) -e 's" mach64b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye" #Solaris make does not like that: -#kernl-%.fi: arch/%/mach.fs arch/%/prim.fs arch/%/asm.fs $(KERN_SRC) kernel/version.fs $(FORTH_GEN0) -# $(FORTHB) -e 's" $<"' $(srcdir)/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 +@GNUMAKE@kernl-%.fi: arch/%/mach.fs arch/%/prim.fs arch/%/asm.fs $(KERN_SRC) kernel/version.fs $(FORTH_GEN0) +@GNUMAKE@ $(FORTHB) -e 's" $<"' $(srcdir)/kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye" +@GNUMAKE@ if [ -f `echo $< | sed s/fs/sh/` ]; \ +@GNUMAKE@ then sh `echo $< | sed s/fs/sh/` $@; \ +@GNUMAKE@ else $(CP) $@- $@; \ +@GNUMAKE@ fi #SunOS make does not like that #arch/%/mach.fs: arch/%/prim.fs arch/%/asm.fs @@ -670,7 +691,8 @@ gforth.fi: $(kernel_fi) gforthmi gforth$ # ------------- Make c-engine prim.b: prim peeprules.vmg - m4 -s $(srcdir)/prim >$@ + m4 -s $(srcdir)/prim >$@ + sleep 1 #should make hpux-workaround unnecessary engine/prim.i: prim.b prims2x.fs $(FORTHP) prims2x.fs -e "c-flag on s\" prim.i\" save-mem out-filename 2! s\" prim.b\" ' output-c ' output-c-combined process-file bye" >$@- @@ -707,14 +729,19 @@ engine/profile.i: prim.b prims2x.fs $(CP) $@- $@ $(RM) $@- +engine/super2.i: prim.b prims2x.fs + $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-super2 dup process-file bye" >$@- + $(CP) $@- $@ + $(RM) $@- + engine/costs.i: prim.b prims2x.fs - $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-costs dup process-file bye" >$@- + $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-costs-gforth-simple ' output-costs-gforth-combined process-file bye" >$@- $(CP) $@- $@ $(RM) $@- kernel/aliases.fs: prim.b prims2x.fs kernel/aliases0.fs $(CP) kernel/aliases0.fs $@- - $(FORTHP) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-alias dup process-file bye" >>$@- + $(FORTHP) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-alias ' noop process-file bye" >>$@- $(CP) $@- $@ $(RM) $@- @@ -724,9 +751,6 @@ kernel/prim.fs: prim.b prims2x.fs kernel $(CP) $@- $@ $(RM) $@- -kernel/groups.fs: engine/prim_grp.i - grep GROUP engine/prim_grp.i | cut -f2 -d, | sed -e 's/)/ ,/g' >$@ - engine/prim_num.i: prim.b prims2x.fs $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-c-prim-num ' noop process-file bye" >$@ @@ -754,10 +778,10 @@ gforth-ditc$(EXE): engines gforth-prof$(EXE): engines $(CP) engine/$@ $@ -gforths: gforth$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) #gforth-prof$(EXE) gforth-native$(EXE) +gforths: $(ENGINES) engines: FORCE $(FORTH_GEN_ENGINE) engine/Makefile - cd engine && $(MAKE) gforth$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) #gforth-prof$(EXE) gforth-native$(EXE) + cd engine && $(MAKE) $(ENGINES) # ------------- additional C primitives @@ -777,7 +801,7 @@ tags: gforth.tags $(CP) gforth.tags $@ install.TAGS: gforth.TAGS - sed 's:^\$(srcdir)/:$(datadir)/gforth/$(VERSION)/:' gforth.TAGS >install.TAGS + sed 's;^\$(srcdir)/;$(datadir)/gforth/$(VERSION)/;' gforth.TAGS >install.TAGS gforth.TAGS: @kernel_fi@ gforth$(EXE) $(GFORTH_FI_SRC) prim.TAGS kernel.TAGS $(FORTHK) etags.fs except.fs startup.fs -e bye @@ -829,12 +853,20 @@ checkdoc: doc/gforth.ds prim.b ds2texi.f dvi: doc/gforth.dvi doc/vmgen.dvi +pdf: doc/gforth.pdf doc/vmgen.pdf + doc/gforth.dvi doc/gforth.fns: $(GFORTH_TEXI) cd doc; $(TEXI2DVI) gforth.texi +doc/gforth.pdf: $(GFORTH_TEXI) + cd doc; $(TEXI2PDF) gforth.texi + doc/vmgen.dvi: $(VMGEN_TEXI) cd doc; $(TEXI2DVI) vmgen.texi +doc/vmgen.pdf: $(VMGEN_TEXI) + cd doc; $(TEXI2PDF) vmgen.texi + doc/gforth.ps: doc/gforth.dvi $(DVI2PS) doc/gforth.dvi -o $@ @@ -863,7 +895,7 @@ doc/gforth.txt: $(GFORTH_TEXI) doc/vmgen.txt: $(VMGEN_TEXI) -cd doc; $(MAKEINFO) --no-headers --no-split vmgen.texi >vmgen.txt -doc: info doc/gforth doc/vmgen doc/gforth.ps doc/vmgen.ps doc/gforth.txt doc/vmgen.txt TAGS +doc: gforth.fi info doc/gforth doc/vmgen doc/gforth.ps doc/vmgen.ps doc/gforth.txt doc/vmgen.txt TAGS # For an explanation of the following Makefile rules, see node # `Automatic Remaking' in GNU Autoconf documentation.