--- gforth/Makefile.in 2007/09/22 15:11:36 1.367 +++ gforth/Makefile.in 2008/10/06 21:50:29 1.424 @@ -1,22 +1,21 @@ #Makefile for Gforth -#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006 Free Software Foundation, Inc. +#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008 Free Software Foundation, Inc. #This file is part of Gforth. #Gforth is free software; you can redistribute it and/or #modify it under the terms of the GNU General Public License -#as published by the Free Software Foundation; either version 2 +#as published by the Free Software Foundation, either version 3 #of the License, or (at your option) any later version. #This program is distributed in the hope that it will be useful, #but WITHOUT ANY WARRANTY; without even the implied warranty of -#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.#See the +#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #GNU General Public License for more details. #You should have received a copy of the GNU General Public License -#along with this program; if not, write to the Free Software -#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. +#along with this program. If not, see http://www.gnu.org/licenses/. # To change the values of `make' variables: instead of editing Makefiles, # (1) if the variable is set in `config.status', edit `config.status' @@ -67,6 +66,8 @@ INSTALL_INFO = @INSTALL_INFO@ LN_S = @LN_S@ M4 = @M4@ GCC = @CC@ +EMACS = emacs +PREFORTH = ./preforth -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" CC = $(GCC) FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION) FORTHSIZES = @FORTHSIZES@ @@ -83,7 +84,7 @@ BUILDFORTH = $(ENGINE) --die-on-signal - FORTHB = $(BUILDFORTH) exboot.fs -e 'fpath= .|~+|$(srcdir)' # the Forth system for running prims2x.fs FORTHP = $(FORTH) -ENGINE_FAST = $(ENGINE)-fast +ENGINE_FAST = ./gforth-fast FORTH_FAST = $(ENGINE_FAST) $(FORTH_ARGS) FORTHKFLAGS= --die-on-signal -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi) FORTHK = $(ENGINE) $(FORTHKFLAGS) @@ -103,16 +104,18 @@ TEXI2HTML = texi2html XCFLAGS = @CFLAGS@ XDEFINES = @DEFS@ -SWITCHES = $(XCFLAGS) $(XDEFINES) #-DNDEBUG #turn off assertions +SWITCHES = $(XCFLAGS) $(XDEFINES) $(OPTDEFINES) #-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)"' +CPPFLAGS = @CPPFLAGS@ #John Wavrik should use -Xlinker -N to get a writable text (executable) XLDFLAGS = @LDFLAGS@ LDFLAGS = $(DEBUGFLAG) $(XLDFLAGS) LDLIBS = @LIBS@ +STACK_CACHE_REGS = @STACK_CACHE_REGS@ STACK_CACHE_DEFAULT_FAST = @STACK_CACHE_DEFAULT_FAST@ # ------------ Install Directories @@ -123,9 +126,11 @@ exec_prefix = @exec_prefix@ srcdir = @srcdir@ bindir = @bindir@ #read-only architecture-independent files +datarootdir = @datarootdir@ datadir = @datadir@ #read-only architecture-dependent non-ascii files libdir = @libdir@ +libccdir = $(libdir)/gforth/$(VERSION)/libcc-named/ includedir = @includedir@ infodir = @infodir@ htmldir = @htmldir@ @@ -226,6 +231,7 @@ GFORTH_FI_SRC = \ hash.fs \ history.fs \ intcomp.fs \ + mkdir.fs \ libcc.fs \ locals.fs \ look.fs \ @@ -252,7 +258,13 @@ GFORTH_FI_SRC = \ arch/mips/testasm.fs arch/mips/testdisasm.fs \ arch/power/asm.fs arch/power/disasm.fs arch/power/inst.fs -FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_SRC) \ +LIBCC_SRC = cstr.fs unix/socket.fs + +LIBCC_DIST_SRC = libffi.fs fflib.fs $(LIBCC_SRC) + +LIBCC_BUILD_SRC = @LIBCC_BUILD_SRC@ $(LIBCC_SRC) + +FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_SRC) $(LIBCC_DIST_SRC) \ ans-report.fs ansi.fs answords.fs \ colorize.fs comp-i.fs complex.fs \ depth-changes.fs dosekey.fs doskey.fs ds2texi.fs \ @@ -265,14 +277,14 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) unbuffer.fs wordsets.fs xwords.fs \ test/tester.fs test/ttester.fs \ test/coretest.fs test/postpone.fs test/dbltest.fs \ - test/string.fs test/float.fs test/gforth.fs \ + test/string.fs test/float.fs test/search.fs test/gforth.fs \ test/other.fs test/signals.fs test/checkans.fs \ test/primtest.fs test/coreext.fs test/deferred.fs \ test/coremore.fs test/gforth-nofast.fs test/libcc.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 oldlib.fs fflib.fs libffi.fs sieve.fs unix/socket.fs \ + add.fs lib.fs oldlib.fs sieve.fs \ endtry-iferror.fs recover-endtry.fs COMPAT = compat/README \ @@ -296,7 +308,6 @@ ALLSUBDIRS = engine ARCHS = \ arch/generic/machine.h \ - arch/generic/128bit.h \ arch/m68k/machine.h \ arch/mips/machine.h \ arch/386/machine.h \ @@ -308,8 +319,7 @@ ARCHS = \ arch/alpha/machine.h \ arch/arm/machine.h \ arch/arm/cacheflush0.c \ - arch/arm/cacheflush1.c \ - arch/arm/cacheflush2.c \ + arch/arm/cacheflush-linux.c \ arch/ia64/machine.h \ arch/ia64/flush_icache_block.c \ arch/amd64/machine.h \ @@ -344,14 +354,8 @@ ARCHS = \ arch/sharc/types.h \ arch/sharc/g21k-3.3.4-bp1.diff \ arch/r8c/asm.fs \ - arch/r8c/asm-test.fs \ - arch/r8c/prim.fs \ - arch/r8c/errors.fs \ - arch/r8c/tt.fs \ - arch/r8c/tasker.fs \ - arch/r8c/lauflicht.fs \ - arch/r8c/terminal.fs \ - arch/r8c/mach.fs + arch/r8c/mach.fs \ + arch/r8c/prim.fs #not included in distribution until distribution terms are included: ARCHS_NO_DIST = \ @@ -368,6 +372,12 @@ ARCHS_NO_DIST = \ arch/c165/mach.fs \ arch/c165/prim.fs \ arch/h8/asm.fs \ + arch/r8c/asm-test.fs \ + arch/r8c/errors.fs \ + arch/r8c/lauflicht.fs \ + arch/r8c/tasker.fs \ + arch/r8c/terminal.fs \ + arch/r8c/tt.fs \ arch/sharc/unistd.h VMGEN_EX = vmgen-ex/CVS vmgen-ex/Makefile vmgen-ex/README vmgen-ex/disasm.c \ @@ -380,21 +390,10 @@ 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 gfgen README.vmgen NEWS.vmgen \ - configure.in configure config.sub config.guess elisp-comp missing \ - engine/config.h.in stamp-h.in envos.fs.in \ - iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS \ - BUILD-FROM-SCRATCH model \ - COPYING COPYING.LIB COPYING.DOC AUTHORS ChangeLog Benchres aclocal.m4 \ - doc/gforth.ds doc/gforth.1 doc/version.texi.in \ - doc/vmgen.texi doc/fdl.texi doc/gpl.texi \ - gforth.el \ - prim cache0.vmg cache1.vmg peeprules.vmg \ +ENGINE_SOURCES = engine/Makefile.in engine/config.h.in \ engine/engine.c engine/main.c \ engine/io.c engine/support.c engine/signals.c engine/libcc.h.in \ - $(ARCHS) \ - engine/profile.c \ + engine/profile.c engine/128bit.h \ engine/getopt.c engine/getopt1.c engine/getopt.h engine/select.c \ engine/ecvt.c engine/memcmp.c engine/rint.c \ engine/strtol.c engine/strtoul.c \ @@ -402,23 +401,36 @@ SOURCES = $(CVSDIRS) compat Makefile.in engine/pow10.c engine/atanh.c engine/cleanalign.c \ engine/strerror.c engine/strsignal.c engine/dblsub.c \ engine/fnmatch.h engine/fnmatch.c \ - INSTALL.DOS makefile.dos engine/makefile.dos mkdosmf.sed config.bat \ + engine/makefile.dos engine/makefile.os2 + +SOURCES = $(CVSDIRS) $(ENGINE_SOURCES) compat Makefile.in Makedist.in \ + gforthmi.in vmgen.in preforth.in gfgen README.vmgen NEWS.vmgen \ + autogen.sh configure.in configure config.sub config.guess \ + elisp-comp missing stamp-h.in envos.fs.in \ + iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS \ + BUILD-FROM-SCRATCH model \ + COPYING COPYING.LIB COPYING.DOC AUTHORS ChangeLog Benchres aclocal.m4 \ + doc/gforth.ds doc/gforth.1 doc/version.texi.in \ + doc/vmgen.texi doc/fdl.texi doc/gpl.texi \ + gforth.el \ + $(ARCHS) \ + INSTALL.DOS makefile.dos mkdosmf.sed config.bat \ dosconf.h gforthmi.bat mkinstalldirs siteinit.fs \ versions.bsh \ - configure.cmd mkos2mf.sed os2conf.h makefile.os2 engine/makefile.os2 \ + configure.cmd mkos2mf.sed os2conf.h makefile.os2 \ gforthmi.cmd glosgen.glo doc/glossaries.doc \ $(INCLUDES) $(FORTH_SRC) $(COMPAT) $(VMGEN_EX) $(VMGEN_EX2) \ timings.sc \ test/coretest.out test/checkans.out test/gforth.out \ - cache-fast*.vmg + cache*.vmg peeprules.vmg prim RCS_FILES = ToDo model high-level ENGINES = gforth$(EC)$(EXE) gforth-ditc$(EC)$(EXE) gforth-itc$(EC)$(EXE) $(PROFEXES) -ENGINES_FAST = gforth-fast$(EC)$(EXE) #gforth-native$(EXE) +ENGINES_FAST = gforth-fast$(OPT)$(EC)$(EXE) #gforth-native$(OPT)$(EC)$(EXE) -GEN = $(ENGINES) $(ENGINES_FAST) kernel/version.fs gforth.elc +GEN = $(ENGINES) $(ENGINES_FAST) gforth.elc # things that need a working forth system to be generated FORTH_GEN_ENGINE=engine/prim.i engine/prim_lab.i engine/prim_names.i \ @@ -437,16 +449,21 @@ FORTH_GEN = $(FORTH_GEN0) @KERNEL@ gfor FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ build-ec #kernel dependencies -KERN_DEPS = $(KERN_SRC) kernel/version.fs machpc.fs $(FORTH_GEN0) compat/strcomp.fs gforth$(EXE) +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 \ doc/vmgen.info doc/vmgen.ps +BKERNLS = kernl16b$(EC).fi kernl16l$(EC).fi \ + kernl32b$(EC).fi kernl32l$(EC).fi \ + kernl64b$(EC).fi kernl64l$(EC).fi + KERNLS = kernl16b$(EC).fi- kernl16l$(EC).fi- \ kernl32b$(EC).fi- kernl32l$(EC).fi- \ kernl64b$(EC).fi- kernl64l$(EC).fi- +# ------------- Make forth images GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) \ doc/gforth.texi doc/gforth.dvi doc/gforth.ps \ doc/vmgen.dvi doc/vmgen.ps \ @@ -456,8 +473,7 @@ GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) \ .SUFFIXES: .SUFFIXES: .c .o - -all: kernel/version.fs more +all: kernel/version.fs more # use this dependency for phony targets just as mostlyclean,... FORCE: ; @@ -474,9 +490,8 @@ version: Makefile.in configure.in kernel/version.fs: version echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs -more: engines $(FORTH_GEN) $(GEN) - @make check - @$(FORTH_FAST) --diag -e bye +more: $(ENGINES) $(FORTH_GEN) $(GEN) + @$(MAKE) check #from the gcc Makefile: #"Deletion of files made during compilation. @@ -508,28 +523,31 @@ docclean: FORCE doc/gforth.toc doc/gforth.tp doc/gforth.vr html clean: mostlyclean - -$(RM) -rf $(GEN) *.o engine/*.o arch/*/*.o version \ - engine/gforth$(EC)$(EXE) engine/gforth-fast$(EC)$(EXE) \ - engine/gforth-native$(EC)$(EXE) engine/gforth-itc$(EC)$(EXE) \ - engine/gforth-ditc$(EC)$(EXE) engine/gforth-prof$(EC)$(EXE) \ - engine/prim-s.i + -$(RM) -rf $(GEN) *.o engine/*.o arch/*/*.o version \ + gforth-itc-noll$(EC)$(EXE) engine/gforth-itc-noll$(EC)$(EXE) \ + gforth-ditc-noll$(EC)$(EXE) engine/gforth-ditc-noll$(EC)$(EXE) \ + gforth-prof-noll$(EC)$(EXE) engine/gforth-prof-noll$(EC)$(EXE) \ + engine/prim-s.i + for i in gforth gforth-fast gforth-native; do for j in $(OPTS); do rm -f engine/$$i$${j}$(EC)$(EXE) $$i$${j}$(EC)$(EXE); done; done distclean: clean -$(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 preforth \ prim-fast.b $(FORTH_GEN_ENGINE_FAST) #realclean is useless, but dangerous, so it's commented out realclean: distclean - -$(RM) $(GEN_PRECIOUS) + -$(RM) -rf $(GEN_PRECIOUS) `cat .cvsignore` #mostlyclean, but also remove some of the stuff that is distributed virtualclean: mostlyclean -$(RM) -rf gforth.fns gforth.texi gforth.ps gforth.info* \ gforth-$(VERSION).tar.gz config.cache *~ */*~ +maintainer-clean: realclean + #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). @@ -598,16 +616,18 @@ install: gforth$(EC)$(EXE) $(FORTH_SRC) done $(INSTALL_DATA) $(kernel_fi) $(DESTDIR)$(datadir)/gforth/$(VERSION) @if test -d "$(DESTDIR)$(emacssitelispdir)"; then \ + $(INSTALL_DATA) gforth.el $(DESTDIR)$(emacssitelispdir); \ $(INSTALL_DATA) gforth.elc $(DESTDIR)$(emacssitelispdir); \ else \ - echo ">>>>>Please install gforth.elc in your .../emacs/site-lisp directory"; \ + echo '>>>>>Please install gforth.{el,elc} in your .../emacs/site-lisp directory'; \ fi -$(RM) gforth.fi - GFORTHD="./gforth-ditc -p $(DESTDIR)$(libdir)/gforth/site-forth$(PATHSEP)$(DESTDIR)$(siteforthdir)$(PATHSEP)$(DESTDIR)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) $(STARTUP)" includedir=$(includedir) bindir=$bindir GFORTHPATH=.:"$$GFORTHPATH" GFORTHDESTDIR="$(DESTDIR)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP) + GFORTHD="./gforth-ditc -p $(DESTDIR)$(libdir)/gforth/site-forth$(PATHSEP)$(DESTDIR)$(siteforthdir)$(PATHSEP)$(DESTDIR)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) $(STARTUP)" includedir=$(includedir) bindir=$(bindir) libccdir=$(libccdir) GFORTHPATH=.:"$$GFORTHPATH" GFORTHDESTDIR="$(DESTDIR)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP) $(INSTALL_DATA) gforth.fi $(DESTDIR)$(libdir)/gforth/$(VERSION) $(INSTALL_DATA) install.TAGS $(DESTDIR)$(datadir)/gforth/$(VERSION)/TAGS $(RM) gforth.fi install.TAGS $(INSTALL_DATA) include/gforth/$(VERSION)/* $(DESTDIR)$(includedir)/gforth/$(VERSION) + for i in $(LIBCC_BUILD_SRC); do @GNU_LIBTOOL@ --silent --mode=install $(INSTALL) lib/gforth/$(VERSION)/libcc-named/`basename $$i .fs`.la $(DESTDIR)$(libccdir)`basename $$i .fs`.la; done $(POST_INSTALL) $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gforth.info #$(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/vmgen.info @@ -616,7 +636,7 @@ install-strip: install installdirs: mkinstalldirs $(NORMAL_INSTALL) - for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir) $(includedir)/gforth/$(VERSION); do \ + for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir) $(includedir)/gforth/$(VERSION) $(libccdir); do \ $(srcdir)/mkinstalldirs $(DESTDIR)$$i; \ done for i in $(CVSDIRS); do \ @@ -631,17 +651,24 @@ uninstall: FORCE -$(RM) -rf $(DESTDIR)$(libdir)/gforth/$(VERSION) $(DESTDIR)$(datadir)/gforth/$(VERSION) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforthmi-$(VERSION) $(DESTDIR)(bindir)/vmgen-$(VERSION) $(DESTDIR)$(includedir)/gforth/$(VERSION) @echo -e "To remove Gforth completely, type\n$(RM) -rf $(DESTDIR)$(bindir)/gforth$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-fast$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc$(EC)$(EXE) $(DESTDIR)$(bindir)/gforthmi $(DESTDIR)$(bindir)/vmgen $(DESTDIR)$(man1dir)/gforth.1 $(DESTDIR)$(infodir)/gforth.info* $(DESTDIR)$(datadir)/gforth $(DESTDIR)$(libdir)/gforth" -check: gforths gforth.fi +check-libcc-named: $(LIBCC_BUILD_SRC) + $(RMTREE) lib/gforth/$(VERSION)/libcc-named/ + $(srcdir)/mkinstalldirs lib/gforth/$(VERSION)/libcc-named/ + for i in $(LIBCC_BUILD_SRC); do ./gforth -e "s\" `pwd`/lib/gforth/$(VERSION)/libcc-named/\" libcc-named-dir-v 2! libcc-path clear-path libcc-named-dir libcc-path also-path :noname 2drop s\" $(libccdir)\" ; is replace-rpath" $$i -e bye; done + +check: gforths gforth.fi $(MAKE) checkone check-nofast ENGINE="./gforth --no-dynamic" >/dev/null 2>&1 $(MAKE) checkone check-nofast ENGINE="./gforth-itc" >/dev/null 2>&1 $(MAKE) checkone check-nofast ENGINE="./gforth-ditc" >/dev/null 2>&1 $(MAKE) checkone ENGINE="./gforth-fast --no-dynamic" >/dev/null 2>&1 $(MAKE) checkone check-nofast ENGINE="./gforth" >/dev/null 2>&1 $(MAKE) checkone ENGINE="./gforth-fast" >/dev/null 2>&1 + $(MAKE) check-libcc-named @echo "*** Check successful ***" + ./gforth-fast --diag -e bye -checkone test: gforth$(EC)$(EXE) gforth.fi engine/prim-s.i - $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs test/float.fs test/deferred.fs test/coreext.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/coretest.out +checkone test: gforth.fi engine/prim-s.i + $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs test/float.fs test/deferred.fs test/coreext.fs test/search.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/coretest.out $(FORTH) test/other.fs -e bye $(FORTHS) test/signals.fs -e bye $(FORTHS) test/coremore.fs test/gforth.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/gforth.out @@ -650,7 +677,7 @@ checkone test: gforth$(EC)$(EXE) gforth. "c-flag on s\" prim.i\" out-filename 2! s\" $(srcdir)/prim.b\" ' output-c ' output-c-combined process-file bye"| \ tr -d '\015' | grep -v '^#line '|diff -c - engine/prim-s.i -check-nofast: gforth$(EC)$(EXE) gforth.fi +check-nofast: gforth.fi $(FORTHS) test/gforth-nofast.fs -e bye test/primtest.fi: test/primtest.fs mach32l.fs cross.fs @@ -669,7 +696,7 @@ bench: gforth-fast$(EC)$(EXE) gforth.fi onebench one-bench: $(FORTH_FAST) onebench.fs -all-bench allbench: gforth-fast$(EC)$(EXE) gforth$(EC)$(EXE) gforth-itc$(EC)$(EXE) gforth-ditc$(EC)$(EXE) gforth.fi +all-bench allbench: ./gforth-fast --dynamic onebench.fs ./gforth-fast --no-dynamic onebench.fs ./gforth --dynamic onebench.fs @@ -688,26 +715,26 @@ all-bench allbench: gforth-fast$(EC)$(EX # these are the ones we want to use now kernl16l$(EC).fi-: $(KERN_DEPS) mach16l.fs - $(FORTHB) -e 's" mach16l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16l$(EC).fi- $(bindir)/gforth-$(VERSION) bye" + $(PREFORTH) -e 's" mach16l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16l$(EC).fi- $(bindir)/gforth-$(VERSION) bye" kernl16b$(EC).fi-: $(KERN_DEPS) mach16b.fs - $(FORTHB) -e 's" mach16b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16b$(EC).fi- $(bindir)/gforth-$(VERSION) bye" + $(PREFORTH) -e 's" mach16b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16b$(EC).fi- $(bindir)/gforth-$(VERSION) bye" kernl32l$(EC).fi-: $(KERN_DEPS) mach32l.fs - $(FORTHB) -e 's" mach32l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl32l$(EC).fi- $(bindir)/gforth-$(VERSION) bye" + $(PREFORTH) -e 's" mach32l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl32l$(EC).fi- $(bindir)/gforth-$(VERSION) bye" kernl32b$(EC).fi-: $(KERN_DEPS) mach32b.fs - $(FORTHB) -e 's" mach32b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl32b$(EC).fi- $(bindir)/gforth-$(VERSION) bye" + $(PREFORTH) -e 's" mach32b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl32b$(EC).fi- $(bindir)/gforth-$(VERSION) bye" kernl64l$(EC).fi-: $(KERN_DEPS) mach64l.fs - $(FORTHB) -e 's" mach64l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64l$(EC).fi- $(bindir)/gforth-$(VERSION) bye" + $(PREFORTH) -e 's" mach64l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64l$(EC).fi- $(bindir)/gforth-$(VERSION) bye" kernl64b$(EC).fi-: $(KERN_DEPS) mach64b.fs - $(FORTHB) -e 's" mach64b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64b$(EC).fi- $(bindir)/gforth-$(VERSION) bye" + $(PREFORTH) -e 's" mach64b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64b$(EC).fi- $(bindir)/gforth-$(VERSION) bye" #Solaris make does not like that: @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@ $(PREFORTH) -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) $@- $@; \ @@ -744,8 +771,8 @@ kernl64l$(EC).fi: $(KERNLS) # -$(CP) $@ $@~ # -$(CP) $< $@ -gforth.fi: $(kernel_fi) gforthmi gforth$(EC)$(EXE) gforth-ditc$(EC)$(EXE) $(GFORTH_FI_SRC) comp-i.fs - GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc --die-on-signal -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) $(STARTUP)" includedir=`pwd`/include bindir=`pwd` ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) $(STARTUP) +gforth.fi: $(kernel_fi) gforthmi gforth-ditc$(EC)$(EXE) $(GFORTH_FI_SRC) comp-i.fs + GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc --die-on-signal -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) $(STARTUP)" includedir=`pwd`/include bindir=`pwd` libccdir=`pwd`/lib/gforth/$(VERSION)/libcc-named/ ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) $(STARTUP) # ------------- Make c-engine @@ -753,73 +780,97 @@ prim.b: prim cache0.vmg $(M4) -Dcondbranch_opt=0 $(srcdir)/prim >$@ sleep 1 #should make hpux-workaround unnecessary -prim-fast.b: prim cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg peeprules.vmg Makefile.in - $(M4) -Dcondbranch_opt=@condbranch_opt@ -DSTACK_CACHE_FILE=cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg $(srcdir)/prim >$@ +prim-fast.b: prim cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg cache-regs$(STACK_CACHE_REGS).vmg peeprules.vmg Makefile + $(M4) -Dcondbranch_opt=@condbranch_opt@ -DSTACK_CACHE_FILE=cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg -DSTACK_CACHE_REGS=cache-regs$(STACK_CACHE_REGS).vmg $(srcdir)/prim >$@ sleep 1 #should make hpux-workaround unnecessary $(FORTH_GEN_ENGINE_FAST): prim-fast.b prims2x.fs - GFORTH="$(FORTHP)" $(srcdir)/gfgen -fast + GFORTH="$(PREFORTH)" $(srcdir)/gfgen -fast $(FORTH_GEN_ENGINE): prim.b prims2x.fs - GFORTH="$(FORTHP)" $(srcdir)/gfgen + GFORTH="$(PREFORTH)" $(srcdir)/gfgen engine/prim-s.i: engine/prim.i grep -v '^#line ' $(srcdir)/engine/prim.i >$@ 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 ' noop process-file bye" >>$@- + $(PREFORTH) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-alias ' noop process-file bye" >>$@- $(CP) $@- $@ $(RM) $@- kernel/prim.fs: prim.b prims2x.fs kernel/prim0.fs $(CP) kernel/prim0.fs kernel/prim.fs- - $(FORTHP) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-forth ' output-forth-combined process-file bye" >>$@- + $(PREFORTH) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-forth ' output-forth-combined process-file bye" >>$@- $(CP) $@- $@ $(RM) $@- -gforth$(EC)$(EXE): engines - -$(CP) gforth$(EC)$(EXE) gforth~ - $(CP) engine/$@ $@ - -$(MASSAGE_EXE) $@ - @GFORTH_EXE@ -gforth-fast$(EC)$(EXE): engines-fast - $(CP) engine/$@ $@ - -$(MASSAGE_EXE) $@ - @GFORTHFAST_EXE@ +OPTS = @OPTS@ -gforth-native$(EC)$(EXE): engines-fast +MAKELINE-ll-reg = OPT=-ll-reg OPTDEFINES="-DFORCE_LL -DFORCE_REG" OPTOBJECTS= +MAKELINE-noll-reg = OPT=-noll-reg OPTDEFINES=-DFORCE_REG OPTOBJECTS=dblsub.o +MAKELINE-ll = OPT=-ll OPTDEFINES=-DFORCE_LL OPTOBJECTS= +MAKELINE-noll = OPT=-noll OPTDEFINES= OPTOBJECTS=dblsub.o + +gforth$(OPT)$(EC)$(EXE): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/config.h @kernel_anti_dependence@ + if test -z "$(OPT)"; then \ + for i in $(OPTS); do $(MAKE) optgforth OPT=$$i && $(CP) gforth$${i}$(EC)$(EXE) $@ && break; done; \ + else \ + ( cd engine && $(MAKE) $@ ) && \ + $(CP) engine/$@ $@ && \ + $(MASSAGE_EXE) $@; \ + @GFORTH_EXE@; \ + $(MAKE) checkone check-nofast ENGINE=./engine/$@; \ + fi + +optgforth: + $(MAKE) gforth$(OPT)$(EC)$(EXE) $(MAKELINE$(OPT)) + +gforth-fast$(OPT)$(EC)$(EXE): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE_FAST) engine/config.h + if test -z "$(OPT)"; then \ + for i in $(OPTS); do $(MAKE) optgforth-fast OPT=$$i && $(CP) gforth-fast$${i}$(EC)$(EXE) $@ && break; done; \ + else \ + ( cd engine && $(MAKE) $@ ) && \ + $(CP) engine/$@ $@ && \ + $(MASSAGE_EXE) $@; \ + @GFORTHFAST_EXE@; \ + $(MAKE) checkone ENGINE=./engine/$@; \ + fi + +optgforth-fast: + $(MAKE) gforth-fast$(OPT)$(EC)$(EXE) $(MAKELINE$(OPT)) + +gforth-native$(OPT)$(EC)$(EXE): engines-fast $(CP) engine/$@ $@ -$(MASSAGE_EXE) $@ #@GFORTHX_EXE@ -gforth-itc$(EC)$(EXE): engines - $(CP) engine/$@ $@ +gforth-itc$(EC)$(EXE): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h + cd engine && $(MAKE) gforth-itc-noll$(EC)$(EXE) $(MAKELINE-noll) + $(CP) engine/gforth-itc-noll$(EC)$(EXE) $@ @GFORTHITC_EXE@ -gforth-ditc$(EC)$(EXE): engines - $(CP) engine/$@ $@ +gforth-ditc$(EC)$(EXE): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h + cd engine && $(MAKE) gforth-ditc-noll$(EC)$(EXE) $(MAKELINE-noll) + $(CP) engine/gforth-ditc-noll$(EC)$(EXE) $@ @GFORTHDITC_EXE@ -gforth-prof$(EC)$(EXE): engines - $(CP) engine/$@ $@ +gforth-prof$(EC)$(EXE): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h + cd engine && $(MAKE) gforth-prof-noll$(EC)$(EXE) $(MAKELINE-noll) + $(CP) engine/gforth-prof-noll$(EC)$(EXE) $@ gforths: $(ENGINES) $(ENGINES_FAST) -engines: FORCE $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h - cd engine && $(MAKE) $(ENGINES) - -engines-fast: FORCE $(FORTH_GEN_ENGINE_FAST) engine/Makefile engine/config.h - cd engine && $(MAKE) $(ENGINES_FAST) - # ------------- additional C primitives -%.c: %.pri prim2cl.fs +.SUFFIXES: .c .pri + +.pri.c: $< prim2cl.fs $(FORTHK) prim2cl.fs -e "file $< altogether bye" >$@ -%.so: %.c - $(GCC) -shared $(CFLAGS) $< -o $@ +.c.so: $< + $(GCC) -shared $(CFLAGS) $(CPPFLAGS) $< -o $@ # ------------- Make Documentation @@ -844,15 +895,15 @@ gforth.tags: @kernel_fi@ gforth$(EC)$(EX rm tags prim.TAGS: prim.b prims2x.fs - $(FORTHP) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag dup process-file bye"|sed 's#^./prim#prim#' >$@- + $(PREFORTH) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag dup process-file bye"|sed 's#^./prim#prim#' >$@- $(CP) $@- $@ $(RM) $@- prim.tags: prim.b prims2x.fs #echo '2c\' >prim.TAGS.sed #echo $(srcdir)/prim >>prim.TAGS.sed - #$(FORTHP) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag dup process-file bye" | sed -f prim.TAGS.sed >$@- - $(FORTHP) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-vi-tag dup process-file bye" >$@- + #$(PREFORTH) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag dup process-file bye" | sed -f prim.TAGS.sed >$@- + $(PREFORTH) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-vi-tag dup process-file bye" >$@- $(CP) $@- $@ $(RM) $@- @@ -864,26 +915,26 @@ kernel.tags: #elc files gforth.elc: gforth.el - emacs -batch -f batch-byte-compile $< + -$(EMACS) -batch -f batch-byte-compile gforth.el #Documentation doc/doc.fd: doc/makedoc.fs $(GFORTH_FI_SRC) code.fs objects.fs oof.fs moofglos.fs - $(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs except.fs startup.fs code.fs objects.fs oof.fs moofglos.fs -e bye + $(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs except.fs startup.fs code.fs objects.fs oof.fs moofglos.fs regexp.fs fft.fs -e bye doc/crossdoc.fd: $(KERN_SRC) kernel/version.fs $(FORTH_GEN0) $(FORTHK) -e 's" mach32l.fs"' kernel/main.fs -e bye -doc/gforth.texi: doc/gforth.ds prim.b ds2texi.fs prims2x.fs \ +doc/gforth.texi: doc/gforth.ds prim.b ds2texi.fs prims2x.fs \ doc/doc.fd doc/crossdoc.fd - $(FORTHP) ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc ' noop process-file" doc/crossdoc.fd doc/doc.fd -e "s\" $(srcdir)/doc/gforth.ds\" r/o open-file throw ds2texi bye" >$@- + $(PREFORTH) ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc ' noop process-file" doc/crossdoc.fd doc/doc.fd -e "s\" $(srcdir)/doc/gforth.ds\" r/o open-file throw ds2texi bye" >$@- $(CP) $@- $@ $(RM) $@- checkdoc: doc/gforth.ds prim.b ds2texi.fs prims2x.fs doc/doc.fd doc/crossdoc.fd answords.fs doc/gforth.texi $(FORTH) ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc ' noop process-file" doc/crossdoc.fd doc/doc.fd answords.fs -e bye -grep unknown doc/gforth.texi - -grep doc- doc/gforth.texi + -grep doc- doc/gforth.texi| grep -v '^@c' dvi: doc/gforth.dvi doc/vmgen.dvi @@ -952,21 +1003,21 @@ engine/config.h: stamp-h stamp-h: engine/config.h.in config.status stamp-h.in ./config.status -Makefile Makedist engine/Makefile gforthmi vmgen machpc.fs doc/version.texi envos.fs build-ec: Makefile.in Makedist.in engine/Makefile.in gforthmi.in vmgen.in machpc.fs.in doc/version.texi.in config.status configure.in envos.fs.in build-ec.in +Makefile Makedist engine/Makefile gforthmi vmgen preforth machpc.fs doc/version.texi envos.fs build-ec: Makefile.in Makedist.in engine/Makefile.in gforthmi.in vmgen.in preforth.in machpc.fs.in doc/version.texi.in config.status configure.in envos.fs.in build-ec.in engine/libcc.h.in ./config.status config.status: configure ./config.status --recheck #create files for DOS, because DOS cannot do it itself -makefile.dos: mkdosmf.sed Makefile.in engine/Makefile.in +makefile.dos engine/makefile.dos: mkdosmf.sed Makefile.in engine/Makefile.in sed -f mkdosmf.sed makefile.dos sed -f mkdosmf.sed engine/makefile.dos -makefile.os2: mkos2mf.sed Makefile.in engine/Makefile.in +makefile.os2 engine/makefile.os2: mkos2mf.sed Makefile.in engine/Makefile.in sed -f mkos2mf.sed makefile.os2 sed -f mkos2mf.sed engine/makefile.os2 echo '%.o: %.c' >>makefile.os2 - echo ' $$(GCC) $$(CFLAGS) -c $$<' >>makefile.os2 + echo ' $$(GCC) $$(CFLAGS) $$(CPPFLAGS) -c $$<' >>makefile.os2 echo '%.o: %.c' >>engine/makefile.os2 - echo ' $$(GCC) $$(CFLAGS) -c $$<' >>engine/makefile.os2 + echo ' $$(GCC) $$(CFLAGS) $$(CPPFLAGS) -c $$<' >>engine/makefile.os2