--- gforth/Makefile.in 2003/12/31 13:44:14 1.291 +++ gforth/Makefile.in 2008/07/17 15:25:25 1.412 @@ -1,22 +1,21 @@ #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,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' @@ -48,6 +47,8 @@ PATHSEP = @PATHSEP@ osclass = @OSCLASS@ +EC = @EC@ + # ------------- Utility programs SHELL = /bin/sh @@ -57,12 +58,15 @@ CP = cp -p MV = mv TAR = tar cf - INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +MASSAGE_EXE = @MASSAGE_EXE@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_INFO = @INSTALL_INFO@ LN_S = @LN_S@ +M4 = @M4@ GCC = @CC@ +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@ @@ -76,20 +80,20 @@ 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 +ENGINE_FAST = ./gforth-fast FORTH_FAST = $(ENGINE_FAST) $(FORTH_ARGS) FORTHKFLAGS= --die-on-signal -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi) 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 -TEXI2PDF = texi2dvi --pdf -e +TEXI2DVI = @TEXI2DVI@ +TEXI2PDF = @TEXI2DVI@ --pdf DVI2PS = dvips -t letterSize -Z #you can get texi2html from http://wwwcn.cern.ch/dci/texi2html/ MAKEINFO = makeinfo @@ -99,29 +103,37 @@ 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@ -# ------------ Install Directorys +STACK_CACHE_REGS = @STACK_CACHE_REGS@ +STACK_CACHE_DEFAULT_FAST = @STACK_CACHE_DEFAULT_FAST@ + +# ------------ Install Directories VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ srcdir = @srcdir@ -bindir = $(exec_prefix)/bin +bindir = @bindir@ #read-only architecture-independent files -datadir = $(prefix)/share +datarootdir = @datarootdir@ +datadir = @datadir@ #read-only architecture-dependent non-ascii files -libdir = $(prefix)/lib -infodir = $(prefix)/info -mandir = $(prefix)/man +libdir = @libdir@ +libccdir = $(libdir)/gforth/$(VERSION)/libcc-named/ +includedir = @includedir@ +infodir = @infodir@ +htmldir = @htmldir@ +mandir = @mandir@ man1dir= $(mandir)/man1 man1ext= .1 #older emacses have their site-lisp in $(libdir)/emacs/ @@ -138,9 +150,9 @@ CVSDIRS = CVS engine/CVS kernel/CVS doc/ 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/amd64/CVS \ - arch/arm/CVS + arch/arm/CVS arch/r8c/CVS -INCLUDES = engine/forth.h engine/threaded.h engine/io.h +INCLUDES = engine/forth.h engine/threaded.h engine/io.h engine/longlong.h KERN_SRC = \ mach16b.fs mach16l.fs mach32b.fs mach32l.fs mach64b.fs mach64l.fs \ @@ -148,7 +160,6 @@ KERN_SRC = \ kernel/aliases0.fs \ kernel/aliases.fs \ kernel/args.fs \ - chains.fs \ kernel/cbr.fs \ kernel/cloop.fs \ kernel/cond.fs \ @@ -177,12 +188,14 @@ KERN_SRC = \ kernel/saccept.fs \ kernel/doers.fs \ kernel/getdoers.fs \ - kernel/pass.fs + kernel/pass.fs \ + kernel/xchars.fs EC_SRC = \ asm/README \ asm/bitmask.fs \ asm/numref.fs \ + chains.fs \ asm/basic.fs \ asm/generic.fs \ asm/target.fs \ @@ -191,7 +204,8 @@ EC_SRC = \ ec/shex.fs \ ec/builttag.fs \ ec/dotx.fs \ - ec/nesting.fs + ec/nesting.fs \ + build-ec.in GFORTH_FI_SRC = \ assert.fs \ @@ -202,7 +216,9 @@ GFORTH_FI_SRC = \ code.fs \ debug.fs \ debugs.fs \ + dis-gdb.fs \ ekey.fs \ + envos.fs \ savesys.fs \ environ.fs \ errors.fs \ @@ -214,6 +230,7 @@ GFORTH_FI_SRC = \ hash.fs \ history.fs \ intcomp.fs \ + libcc.fs \ locals.fs \ look.fs \ quotes.fs \ @@ -224,35 +241,45 @@ GFORTH_FI_SRC = \ source.fs \ startup.fs \ struct.fs \ + struct0x.fs \ 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 \ + arch/power/asm.fs arch/power/disasm.fs arch/power/inst.fs + +LIBCC_SRC = libffi.fs fflib.fs unix/socket.fs -FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_SRC) \ +FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_SRC) $(LIBCC_SRC) \ ans-report.fs ansi.fs answords.fs \ - colorize.fs comp-i.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 \ + colorize.fs comp-i.fs complex.fs \ + depth-changes.fs dosekey.fs doskey.fs ds2texi.fs \ + envos.dos envos.os2 etags.fs fft.fs filedump.fs fi2c.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 \ + locate.fs more.fs onebench.fs other.fs prims2x.fs random.fs \ + regexp.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 \ + 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/search.fs test/gforth.fs \ test/other.fs test/signals.fs test/checkans.fs \ - test/primtest.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 sieve.fs unix/socket.fs + add.fs lib.fs oldlib.fs sieve.fs \ + endtry-iferror.fs recover-endtry.fs COMPAT = compat/README \ compat/anslocal.fs \ @@ -260,6 +287,7 @@ COMPAT = compat/README \ compat/control.fs \ compat/defer.fs \ compat/exception.fs \ + compat/execute-parsing.fs \ compat/loops.fs \ compat/required.fs \ compat/strcomp.fs \ @@ -284,6 +312,8 @@ ARCHS = \ arch/power/_sync_cache_range.c \ arch/alpha/machine.h \ arch/arm/machine.h \ + arch/arm/cacheflush0.c \ + arch/arm/cacheflush-linux.c \ arch/ia64/machine.h \ arch/ia64/flush_icache_block.c \ arch/amd64/machine.h \ @@ -301,21 +331,8 @@ ARCHS = \ 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 \ @@ -327,10 +344,35 @@ 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 + arch/sharc/g21k-3.3.4-bp1.diff \ + arch/r8c/asm.fs \ + arch/r8c/mach.fs \ + arch/r8c/prim.fs + +#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/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 \ vmgen-ex/engine.c vmgen-ex/fib.mini \ @@ -342,21 +384,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 \ - 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/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 \ - $(ARCHS) \ - engine/profile.c \ + engine/io.c engine/support.c engine/signals.c engine/libcc.h.in \ + 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 \ @@ -364,22 +395,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 \ + 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/coretest.out test/checkans.out test/gforth.out \ + cache*.vmg peeprules.vmg prim RCS_FILES = ToDo model high-level -ENGINES = gforth$(EXE) gforth-ditc$(EXE) gforth-itc$(EXE) $(PROFEXES) +ENGINES = gforth$(EC)$(EXE) gforth-ditc$(EC)$(EXE) gforth-itc$(EC)$(EXE) $(PROFEXES) -ENGINES_FAST = gforth-fast$(EXE) gforth-native$(EXE) +ENGINES_FAST = gforth-fast$(OPT)$(EC)$(EXE) #gforth-native$(OPT)$(EC)$(EXE) -GEN = $(ENGINES) $(ENGINES_FAST) kernel/version.fs +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 \ @@ -395,19 +440,24 @@ FORTH_GEN_PRIMB = $(FORTH_GEN_ENGINE) ke 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@ +FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ build-ec #kernel dependencies 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.info-* doc/vmgen.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.fi- kernl16l.fi- \ - kernl32b.fi- kernl32l.fi- \ - kernl64b.fi- kernl64l.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 \ @@ -417,8 +467,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: ; @@ -433,10 +482,10 @@ version: Makefile.in configure.in # shell und file utilities. kernel/version.fs: version - $(MAKE) gforth$(EXE) echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs -more: engines $(FORTH_GEN) $(GEN) +more: $(ENGINES) $(FORTH_GEN) $(GEN) + @$(MAKE) check #from the gcc Makefile: #"Deletion of files made during compilation. @@ -468,39 +517,40 @@ 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$(EXE) engine/gforth-fast$(EXE) \ - engine/gforth-native$(EXE) engine/gforth-itc$(EXE) \ - engine/gforth-ditc$(EXE) engine/gforth-prof$(EXE) + -$(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). -dist: Makedist machpc.fs FORCE - -sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' machpc.fs +dist: Makedist FORCE $(MAKE) -f Makedist d$@ - -$(RM) machpc.fs -dosdist: Makedist machpc.fs FORCE - -sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' machpc.fs +dosdist: Makedist FORCE $(MAKE) -f Makedist d$@ - -$(RM) machpc.fs srcdist: Makedist FORCE $(MAKE) -f Makedist d$@ @@ -514,15 +564,11 @@ docdist: Makedist FORCE htmldist: Makedist FORCE $(MAKE) -f Makedist d$@ -bindist: Makedist machpc.fs FORCE - -sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' machpc.fs +bindist: Makedist FORCE $(MAKE) -f Makedist d$@ - -$(RM) machpc.fs -binonlydist: Makedist machpc.fs FORCE - -sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' machpc.fs +binonlydist: Makedist FORCE $(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 @@ -537,75 +583,95 @@ hpux-workaround: #hard to generate). #we rebuild gforth.fi, because it contains some path names. #we delete $build/gforth.fi and $build/install.TAGS after installation because of ownership. -install: gforth$(EXE) $(FORTH_SRC) $(kernel_fi) gforth.fi gforthmi vmgen doc/gforth.1 prim install.TAGS installdirs - touch $(siteforthdir)/siteinit.fs - -$(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) gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) - (cd $(bindir) && $(LN_S) gforth-$(VERSION)$(EXE) gforth$(EXE)) - $(INSTALL_PROGRAM) gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE) - (cd $(bindir) && $(LN_S) gforth-fast-$(VERSION)$(EXE) gforth-fast$(EXE)) - $(INSTALL_PROGRAM) gforth-itc$(EXE) $(bindir)/gforth-itc-$(VERSION)$(EXE) - (cd $(bindir) && $(LN_S) gforth-itc-$(VERSION)$(EXE) gforth-itc$(EXE)) - $(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) - -$(INSTALL_DATA) $(srcdir)/doc/gforth.1 $(man1dir) - -for i in $(srcdir)/doc/gforth.info* $(srcdir)/doc/vmgen.info*; do $(INSTALL_DATA) $$i $(infodir); done +install: gforth$(EC)$(EXE) $(FORTH_SRC) $(kernel_fi) gforth.fi gforthmi vmgen doc/gforth.1 prim install.TAGS installdirs + $(NORMAL_INSTALL) + touch $(DESTDIR)$(siteforthdir)/siteinit.fs + -$(RM) $(DESTDIR)$(bindir)/gforth$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforthmi #$(DESTDIR)$(bindir)/vmgen + -$(RM) $(DESTDIR)$(bindir)/gforth-fast$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EC)$(EXE) + -$(RM) $(DESTDIR)$(bindir)/gforth-itc$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EC)$(EXE) + $(INSTALL_PROGRAM) gforth$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EC)$(EXE) + -$(MASSAGE_EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EC)$(EXE) + (cd $(DESTDIR)$(bindir) && $(LN_S) gforth-$(VERSION)$(EC)$(EXE) gforth$(EC)$(EXE)) + $(INSTALL_PROGRAM) gforth-fast$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EC)$(EXE) + -$(MASSAGE_EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EC)$(EXE) + (cd $(DESTDIR)$(bindir) && $(LN_S) gforth-fast-$(VERSION)$(EC)$(EXE) gforth-fast$(EC)$(EXE)) + $(INSTALL_PROGRAM) gforth-itc$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EC)$(EXE) + (cd $(DESTDIR)$(bindir) && $(LN_S) gforth-itc-$(VERSION)$(EC)$(EXE) gforth-itc$(EC)$(EXE)) + $(INSTALL_SCRIPT) gforthmi $(DESTDIR)$(bindir)/gforthmi-$(VERSION) + #$(INSTALL_SCRIPT) vmgen $(DESTDIR)$(bindir)/vmgen-$(VERSION) + $(INSTALL_PROGRAM) gforth-ditc $(DESTDIR)$(libdir)/gforth/$(VERSION) + (cd $(DESTDIR)$(bindir) && $(LN_S) gforthmi-$(VERSION) gforthmi) + #(cd $(DESTDIR)$(bindir) && $(LN_S) vmgen-$(VERSION) vmgen) + -$(INSTALL_DATA) $(srcdir)/doc/gforth.1 $(DESTDIR)$(man1dir) + #-for i in $(srcdir)/doc/gforth.info* $(srcdir)/doc/vmgen.info*; do $(INSTALL_DATA) $$i $(DESTDIR)$(infodir); done + -for i in $(srcdir)/doc/gforth.info*; do $(INSTALL_DATA) $$i $(DESTDIR)$(infodir); done for i in $(FORTH_SRC) $(COMPAT) prim; do \ - $(INSTALL_DATA) $(srcdir)/$$i $(datadir)/gforth/$(VERSION)/$$i; \ + $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(datadir)/gforth/$(VERSION)/$$i; \ done - $(INSTALL_DATA) $(kernel_fi) $(datadir)/gforth/$(VERSION) - @if test -d "$(emacssitelispdir)"; then \ - $(INSTALL_DATA) $(srcdir)/gforth.el $(emacssitelispdir); \ + $(INSTALL_DATA) $(kernel_fi) $(DESTDIR)$(datadir)/gforth/$(VERSION) + @if test -d "$(DESTDIR)$(emacssitelispdir)"; then \ + $(INSTALL_DATA) gforth.elc $(DESTDIR)$(emacssitelispdir); \ else \ - echo ">>>>>Please install $(srcdir)/gforth.el in your .../emacs/site-lisp directory"; \ + echo ">>>>>Please install gforth.elc 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) - $(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION) - $(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS + 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_INFO) --info-dir=$(infodir) $(infodir)/gforth.info - $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/vmgen.info + $(INSTALL_DATA) include/gforth/$(VERSION)/* $(DESTDIR)$(includedir)/gforth/$(VERSION) + for i in $(LIBCC_SRC); do 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 install-strip: install installdirs: mkinstalldirs - for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir); do \ - $(srcdir)/mkinstalldirs $$i; \ + $(NORMAL_INSTALL) + 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 \ - $(srcdir)/mkinstalldirs $(datadir)/gforth/$(VERSION)/`dirname $$i`; \ + $(srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/gforth/$(VERSION)/`dirname $$i`; \ done - $(RM) -rf $(datadir)/gforth/$(VERSION)/engine + $(RM) -rf $(DESTDIR)$(datadir)/gforth/$(VERSION)/engine #deinstall all files specific to this version of gforth #to uninstall version foo, type `make uninstall VERSION=foo' uninstall: FORCE - -$(RM) -rf $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE) $(bindir)/gforth-itc-$(VERSION)$(EXE) $(bindir)/gforthmi-$(VERSION) (bindir)/vmgen-$(VERSION) - @echo -e "To remove Gforth completely, type\n$(RM) -rf $(bindir)/gforth$(EXE) $(bindir)/gforth-fast$(EXE) $(bindir)/gforth-itc$(EXE) $(bindir)/gforthmi $(bindir)/vmgen $(man1dir)/gforth.1 $(infodir)/gforth.info* $(datadir)/gforth $(libdir)/gforth" - -check: gforths gforth.fi - $(MAKE) checkone ENGINE="./gforth --no-dynamic" >/dev/null 2>&1 - $(MAKE) checkone ENGINE="./gforth-itc" >/dev/null 2>&1 - $(MAKE) checkone ENGINE="./gforth-ditc" >/dev/null 2>&1 + $(NORMAL_UNINSTALL) + -$(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-libcc-named: $(LIBCC_SRC) + $(RMTREE) lib/gforth/$(VERSION)/libcc-named/ + $(srcdir)/mkinstalldirs lib/gforth/$(VERSION)/libcc-named/ + for i in $(LIBCC_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 ENGINE="./gforth" >/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$(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 +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 $(FORTH) code.fs test/checkans.fs -e bye | tr -d '\015' | diff -c - $(srcdir)/test/checkans.out $(FORTH) prims2x.fs -e \ "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 + tr -d '\015' | grep -v '^#line '|diff -c - engine/prim-s.i + +check-nofast: gforth.fi + $(FORTHS) test/gforth-nofast.fs -e bye test/primtest.fi: test/primtest.fs mach32l.fs cross.fs $(FORTHB) -e 's" mach32l.fs"' $(srcdir)/test/primtest.fs -e "save-cross $@ $(bindir)/gforth-$(VERSION) bye" @@ -613,32 +679,23 @@ test/primtest.fi: test/primtest.fs mach3 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 +bench: gforth-fast$(EC)$(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" time $(FORTH_FAST) bubble.fs -e "main bye" time $(FORTH_FAST) matrix.fs -e "main bye" time $(FORTH_FAST) fib.fs -e "main bye" -onebench: - @\time -f "siev %U" $(FORTH_FAST) siev.fs -e "main bye" - @\time -f "bubble %U" $(FORTH_FAST) -e "warnings off" bubble.fs -e "main bye" - @\time -f "matrix %U" $(FORTH_FAST) matrix.fs -e "main bye" - @\time -f "fib %U" $(FORTH_FAST) fib.fs -e "main bye" - -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" - @echo "*** gforth-fast not dynamic:" - @$(MAKE) onebench ENGINE_FAST="./gforth-fast --no-dynamic" - @echo "*** gforth dynamic:" - @$(MAKE) onebench ENGINE_FAST="./gforth --dynamic" - @echo "*** gforth not dynamic:" - @$(MAKE) onebench ENGINE_FAST="./gforth --no-dynamic" - @echo "*** gforth-itc:" - @$(MAKE) onebench ENGINE_FAST=./gforth-itc - @echo "*** gforth-ditc:" - @$(MAKE) onebench ENGINE_FAST=./gforth-ditc +onebench one-bench: + $(FORTH_FAST) onebench.fs + +all-bench allbench: + ./gforth-fast --dynamic onebench.fs + ./gforth-fast --no-dynamic onebench.fs + ./gforth --dynamic onebench.fs + ./gforth --no-dynamic onebench.fs + ./gforth-itc onebench.fs + ./gforth-ditc onebench.fs # ------------- Make forth images @@ -650,27 +707,27 @@ all-bench: gforth-fast$(EXE) gforth$(EXE # 3. copy new kernels to kernlXYZ.fi # these are the ones we want to use now -kernl16l.fi-: $(KERN_DEPS) mach16l.fs - $(FORTHB) -e 's" mach16l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16l.fi- $(bindir)/gforth-$(VERSION) bye" +kernl16l$(EC).fi-: $(KERN_DEPS) mach16l.fs + $(PREFORTH) -e 's" mach16l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16l$(EC).fi- $(bindir)/gforth-$(VERSION) bye" -kernl16b.fi-: $(KERN_DEPS) mach16b.fs - $(FORTHB) -e 's" mach16b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16b.fi- $(bindir)/gforth-$(VERSION) bye" +kernl16b$(EC).fi-: $(KERN_DEPS) mach16b.fs + $(PREFORTH) -e 's" mach16b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16b$(EC).fi- $(bindir)/gforth-$(VERSION) bye" -kernl32l.fi-: $(KERN_DEPS) mach32l.fs - $(FORTHB) -e 's" mach32l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl32l.fi- $(bindir)/gforth-$(VERSION) bye" +kernl32l$(EC).fi-: $(KERN_DEPS) mach32l.fs + $(PREFORTH) -e 's" mach32l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl32l$(EC).fi- $(bindir)/gforth-$(VERSION) bye" -kernl32b.fi-: $(KERN_DEPS) mach32b.fs - $(FORTHB) -e 's" mach32b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl32b.fi- $(bindir)/gforth-$(VERSION) bye" +kernl32b$(EC).fi-: $(KERN_DEPS) mach32b.fs + $(PREFORTH) -e 's" mach32b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl32b$(EC).fi- $(bindir)/gforth-$(VERSION) bye" -kernl64l.fi-: $(KERN_DEPS) mach64l.fs - $(FORTHB) -e 's" mach64l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64l.fi- $(bindir)/gforth-$(VERSION) bye" +kernl64l$(EC).fi-: $(KERN_DEPS) mach64l.fs + $(PREFORTH) -e 's" mach64l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64l$(EC).fi- $(bindir)/gforth-$(VERSION) bye" -kernl64b.fi-: $(KERN_DEPS) mach64b.fs - $(FORTHB) -e 's" mach64b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye" +kernl64b$(EC).fi-: $(KERN_DEPS) mach64b.fs + $(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) $@- $@; \ @@ -679,104 +736,133 @@ kernl64b.fi-: $(KERN_DEPS) mach64b.fs #SunOS make does not like that #arch/%/mach.fs: arch/%/prim.fs arch/%/asm.fs -kernl16b.fi: $(KERNLS) - -$(CP) kernl16b.fi kernl16b.fi~ - -$(CP) kernl16b.fi- kernl16b.fi - -kernl16l.fi: $(KERNLS) - -$(CP) kernl16l.fi kernl16l.fi~ - -$(CP) kernl16l.fi- kernl16l.fi - -kernl32b.fi: $(KERNLS) - -$(CP) kernl32b.fi kernl32b.fi~ - -$(CP) kernl32b.fi- kernl32b.fi - -kernl32l.fi: $(KERNLS) - -$(CP) kernl32l.fi kernl32l.fi~ - -$(CP) kernl32l.fi- kernl32l.fi - -kernl64b.fi: $(KERNLS) - -$(CP) kernl64b.fi kernl64b.fi~ - -$(CP) kernl64b.fi- kernl64b.fi - -kernl64l.fi: $(KERNLS) - -$(CP) kernl64l.fi kernl64l.fi~ - -$(CP) kernl64l.fi- kernl64l.fi +kernl16b$(EC).fi: $(KERNLS) + -$(CP) kernl16b$(EC).fi kernl16b$(EC).fi~ + -$(CP) kernl16b$(EC).fi- kernl16b$(EC).fi + +kernl16l$(EC).fi: $(KERNLS) + -$(CP) kernl16l$(EC).fi kernl16l$(EC).fi~ + -$(CP) kernl16l$(EC).fi- kernl16l$(EC).fi + +kernl32b$(EC).fi: $(KERNLS) + -$(CP) kernl32b$(EC).fi kernl32b$(EC).fi~ + -$(CP) kernl32b$(EC).fi- kernl32b$(EC).fi + +kernl32l$(EC).fi: $(KERNLS) + -$(CP) kernl32l$(EC).fi kernl32l$(EC).fi~ + -$(CP) kernl32l$(EC).fi- kernl32l$(EC).fi + +kernl64b$(EC).fi: $(KERNLS) + -$(CP) kernl64b$(EC).fi kernl64b$(EC).fi~ + -$(CP) kernl64b$(EC).fi- kernl64b$(EC).fi + +kernl64l$(EC).fi: $(KERNLS) + -$(CP) kernl64l$(EC).fi kernl64l$(EC).fi~ + -$(CP) kernl64l$(EC).fi- kernl64l$(EC).fi #kernl%.fi: kernl%.fi- $(KERNLS) # -$(CP) $@ $@~ # -$(CP) $< $@ -gforth.fi: $(kernel_fi) gforthmi gforth$(EXE) gforth-ditc$(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)" ./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 prim.b: prim cache0.vmg - m4 -s $(srcdir)/prim >$@ + $(M4) -Dcondbranch_opt=0 $(srcdir)/prim >$@ sleep 1 #should make hpux-workaround unnecessary -prim-fast.b: prim cache1.vmg peeprules.vmg - m4 -DM4_ENGINE_FAST -s $(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)" 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$(EXE): engines - -$(CP) gforth$(EXE) gforth~ - $(CP) engine/$@ $@ - @GFORTH_EXE@ -gforth-fast$(EXE): engines-fast - $(CP) engine/$@ $@ - @GFORTHFAST_EXE@ +OPTS = @OPTS@ -gforth-native$(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) gforth$(OPT)$(EC)$(EXE) gforth~; \ + $(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$(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$(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$(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 - cd engine && $(MAKE) $(ENGINES) - -engines-fast: FORCE $(FORTH_GEN_ENGINE_FAST) engine/Makefile - cd engine && $(MAKE) $(ENGINES_FAST) - # ------------- additional C primitives %.c: %.pri prim2cl.fs $(FORTHK) prim2cl.fs -e "file $< altogether bye" >$@ %.so: %.c - $(GCC) -shared $(CFLAGS) $< -o $@ + $(GCC) -shared $(CFLAGS) $(CPPFLAGS) $< -o $@ # ------------- Make Documentation @@ -787,56 +873,60 @@ TAGS: gforth.TAGS tags: gforth.tags $(CP) gforth.tags $@ -install.TAGS: gforth.TAGS - sed 's;^\$(srcdir)/;$(datadir)/gforth/$(VERSION)/;' gforth.TAGS >install.TAGS +install.TAGS: TAGS + sed 's;^\$(srcdir)/;;' TAGS|awk 'BEGIN {RS="\014\n"; ORS=RS} {if (NR==1) print $0; else print "$(datadir)/gforth/$(VERSION)/"$$0;}' >install.TAGS -gforth.TAGS: @kernel_fi@ gforth$(EXE) $(GFORTH_FI_SRC) prim.TAGS kernel.TAGS +gforth.TAGS: @kernel_fi@ gforth$(EC)$(EXE) $(GFORTH_FI_SRC) prim.TAGS kernel.TAGS $(FORTHK) etags.fs except.fs startup.fs -e bye cat TAGS prim.TAGS kernel.TAGS >gforth.TAGS rm TAGS -gforth.tags: @kernel_fi@ gforth$(EXE) $(GFORTH_FI_SRC) prim.tags kernel.tags +gforth.tags: @kernel_fi@ gforth$(EC)$(EXE) $(GFORTH_FI_SRC) prim.tags kernel.tags $(FORTHK) tags.fs except.fs startup.fs -e bye cat tags prim.tags kernel.tags >gforth.tags rm tags 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-tag dup process-file bye" >$@- + $(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) $@- kernel.TAGS: - rm kernl16l.fi-; $(MAKE) @kernel_fi@ + rm kernl16l$(EC).fi-; $(MAKE) @kernel_fi@ kernel.tags: - rm kernl16l.fi-; $(MAKE) @kernel_fi@ + rm kernl16l$(EC).fi-; $(MAKE) @kernel_fi@ + +#elc files +gforth.elc: gforth.el + emacs -batch -f batch-byte-compile $< + +#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 dvi: doc/gforth.dvi doc/vmgen.dvi @@ -902,25 +992,24 @@ stamp-h.in: configure.in aclocal.m4 echo timestamp > $(srcdir)/stamp-h.in engine/config.h: stamp-h -stamp-h: engine/config.h.in config.status +stamp-h: engine/config.h.in config.status stamp-h.in ./config.status -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 +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