--- gforth/Makefile.in 2003/03/02 13:12:32 1.257 +++ gforth/Makefile.in 2003/08/17 22:52:33 1.273 @@ -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. @@ -65,7 +65,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 +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 @@ -88,7 +88,7 @@ FORTHK = $(ENGINE) $(FORTHKFLAGS) STARTUP = -e 3 exboot.fs startup.fs @asm_fs@ @disasm_fs@ STRIP = strip TEXI2DVI = texi2dvi -e -DVI2PS = dvips -Z +DVI2PS = dvips -t letterSize -Z #you can get texi2html from http://wwwcn.cern.ch/dci/texi2html/ MAKEINFO = makeinfo TEXI2HTML = texi2html @@ -100,7 +100,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@ @@ -171,8 +171,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 \ @@ -236,7 +235,7 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) 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 \ + locate.fs more.fs other.fs prims2x.fs random.fs \ sokoban.fs string.fs table.fs tags.fs \ tt.fs \ unbuffer.fs wordsets.fs \ @@ -246,7 +245,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 \ @@ -276,7 +275,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 \ @@ -364,14 +362,16 @@ 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) gforth-prof$(EXE) #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_GEN0 = prim.b $(FORTH_GEN_ENGINE) kernel/aliases.fs kernel/prim.fs FORTH_GEN = $(FORTH_GEN0) @KERNEL@ gforth.fi # this is used for antidependences, FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ @@ -447,13 +447,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 @@ -531,16 +531,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 - @$(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/gforth.info || \ - 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)/vmgen.info || \ - echo ">>>>> Please make an entry for Vmgen in your info dir file; e.g.:"; \ - echo "* Vmgen: (vmgen). Virtual machine interpreter generator" + $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/gforth.info + $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/vmgen.info install-strip: install @@ -592,17 +588,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 @@ -633,12 +629,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 @@ -714,14 +710,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) $@- @@ -731,9 +732,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" >$@ @@ -761,10 +759,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