--- gforth/Makefile.in 2008/07/17 22:18:57 1.413 +++ gforth/Makefile.in 2011/11/12 15:11:56 1.460 @@ -1,6 +1,6 @@ #Makefile for Gforth -#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008 Free Software Foundation, Inc. +#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008,2009,2010 Free Software Foundation, Inc. #This file is part of Gforth. @@ -45,10 +45,31 @@ EXE=@EXEEXT@ PATHSEP = @PATHSEP@ -osclass = @OSCLASS@ - EC = @EC@ +# ------------ Install Directories + +VPATH = @srcdir@ +prefix = @prefix@ +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 = $(subst $(DESTDIR),,$(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/ +emacssitelispdir=@lispdir@ +siteforthdir=$(datadir)/gforth/site-forth + # ------------- Utility programs SHELL = /bin/sh @@ -66,6 +87,8 @@ INSTALL_INFO = @INSTALL_INFO@ LN_S = @LN_S@ M4 = @M4@ GCC = @CC@ +EMACS = @EMACS@ +LIBTOOL = @GNU_LIBTOOL@ PREFORTH = ./preforth -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" CC = $(GCC) FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION) @@ -82,7 +105,7 @@ BUILDFORTH = $(ENGINE) --die-on-signal - # the forth system plus flags we use to build FORTHB = $(BUILDFORTH) exboot.fs -e 'fpath= .|~+|$(srcdir)' # the Forth system for running prims2x.fs -FORTHP = $(FORTH) +#FORTHP = $(FORTH) ENGINE_FAST = ./gforth-fast FORTH_FAST = $(ENGINE_FAST) $(FORTH_ARGS) FORTHKFLAGS= --die-on-signal -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi) @@ -117,40 +140,17 @@ LDLIBS = @LIBS@ 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 = @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@ -mandir = @mandir@ -man1dir= $(mandir)/man1 -man1ext= .1 -#older emacses have their site-lisp in $(libdir)/emacs/ -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/amd64/CVS \ - arch/arm/CVS arch/r8c/CVS +INSTALLDIRS = kernel doc asm ec test \ + compat unix \ + arch arch/generic arch/m68k arch/mips \ + arch/386 arch/hppa arch/sparc arch/power \ + arch/alpha arch/4stack arch/misc arch/6502 \ + arch/8086 arch/avr arch/c165 arch/h8 \ + arch/shboom arch/sharc arch/ia64 arch/amd64 \ + arch/arm arch/r8c INCLUDES = engine/forth.h engine/threaded.h engine/io.h engine/longlong.h @@ -181,6 +181,7 @@ KERN_SRC = \ kernel/basics.fs \ kernel/int.fs \ kernel/comp.fs \ + kernel/recognizer.fs \ kernel/io.fs \ kernel/input.fs \ kernel/license.fs \ @@ -189,7 +190,8 @@ KERN_SRC = \ kernel/doers.fs \ kernel/getdoers.fs \ kernel/pass.fs \ - kernel/xchars.fs + kernel/xchars.fs \ + string.fs EC_SRC = \ asm/README \ @@ -207,7 +209,7 @@ EC_SRC = \ ec/nesting.fs \ build-ec.in -GFORTH_FI_SRC = \ +GFORTH_FI_SRC1=\ assert.fs \ backtrac.fs \ blocked.fb \ @@ -218,7 +220,8 @@ GFORTH_FI_SRC = \ debugs.fs \ dis-gdb.fs \ ekey.fs \ - envos.fs \ + +GFORTH_FI_SRC2=\ savesys.fs \ environ.fs \ errors.fs \ @@ -230,9 +233,12 @@ GFORTH_FI_SRC = \ hash.fs \ history.fs \ intcomp.fs \ + mkdir.fs \ libcc.fs \ locals.fs \ look.fs \ + mkdir.fs \ + prelude.fs \ quotes.fs \ search.fs \ see.fs \ @@ -240,6 +246,7 @@ GFORTH_FI_SRC = \ simp-see.fs \ source.fs \ startup.fs \ + str-exec.fs \ struct.fs \ struct0x.fs \ stuff.fs \ @@ -252,20 +259,37 @@ GFORTH_FI_SRC = \ arch/386/asm.fs arch/386/disasm.fs \ arch/amd64/asm.fs arch/amd64/disasm.fs \ arch/alpha/asm.fs arch/alpha/disasm.fs arch/alpha/testasm.fs\ + arch/arm/asm.fs arch/arm/disasm.fs \ + arch/arm/testdisasm.fs arch/arm/testdisasm.out arch/arm/Makefile \ 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 +# execlude envos.fs into list of distributed sources +GFORTH_FI_DIST_SRC = \ + $(GFORTH_FI_SRC1) \ + $(GFORTH_FI_SRC2) + +GFORTH_FI_SRC = \ + $(GFORTH_FI_SRC1) \ + envos.fs \ + $(GFORTH_FI_SRC2) + +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_SRC) \ + +FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_DIST_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 \ 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 onebench.fs other.fs prims2x.fs random.fs \ + fsl-util.4th glosgen.fs gray.fs httpd.fs install-tags.fs \ + make-app.fs doc/makedoc.fs locate.fs more.fs onebench.fs \ + other.fs prims2x.fs prims2x0.6.2.fs proxy.fs random.fs \ regexp.fs sokoban.fs string.fs table.fs tags.fs \ tt.fs \ unbuffer.fs wordsets.fs xwords.fs \ @@ -275,6 +299,7 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) 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 \ + test/macros.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 \ @@ -289,6 +314,7 @@ COMPAT = compat/README \ compat/exception.fs \ compat/execute-parsing.fs \ compat/loops.fs \ + compat/macros.fs \ compat/required.fs \ compat/strcomp.fs \ compat/struct.fs \ @@ -304,6 +330,7 @@ ARCHS = \ arch/generic/machine.h \ arch/m68k/machine.h \ arch/mips/machine.h \ + arch/mips/check_prim.c \ arch/386/machine.h \ arch/hppa/machine.h \ arch/hppa/cache.c \ @@ -349,7 +376,14 @@ ARCHS = \ arch/sharc/g21k-3.3.4-bp1.diff \ arch/r8c/asm.fs \ arch/r8c/mach.fs \ - arch/r8c/prim.fs + arch/r8c/errors.fs \ + arch/r8c/prim.fs \ + arch/r8c/asm-test.fs \ + arch/r8c/errors.fs \ + arch/r8c/lauflicht.fs \ + arch/r8c/tasker.fs \ + arch/r8c/terminal.fs \ + arch/sharc/unistd.h #not included in distribution until distribution terms are included: ARCHS_NO_DIST = \ @@ -366,15 +400,9 @@ 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 + arch/r8c/tt.fs -VMGEN_EX = vmgen-ex/CVS vmgen-ex/Makefile vmgen-ex/README vmgen-ex/disasm.c \ +VMGEN_EX = 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 \ vmgen-ex/mini.l vmgen-ex/mini.y vmgen-ex/peephole-blacklist \ @@ -397,10 +425,10 @@ ENGINE_SOURCES = engine/Makefile.in engi engine/fnmatch.h engine/fnmatch.c \ engine/makefile.dos engine/makefile.os2 -SOURCES = $(CVSDIRS) $(ENGINE_SOURCES) compat Makefile.in Makedist.in \ +SOURCES = $(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 \ + 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 \ @@ -420,11 +448,11 @@ SOURCES = $(CVSDIRS) $(ENGINE_SOURCES) c RCS_FILES = ToDo model high-level -ENGINES = gforth$(EC)$(EXE) gforth-ditc$(EC)$(EXE) gforth-itc$(EC)$(EXE) $(PROFEXES) +ENGINES = gforth$(EC)$(EXE) @NO_EC@ gforth-ditc$(EC)$(EXE) gforth-itc$(EC)$(EXE) $(PROFEXES) -ENGINES_FAST = gforth-fast$(OPT)$(EC)$(EXE) #gforth-native$(OPT)$(EC)$(EXE) +ENGINES_FAST = @NO_EC@ gforth-fast$(OPT)$(EC)$(EXE) #gforth-native$(OPT)$(EC)$(EXE) -GEN = $(ENGINES) $(ENGINES_FAST) 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 \ @@ -438,7 +466,7 @@ FORTH_GEN_ENGINE_FAST= \ 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 +FORTH_GEN = $(FORTH_GEN0) @KERNEL@ @NO_EC@ gforth.fi # this is used for antidependences, FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ build-ec @@ -467,11 +495,14 @@ GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) \ .SUFFIXES: .SUFFIXES: .c .o -all: kernel/version.fs more +all: kernel/version.fs more @NO_EC@ check # use this dependency for phony targets just as mostlyclean,... FORCE: ; +#targets of failed commands should be deleted: +.DELETE_ON_ERROR: + #this rule avoids remaking everything after minor changes in Makefile.in version: Makefile.in configure.in if test -r $@ && test x'$(VERSION)' = x`cat $@` ; then true ; else echo $(VERSION) > $@ ; fi @@ -484,8 +515,7 @@ version: Makefile.in configure.in kernel/version.fs: version echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs -more: $(ENGINES) $(FORTH_GEN) $(GEN) - @$(MAKE) check +more: $(ENGINES) $(FORTH_GEN) $(GEN) @build_libcc_named@ #from the gcc Makefile: #"Deletion of files made during compilation. @@ -586,7 +616,7 @@ hpux-workaround: 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$(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) @@ -598,32 +628,35 @@ install: gforth$(EC)$(EXE) $(FORTH_SRC) $(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_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) + (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 \ + -for i in $(srcdir)/doc/gforth.info* $(srcdir)/doc/vmgen.info*; do $(INSTALL_DATA) $$i $(DESTDIR)$(infodir); done + for i in $(FORTH_SRC) $(COMPAT) envos.fs prim; do \ $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(datadir)/gforth/$(VERSION)/$$i; \ done $(INSTALL_DATA) $(kernel_fi) $(DESTDIR)$(datadir)/gforth/$(VERSION) @if test -d "$(DESTDIR)$(emacssitelispdir)"; then \ - $(INSTALL_DATA) gforth.elc $(DESTDIR)$(emacssitelispdir); \ + for i in gforth.el @gforth_elc@; do \ + $(INSTALL_DATA) $$i $(DESTDIR)$(emacssitelispdir); \ + done; \ 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) libccdir=$(libccdir) 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 -p $(DESTDIR)$(libdir)/gforth/site-forth$(PATHSEP)$(DESTDIR)$(siteforthdir)$(PATHSEP)$(DESTDIR)$(datadir)/gforth/$(VERSION) --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_SRC); do @GNU_LIBTOOL@ --silent --mode=install $(INSTALL) lib/gforth/$(VERSION)/libcc-named/`basename $$i .fs`.la $(DESTDIR)$(libccdir)`basename $$i .fs`.la; done + if test -n "$(LIBTOOL)"; then for i in $(LIBCC_BUILD_SRC); do \ + $(LIBTOOL) --silent --mode=install $(INSTALL) lib/gforth/$(VERSION)/libcc-named/`basename $$i .fs`.la $(DESTDIR)$(libccdir)`basename $$i .fs`.la; \ + done; fi $(POST_INSTALL) $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gforth.info - #$(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/vmgen.info + $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/vmgen.info install-strip: install @@ -632,39 +665,37 @@ installdirs: mkinstalldirs 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 $(DESTDIR)$(datadir)/gforth/$(VERSION)/`dirname $$i`; \ + # + for i in $(INSTALLDIRS); do \ + $(srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/gforth/$(VERSION)/$$i; \ done - $(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 $(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) + -$(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) +build-libcc-named: $(LIBCC_BUILD_SRC) $(FORTH_GEN) $(GEN) FORCE $(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 + 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\" $(DESTDIR)$(libccdir)\" ; is replace-rpath" $(srcdir)/$$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-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.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/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>/dev/null | 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 + $(FORTHS) test/coremore.fs test/gforth.fs test/macros.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"| \ @@ -770,11 +801,11 @@ gforth.fi: $(kernel_fi) gforthmi gforth- # ------------- Make c-engine prim.b: prim cache0.vmg - $(M4) -Dcondbranch_opt=0 $(srcdir)/prim >$@ + (cd $(srcdir) && $(M4) -Dcondbranch_opt=0 prim) >$@ sleep 1 #should make hpux-workaround unnecessary 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 >$@ + (cd $(srcdir) && $(M4) -Dcondbranch_opt=@condbranch_opt@ -DSTACK_CACHE_FILE=cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg -DSTACK_CACHE_REGS=cache-regs$(STACK_CACHE_REGS).vmg prim) >$@ sleep 1 #should make hpux-workaround unnecessary $(FORTH_GEN_ENGINE_FAST): prim-fast.b prims2x.fs @@ -811,11 +842,10 @@ gforth$(OPT)$(EC)$(EXE): $(ENGINE_SOURCE 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/$@; \ + @NO_EC@ $(MAKE) checkone check-nofast ENGINE=./engine/$@; \ fi optgforth: @@ -829,7 +859,7 @@ gforth-fast$(OPT)$(EC)$(EXE): $(ENGINE_S $(CP) engine/$@ $@ && \ $(MASSAGE_EXE) $@; \ @GFORTHFAST_EXE@; \ - $(MAKE) checkone ENGINE=./engine/$@; \ + @NO_EC@ $(MAKE) checkone ENGINE=./engine/$@; \ fi optgforth-fast: @@ -858,10 +888,12 @@ gforths: $(ENGINES) $(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 +.c.so: $< $(GCC) -shared $(CFLAGS) $(CPPFLAGS) $< -o $@ # ------------- Make Documentation @@ -873,8 +905,8 @@ TAGS: gforth.TAGS tags: gforth.tags $(CP) gforth.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 +install.TAGS: TAGS install-tags.fs + sed 's;^\$(srcdir)/;;' TAGS|./gforth -e 's" '$(datadir)/gforth/$(VERSION)/'"' $(srcdir)/install-tags.fs -e bye >install.TAGS gforth.TAGS: @kernel_fi@ gforth$(EC)$(EXE) $(GFORTH_FI_SRC) prim.TAGS kernel.TAGS $(FORTHK) etags.fs except.fs startup.fs -e bye @@ -900,14 +932,14 @@ prim.tags: prim.b prims2x.fs $(RM) $@- kernel.TAGS: - rm kernl16l$(EC).fi-; $(MAKE) @kernel_fi@ + $(RM) kernl16l$(EC).fi-; $(MAKE) @kernel_fi@ kernel.tags: - rm kernl16l$(EC).fi-; $(MAKE) @kernel_fi@ + $(RM) kernl16l$(EC).fi-; $(MAKE) @kernel_fi@ #elc files gforth.elc: gforth.el - emacs -batch -f batch-byte-compile $< + -$(EMACS) -batch -f batch-byte-compile gforth.el #Documentation @@ -926,7 +958,7 @@ doc/gforth.texi: doc/gforth.ds prim.b ds 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 @@ -1002,14 +1034,18 @@ config.status: configure ./config.status --recheck #create files for DOS, because DOS cannot do it itself -makefile.dos engine/makefile.dos: mkdosmf.sed Makefile.in engine/Makefile.in +makefile.dos: mkdosmf.sed Makefile.in sed -f mkdosmf.sed makefile.dos + +engine/makefile.dos: mkdosmf.sed engine/Makefile.in sed -f mkdosmf.sed engine/makefile.dos -makefile.os2 engine/makefile.os2: mkos2mf.sed Makefile.in engine/Makefile.in +makefile.os2: mkos2mf.sed Makefile.in sed -f mkos2mf.sed makefile.os2 + echo '%.o: %.c' >>makefile.os2 + echo ' $$(GCC) $$(CFLAGS) $$(CPPFLAGS) -c $$<' >>makefile.os2 + +engine/makefile.os2: mkos2mf.sed engine/Makefile.in sed -f mkos2mf.sed engine/makefile.os2 - echo '%.o: %.c' >>makefile.os2 - echo ' $$(GCC) $$(CFLAGS) $$(CPPFLAGS) -c $$<' >>makefile.os2 - echo '%.o: %.c' >>engine/makefile.os2 - echo ' $$(GCC) $$(CFLAGS) $$(CPPFLAGS) -c $$<' >>engine/makefile.os2 + echo '%.o: %.c' >>engine/makefile.os2 + echo ' $$(GCC) $$(CFLAGS) $$(CPPFLAGS) -c $$<' >>engine/makefile.os2