--- gforth/Makefile.in 2003/03/09 17:16:38 1.263 +++ gforth/Makefile.in 2005/12/31 15:46:07 1.313 @@ -1,6 +1,6 @@ #Makefile for Gforth -#Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc. +#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005 Free Software Foundation, Inc. #This file is part of Gforth. @@ -57,7 +57,8 @@ CP = cp -p MV = mv TAR = tar cf - INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_INFO = @INSTALL_INFO@ LN_S = @LN_S@ @@ -65,7 +66,7 @@ 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) @@ -75,7 +76,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 3 exboot.fs -e 'fpath= .|~+|$(srcdir)' +FORTHB = $(BUILDFORTH) exboot.fs -e 'fpath= .|~+|$(srcdir)' # the Forth system for running prims2x.fs FORTHP = $(FORTH) ENGINE_FAST = $(ENGINE)-fast @@ -85,10 +86,11 @@ FORTHK = $(ENGINE) $(FORTHKFLAGS) #FORTHP = $(ENGINE) --die-on-signal -i ./$(kernel_fi) #the "-2 image-included-files +!" undoes the change to image-included-files # in exboot.fs -STARTUP = -e 3 exboot.fs startup.fs @asm_fs@ @disasm_fs@ +STARTUP = 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 @@ -100,14 +102,16 @@ 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@ LDFLAGS = $(DEBUGFLAG) $(XLDFLAGS) LDLIBS = @LIBS@ -# ------------ Install Directorys +STACK_CACHE_DEFAULT_FAST = @STACK_CACHE_DEFAULT_FAST@ + +# ------------ Install Directories VPATH = @srcdir@ prefix = @prefix@ @@ -126,13 +130,17 @@ 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 \ 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 arch/sharc/CVS arch/ia64/CVS + arch/shboom/CVS arch/sharc/CVS arch/ia64/CVS arch/amd64/CVS \ + arch/arm/CVS INCLUDES = engine/forth.h engine/threaded.h engine/io.h @@ -172,7 +180,7 @@ KERN_SRC = \ kernel/doers.fs \ kernel/getdoers.fs \ kernel/pass.fs \ - kernel/groups.fs + kernel/xchars.fs EC_SRC = \ asm/README \ @@ -195,8 +203,10 @@ GFORTH_FI_SRC = \ blocks.fs \ bufio.fs \ code.fs \ + complex.fs \ debug.fs \ debugs.fs \ + dis-gdb.fs \ ekey.fs \ savesys.fs \ environ.fs \ @@ -205,6 +215,7 @@ GFORTH_FI_SRC = \ except.fs \ extend.fs \ float.fs \ + fft.fs \ glocals.fs \ hash.fs \ history.fs \ @@ -222,19 +233,22 @@ GFORTH_FI_SRC = \ stuff.fs \ tasker.fs \ termsize.fs \ + utf-8.fs \ vt100.fs \ vt100key.fs \ wordinfo.fs \ arch/386/asm.fs arch/386/disasm.fs \ - arch/alpha/asm.fs arch/alpha/disasm.fs \ - arch/mips/asm.fs arch/mips/disasm.fs arch/mips/insts.fs + arch/amd64/asm.fs arch/amd64/disasm.fs \ + arch/alpha/asm.fs arch/alpha/disasm.fs arch/alpha/testasm.fs\ + arch/mips/asm.fs arch/mips/disasm.fs arch/mips/insts.fs \ + arch/mips/testasm.fs arch/mips/testdisasm.fs 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 \ + depth-changes.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 \ + fsl-util.4th glosgen.fs gray.fs httpd.fs proxy.fs \ make-app.fs doc/makedoc.fs \ locate.fs more.fs other.fs prims2x.fs random.fs \ sokoban.fs string.fs table.fs tags.fs \ @@ -243,10 +257,11 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs \ test/string.fs test/float.fs test/gforth.fs \ test/other.fs test/signals.fs test/checkans.fs \ + test/primtest.fs test/coreext.fs \ 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 libffi.fs sieve.fs unix/socket.fs COMPAT = compat/README \ compat/anslocal.fs \ @@ -277,7 +292,10 @@ ARCHS = \ arch/power/machine.h \ arch/power/_sync_cache_range.c \ arch/alpha/machine.h \ + arch/arm/machine.h \ arch/ia64/machine.h \ + arch/ia64/flush_icache_block.c \ + arch/amd64/machine.h \ arch/4stack/README \ arch/4stack/asm.fs \ arch/4stack/mach.fs \ @@ -287,25 +305,13 @@ ARCHS = \ arch/misc/README \ arch/misc/asm.fs \ arch/misc/mach.fs \ + arch/misc/optcmove.fs \ arch/misc/prim.fs \ arch/misc/sim.fs \ arch/misc/sokoban.fs \ arch/misc/tt.fs \ - arch/6502/asm.fs \ arch/6502/prim.fs \ arch/6502/mach.fs \ - arch/6502/zero.fs \ - arch/6502/softuart.fs \ - arch/6502/cold.fs \ - arch/8086/asm.fs \ - arch/8086/mach.fs \ - arch/8086/mach.sh \ - arch/8086/prim.fs \ - arch/avr/asm.fs \ - arch/c165/asm.fs \ - arch/c165/mach.fs \ - arch/c165/prim.fs \ - arch/h8/asm.fs \ arch/shboom/asm.fs \ arch/shboom/compiler.fs \ arch/shboom/dis.fs \ @@ -317,11 +323,27 @@ ARCHS = \ arch/sharc/mach.fs \ arch/sharc/machine.h \ arch/sharc/compile.sharc \ - arch/sharc/unistd.h \ arch/sharc/systypes.h \ arch/sharc/types.h \ arch/sharc/g21k-3.3.4-bp1.diff +#not included in distribution until distribution terms are included: +ARCHS_NO_DIST = \ + arch/6502/asm.fs \ + arch/6502/cold.fs \ + arch/6502/softuart.fs \ + arch/6502/zero.fs \ + arch/8086/asm.fs \ + arch/8086/mach.fs \ + arch/8086/mach.sh \ + arch/8086/prim.fs \ + arch/avr/asm.fs \ + arch/c165/asm.fs \ + arch/c165/mach.fs \ + arch/c165/prim.fs \ + arch/h8/asm.fs \ + arch/sharc/unistd.h + VMGEN_EX = vmgen-ex/CVS vmgen-ex/Makefile vmgen-ex/README vmgen-ex/disasm.c \ vmgen-ex/engine.c vmgen-ex/fib.mini \ vmgen-ex/mini-inst.vmg vmgen-ex/mini-super.vmg vmgen-ex/mini.h \ @@ -333,7 +355,7 @@ VMGEN_EX = vmgen-ex/CVS vmgen-ex/Makefil VMGEN_EX2 = $(VMGEN_EX:vmgen-ex/%=vmgen-ex2/%) SOURCES = $(CVSDIRS) compat Makefile.in Makedist.in engine/Makefile.in \ - gforthmi.in vmgen.in README.vmgen NEWS.vmgen \ + gforthmi.in vmgen.in gfgen 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 \ @@ -342,12 +364,14 @@ SOURCES = $(CVSDIRS) compat Makefile.in doc/gforth.ds doc/texinfo.tex doc/gforth.1 doc/version.texi.in \ doc/vmgen.texi doc/fdl.texi doc/gpl.texi \ gforth.el \ - prim peeprules.vmg engine/engine.c engine/main.c \ + prim cache0.vmg cache1.vmg peeprules.vmg \ + engine/engine.c engine/main.c \ engine/io.c engine/support.c engine/signals.c \ $(ARCHS) \ engine/profile.c \ 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/ecvt.c engine/memcmp.c engine/rint.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/dblsub.c \ @@ -363,14 +387,24 @@ 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-itc$(EXE) $(PROFEXES) + +ENGINES_FAST = gforth-fast$(EXE) #gforth-native$(EXE) + +GEN = $(ENGINES) $(ENGINES_FAST) 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_ENGINE_FAST= \ + engine/prim-fast.i engine/prim_lab-fast.i engine/prim_names-fast.i \ + engine/prim_superend-fast.i engine/profile-fast.i \ + engine/prim_num-fast.i engine/prim_grp-fast.i \ + engine/costs-fast.i engine/super2-fast.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@ @@ -415,6 +449,8 @@ kernel/version.fs: version echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs more: engines $(FORTH_GEN) $(GEN) + @make check + @$(FORTH_FAST) --diag -e bye #from the gcc Makefile: #"Deletion of files made during compilation. @@ -446,16 +482,17 @@ 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 + doc/version.texi gforthmi vmgen \ + prim-fast.b $(FORTH_GEN_ENGINE_FAST) #realclean is useless, but dangerous, so it's commented out realclean: distclean @@ -469,11 +506,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$@ @@ -487,12 +529,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. @@ -507,14 +557,14 @@ install: gforth$(EXE) $(FORTH_SRC) $(ker -$(RM) $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforthmi $(bindir)/vmgen -$(RM) $(bindir)/gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE) -$(RM) $(bindir)/gforth-itc$(EXE) $(bindir)/gforth-itc-$(VERSION)$(EXE) - $(INSTALL_PROGRAM) -s gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) + $(INSTALL_PROGRAM) gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) (cd $(bindir) && $(LN_S) gforth-$(VERSION)$(EXE) gforth$(EXE)) - $(INSTALL_PROGRAM) -s gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE) + $(INSTALL_PROGRAM) gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE) (cd $(bindir) && $(LN_S) gforth-fast-$(VERSION)$(EXE) gforth-fast$(EXE)) - $(INSTALL_PROGRAM) -s gforth-itc$(EXE) $(bindir)/gforth-itc-$(VERSION)$(EXE) + $(INSTALL_PROGRAM) gforth-itc$(EXE) $(bindir)/gforth-itc-$(VERSION)$(EXE) (cd $(bindir) && $(LN_S) gforth-itc-$(VERSION)$(EXE) gforth-itc$(EXE)) - $(INSTALL_PROGRAM) gforthmi $(bindir)/gforthmi-$(VERSION) - $(INSTALL_PROGRAM) vmgen $(bindir)/vmgen-$(VERSION) + $(INSTALL_SCRIPT) gforthmi $(bindir)/gforthmi-$(VERSION) + $(INSTALL_SCRIPT) vmgen $(bindir)/vmgen-$(VERSION) $(INSTALL_PROGRAM) gforth-ditc $(libdir)/gforth/$(VERSION) (cd $(bindir) && $(LN_S) gforthmi-$(VERSION) gforthmi) (cd $(bindir) && $(LN_S) vmgen-$(VERSION) vmgen) @@ -530,7 +580,7 @@ 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 @@ -564,7 +614,7 @@ check: gforths gforth.fi @echo "*** Check successful ***" checkone test: gforth$(EXE) gforth.fi - $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs test/float.fs test/gforth.fs -e bye | tr -d '\015' | diff -c - $(srcdir)/test/coretest.out + $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs test/float.fs test/gforth.fs test/deferred.fs test/coreext.fs -e bye | tr -d '\015' | diff -c - $(srcdir)/test/coretest.out $(FORTH) test/other.fs -e bye $(FORTHS) test/signals.fs -e bye $(FORTH) code.fs test/checkans.fs -e bye | tr -d '\015' | diff -c - $(srcdir)/test/checkans.out @@ -572,6 +622,12 @@ checkone test: gforth$(EXE) gforth.fi "c-flag on s\" prim.i\" out-filename 2! s\" $(srcdir)/prim.b\" ' output-c ' output-c-combined process-file bye"| \ tr -d '\015' | diff -c - $(srcdir)/engine/prim.i +test/primtest.fi: test/primtest.fs mach32l.fs cross.fs + $(FORTHB) -e 's" mach32b.fs"' $(srcdir)/test/primtest.fs -e "save-cross $@ $(bindir)/gforth-$(VERSION) bye" + +primtest: gforth gforth-native test/primtest.fi FORCE + (echo rs|ENVVAR=bla ./gforth -i test/primtest.fi) && (echo rs|ENVVAR=bla ./gforth-native -i test/primtest.fi); echo $$? + bench: gforth-fast$(EXE) gforth.fi @echo 'Each benchmark takes about 30s on a 486-66 (gcc-2.6.3 -DFORCE_REG)' time $(FORTH_FAST) siev.fs -e "main bye" @@ -587,17 +643,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 @@ -628,12 +684,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 @@ -671,52 +727,23 @@ gforth.fi: $(kernel_fi) gforthmi gforth$ # ------------- Make c-engine -prim.b: prim peeprules.vmg - m4 -s $(srcdir)/prim >$@ - -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" >$@- - $(CP) $@- $@ - $(RM) $@- - -engine/prim_lab.i: prim.b prims2x.fs - $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-label dup process-file bye" >$@- - $(CP) $@- $@ - $(RM) $@- - -engine/prim_grp.i: prim.b prims2x.fs - $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' noop dup process-file bye" >$@- - $(CP) $@- $@ - $(RM) $@- +prim.b: prim cache0.vmg + m4 -s $(srcdir)/prim >$@ + sleep 1 #should make hpux-workaround unnecessary + +prim-fast.b: prim cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg peeprules.vmg + m4 -DSTACK_CACHE_FILE=cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg -s $(srcdir)/prim >$@ + sleep 1 #should make hpux-workaround unnecessary -engine/prim_names.i: prim.b prims2x.fs - $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-forthname dup process-file bye" >$@- - $(CP) $@- $@ - $(RM) $@- +$(FORTH_GEN_ENGINE_FAST): prim-fast.b prims2x.fs + GFORTH="$(FORTHP)" $(srcdir)/gfgen -fast -engine/prim_superend.i: prim.b prims2x.fs - $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-superend dup process-file bye" >$@- - $(CP) $@- $@ - $(RM) $@- - -engine/peephole.i: prim.b prims2x.fs - $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' noop ' output-peephole process-file bye" >$@- - $(CP) $@- $@ - $(RM) $@- - -engine/profile.i: prim.b prims2x.fs - $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-profile ' output-profile-combined 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" >$@- - $(CP) $@- $@ - $(RM) $@- +$(FORTH_GEN_ENGINE): prim.b prims2x.fs + GFORTH="$(FORTHP)" $(srcdir)/gfgen 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) $@- @@ -726,22 +753,16 @@ 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" >$@ - gforth$(EXE): engines -$(CP) gforth$(EXE) gforth~ $(CP) engine/$@ $@ @GFORTH_EXE@ -gforth-fast$(EXE): engines +gforth-fast$(EXE): engines-fast $(CP) engine/$@ $@ @GFORTHFAST_EXE@ -gforth-native$(EXE): engines +gforth-native$(EXE): engines-fast $(CP) engine/$@ $@ #@GFORTHX_EXE@ @@ -756,10 +777,13 @@ 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_FAST) 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) + +engines-fast: FORCE $(FORTH_GEN_ENGINE_FAST) engine/Makefile + cd engine && $(MAKE) $(ENGINES_FAST) # ------------- additional C primitives @@ -779,7 +803,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 @@ -831,12 +855,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 $@ @@ -865,7 +897,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. @@ -888,7 +920,7 @@ engine/config.h: stamp-h stamp-h: engine/config.h.in config.status ./config.status -Makedist engine/Makefile gforthmi vmgen machpc.fs doc/version.texi: Makefile.in Makedist.in engine/Makefile.in gforthmi.in vmgen.in machpc.fs.in doc/version.texi.in config.status configure.in +Makefile Makedist engine/Makefile gforthmi vmgen machpc.fs doc/version.texi: Makefile.in Makedist.in engine/Makefile.in gforthmi.in vmgen.in machpc.fs.in doc/version.texi.in config.status configure.in ./config.status config.status: configure