--- gforth/Makefile.in 2010/09/13 22:27:28 1.452 +++ gforth/Makefile.in 2012/07/20 23:04:29 1.483 @@ -1,6 +1,6 @@ #Makefile for Gforth -#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008,2009 Free Software Foundation, Inc. +#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008,2009,2010,2011 Free Software Foundation, Inc. #This file is part of Gforth. @@ -46,6 +46,34 @@ EXE=@EXEEXT@ PATHSEP = @PATHSEP@ EC = @EC@ +ARCH= @ARCH@ +EXT = $(EC)$(ARCH)$(EXE) +LA = $(EC)$(ARCH).la + +# ------------ Install Directories + +package = +VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ +srcdir = @srcdir@ +bindir = $(package)@bindir@ +#read-only architecture-independent files +datarootdir = @datarootdir@ +datadir = $(package)@datadir@ +#read-only architecture-dependent non-ascii files +libdir = $(package)@libdir@ +libexecdir = $(package)@libexecdir@ +libccdir = $(subst $(DESTDIR),,$(libexecdir)/gforth$(ARCH)/$(VERSION)/libcc-named/) +includedir = $(package)@includedir@ +infodir = $(package)@infodir@ +htmldir = $(package)@htmldir@ +mandir = $(package)@mandir@ +man1dir= $(mandir)/man1 +man1ext= .1 +#older emacses have their site-lisp in $(libdir)/emacs/ +emacssitelispdir=$(package)@lispdir@ +siteforthdir=$(datadir)/gforth/site-forth # ------------- Utility programs @@ -61,14 +89,14 @@ MASSAGE_EXE = @MASSAGE_EXE@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_INFO = @INSTALL_INFO@ -LN_S = @LN_S@ +LN_S = @LN_S@ -f M4 = @M4@ GCC = @CC@ -EMACS = emacs +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) +FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(libdir)/gforth$(ARCH)/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION) FORTHSIZES = @FORTHSIZES@ FORTHS_ARGS = -p "$(FORTHPATH)$(PATHSEP)$(srcdir)" FORTH_ARGS = --die-on-signal $(FORTHS_ARGS) @@ -83,10 +111,10 @@ BUILDFORTH = $(ENGINE) --die-on-signal - FORTHB = $(BUILDFORTH) exboot.fs -e 'fpath= .|~+|$(srcdir)' # the Forth system for running prims2x.fs #FORTHP = $(FORTH) -ENGINE_FAST = ./gforth-fast +ENGINE_FAST = ./gforth-fast$(EXT) FORTH_FAST = $(ENGINE_FAST) $(FORTH_ARGS) FORTHKFLAGS= --die-on-signal -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi) -FORTHK = $(ENGINE) $(FORTHKFLAGS) +FORTHK = ./gforthker -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" #FORTHP = $(ENGINE) --die-on-signal -i ./$(kernel_fi) #the "-2 image-included-files +!" undoes the change to image-included-files # in exboot.fs @@ -117,29 +145,6 @@ 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@ @@ -181,6 +186,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 +195,8 @@ KERN_SRC = \ kernel/doers.fs \ kernel/getdoers.fs \ kernel/pass.fs \ - kernel/xchars.fs + kernel/xchars.fs \ + string.fs EC_SRC = \ asm/README \ @@ -231,6 +238,7 @@ GFORTH_FI_SRC2=\ hash.fs \ history.fs \ intcomp.fs \ + i18n.fs \ mkdir.fs \ libcc.fs \ locals.fs \ @@ -238,15 +246,19 @@ GFORTH_FI_SRC2=\ mkdir.fs \ prelude.fs \ quotes.fs \ + quotedstring.fs \ + parsedto.fs \ search.fs \ see.fs \ see-ext.fs \ simp-see.fs \ source.fs \ startup.fs \ + str-exec.fs \ struct.fs \ struct0x.fs \ stuff.fs \ + substitute.fs \ tasker.fs \ termsize.fs \ utf-8.fs \ @@ -260,7 +272,8 @@ GFORTH_FI_SRC2=\ 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 + arch/power/asm.fs arch/power/disasm.fs arch/power/inst.fs \ + arch/lm32/asm.fs arch/lm32/testasm.fs # execlude envos.fs into list of distributed sources GFORTH_FI_DIST_SRC = \ @@ -272,7 +285,7 @@ GFORTH_FI_SRC = \ envos.fs \ $(GFORTH_FI_SRC2) -LIBCC_SRC = cstr.fs unix/socket.fs +LIBCC_SRC = cstr.fs unix/socket.fs unix/pthread.fs LIBCC_DIST_SRC = libffi.fs fflib.fs $(LIBCC_SRC) @@ -288,7 +301,7 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_DIST 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 \ + tt.fs quotations.fs \ unbuffer.fs wordsets.fs xwords.fs \ test/tester.fs test/ttester.fs \ test/coretest.fs test/postpone.fs test/dbltest.fs \ @@ -301,7 +314,7 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_DIST oof.fs oofsampl.fs objects.fs objexamp.fs mini-oof.fs moof-exm.fs \ moofglos.fs fixpath.fs \ add.fs lib.fs oldlib.fs sieve.fs \ - endtry-iferror.fs recover-endtry.fs + endtry-iferror.fs recover-endtry.fs smartdots.fs COMPAT = compat/README \ compat/anslocal.fs \ @@ -380,7 +393,12 @@ ARCHS = \ arch/r8c/lauflicht.fs \ arch/r8c/tasker.fs \ arch/r8c/terminal.fs \ - arch/sharc/unistd.h + arch/sharc/unistd.h \ + arch/lm32/mach.fs \ + arch/lm32/mach.sh \ + arch/lm32/prim.fs \ + arch/lm32/Makefile \ + arch/lm32/testasm.disas-ok #not included in distribution until distribution terms are included: ARCHS_NO_DIST = \ @@ -423,7 +441,7 @@ ENGINE_SOURCES = engine/Makefile.in engi engine/makefile.dos engine/makefile.os2 SOURCES = $(ENGINE_SOURCES) compat Makefile.in Makedist.in \ - gforthmi.in vmgen.in preforth.in gfgen README.vmgen NEWS.vmgen \ + gforthmi.in vmgen.in preforth.in libforth.in gforthker.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 \ @@ -445,11 +463,11 @@ SOURCES = $(ENGINE_SOURCES) compat Makef RCS_FILES = ToDo model high-level -ENGINES = gforth$(EC)$(EXE) @NO_EC@ gforth-ditc$(EC)$(EXE) gforth-itc$(EC)$(EXE) $(PROFEXES) +ENGINES = gforth$(EXT) @NO_EC@ gforth-ditc$(EXT) gforth-itc$(EXT) $(PROFEXES) -ENGINES_FAST = @NO_EC@ gforth-fast$(OPT)$(EC)$(EXE) #gforth-native$(OPT)$(EC)$(EXE) +ENGINES_FAST = @NO_EC@ gforth-fast$(OPT)$(EXT) #gforth-native$(OPT)$(EXT) -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 \ @@ -463,7 +481,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@ @NO_EC@ gforth.fi +FORTH_GEN = $(FORTH_GEN0) @KERNEL@ @NO_CROSS@ gforth.fi # this is used for antidependences, FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ build-ec @@ -492,7 +510,7 @@ GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) \ .SUFFIXES: .SUFFIXES: .c .o -all: kernel/version.fs more @NO_EC@ check +all: kernel/version.fs more @NO_CROSS@ check # use this dependency for phony targets just as mostlyclean,... FORCE: ; @@ -512,7 +530,7 @@ version: Makefile.in configure.in kernel/version.fs: version echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs -more: $(ENGINES) $(FORTH_GEN) $(GEN) @build_libcc_named@ +more: $(ENGINES) $(FORTH_GEN) $(GEN) @libengines@ @build_libcc_named@ #from the gcc Makefile: #"Deletion of files made during compilation. @@ -544,12 +562,13 @@ docclean: FORCE doc/gforth.toc doc/gforth.tp doc/gforth.vr html clean: mostlyclean - -$(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) \ + -$(RM) -rf $(GEN) *.o engine/*.o engine/*.lo engine/*.la \ + engine/.libs engine/libgforth* libgforth* arch/*/*.o version \ + gforth-itc-noll$(EXT) engine/gforth-itc-noll$(EXT) \ + gforth-ditc-noll$(EXT) engine/gforth-ditc-noll$(EXT) \ + gforth-prof-noll$(EXT) engine/gforth-prof-noll$(EXT) \ 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 + for i in gforth gforth-fast gforth-native; do for j in $(OPTS); do rm -f engine/$$i$${j}$(EXT) $$i$${j}$(EXT); done; done distclean: clean -$(RM) -rf config.cache config.log config.status \ @@ -597,6 +616,9 @@ bindist: Makedist FORCE binonlydist: Makedist FORCE $(MAKE) -f Makedist d$@ +debdist: Makedist FORCE + $(MAKE) -f Makedist d$@ + #HPUX make breaks the cycle differently when the dates are equal, so # touch some of the files if it acts up hpux-workaround: @@ -610,23 +632,25 @@ 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$(EC)$(EXE) $(FORTH_SRC) $(kernel_fi) gforth.fi gforthmi vmgen doc/gforth.1 prim install.TAGS installdirs +install: gforth$(EXT) $(FORTH_SRC) $(kernel_fi) gforthmi vmgen doc/gforth.1 prim install.TAGS installdirs @libinstall@ @NO_CROSS@ gforth.fi $(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)) + -$(RM) $(DESTDIR)$(bindir)/gforth$(EXT) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EXT) $(DESTDIR)$(bindir)/gforthmi $(DESTDIR)$(bindir)/vmgen + -$(RM) $(DESTDIR)$(bindir)/gforth-fast$(EXT) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EXT) + -$(RM) $(DESTDIR)$(bindir)/gforth-itc$(EXT) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EXT) + -$(RM) $(DESTDIR)$(bindir)/gforth-ditc$(EXT) $(DESTDIR)$(bindir)/gforth-ditc-$(VERSION)$(EXT) + $(INSTALL_PROGRAM) gforth$(EXT) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EXT) + -$(MASSAGE_EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EXT) + (cd $(DESTDIR)$(bindir) && $(LN_S) gforth-$(VERSION)$(EXT) gforth$(EXT)) + $(INSTALL_PROGRAM) gforth-fast$(EXT) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EXT) + -$(MASSAGE_EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EXT) + (cd $(DESTDIR)$(bindir) && $(LN_S) gforth-fast-$(VERSION)$(EXT) gforth-fast$(EXT)) + $(INSTALL_PROGRAM) gforth-itc$(EXT) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EXT) + (cd $(DESTDIR)$(bindir) && $(LN_S) gforth-itc-$(VERSION)$(EXT) gforth-itc$(EXT)) + $(INSTALL_PROGRAM) gforth-ditc$(EXT) $(DESTDIR)$(bindir)/gforth-ditc-$(VERSION)$(EXT) + (cd $(DESTDIR)$(bindir) && $(LN_S) gforth-ditc-$(VERSION)$(EXT) gforth-ditc$(EXT)) $(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) @@ -634,21 +658,22 @@ install: gforth$(EC)$(EXE) $(FORTH_SRC) 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) + $(INSTALL_DATA) $(kernel_fi) $(DESTDIR)$(libdir)/gforth$(ARCH)/$(VERSION) @if test -d "$(DESTDIR)$(emacssitelispdir)"; then \ - $(INSTALL_DATA) gforth.el $(DESTDIR)$(emacssitelispdir); \ - $(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.{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 -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) + @NO_CROSS@GFORTHD="./gforth-ditc$(EXT) -p $(DESTDIR)$(libdir)/gforth/site-forth$(PATHSEP)$(DESTDIR)$(siteforthdir)$(PATHSEP)$(DESTDIR)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc$(EXT) -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) + @NO_CROSS@$(INSTALL_DATA) gforth.fi $(DESTDIR)$(libdir)/gforth$(ARCH)/$(VERSION) $(INSTALL_DATA) install.TAGS $(DESTDIR)$(datadir)/gforth/$(VERSION)/TAGS - $(RM) gforth.fi install.TAGS - $(INSTALL_DATA) include/gforth/$(VERSION)/* $(DESTDIR)$(includedir)/gforth/$(VERSION) + $(RM) install.TAGS @NO_CROSS@gforth.fi + $(INSTALL_DATA) include/gforth$(ARCH)/$(VERSION)/* $(DESTDIR)$(includedir)/gforth$(ARCH)/$(VERSION) 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; \ + $(LIBTOOL) --silent --mode=install $(INSTALL) lib/gforth$(ARCH)/$(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 @@ -656,9 +681,14 @@ install: gforth$(EC)$(EXE) $(FORTH_SRC) install-strip: install +libinstall: $(ENGINES:%$(EXT)=lib%) $(ENGINES_FAST:%$(EXT)=lib%) + for i in $(ENGINES:%$(EXT)=lib%) $(ENGINES_FAST:%$(EXT)=lib%); do \ + $(LIBTOOL) --silent --mode=install $(INSTALL) engine/$$i.la $(libdir)/$$i.la; \ + done + installdirs: mkinstalldirs $(NORMAL_INSTALL) - for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir) $(includedir)/gforth/$(VERSION) $(libccdir); do \ + for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth$(ARCH)/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir) $(includedir)/gforth$(ARCH)/$(VERSION) $(libccdir); do \ $(srcdir)/mkinstalldirs $(DESTDIR)$$i; \ done # @@ -670,25 +700,25 @@ installdirs: mkinstalldirs #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) - @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" + -$(RM) -rf $(DESTDIR)$(libdir)/gforth$(ARCH)/$(VERSION) $(DESTDIR)$(datadir)/gforth/$(VERSION) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EXT) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EXT) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EXT) $(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$(EXT) $(DESTDIR)$(bindir)/gforth-fast$(EXT) $(DESTDIR)$(bindir)/gforth-itc$(EXT) $(DESTDIR)$(bindir)/gforthmi $(DESTDIR)$(bindir)/vmgen $(DESTDIR)$(man1dir)/gforth.1 $(DESTDIR)$(infodir)/gforth.info* $(DESTDIR)$(datadir)/gforth $(DESTDIR)$(libdir)/gforth" build-libcc-named: $(LIBCC_BUILD_SRC) $(FORTH_GEN) $(GEN) FORCE - $(RMTREE) 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" $(srcdir)/$$i -e bye; done + $(RMTREE) lib/gforth$(ARCH)/$(VERSION)/libcc-named/ + for i in $(LIBCC_BUILD_SRC); do ./libforth -e "s\" `pwd`/lib/gforth$(ARCH)/$(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 check-nofast ENGINE="./gforth" >/dev/null 2>&1 - $(MAKE) checkone ENGINE="./gforth-fast" >/dev/null 2>&1 + $(MAKE) checkone check-nofast ENGINE="./gforth$(EXT) --no-dynamic" >/dev/null 2>&1 + $(MAKE) checkone check-nofast ENGINE="./gforth-itc$(EXT)" >/dev/null 2>&1 + $(MAKE) checkone check-nofast ENGINE="./gforth-ditc$(EXT)" >/dev/null 2>&1 + $(MAKE) checkone ENGINE="./gforth-fast$(EXT) --no-dynamic" >/dev/null 2>&1 + $(MAKE) checkone check-nofast ENGINE="./gforth$(EXT)" >/dev/null 2>&1 + $(MAKE) checkone ENGINE="./gforth-fast$(EXT)" >/dev/null 2>&1 @echo "*** Check successful ***" - ./gforth-fast --diag -e bye + ./gforth-fast$(EXT) --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 test/macros.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/gforth.out @@ -706,7 +736,7 @@ 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$(EC)$(EXE) gforth.fi +bench: gforth-fast$(EXT) 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" @@ -791,8 +821,8 @@ kernl64l$(EC).fi: $(KERNLS) # -$(CP) $@ $@~ # -$(CP) $< $@ -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) +gforth.fi: $(kernel_fi) gforthmi gforth-ditc$(EXT) $(GFORTH_FI_SRC) comp-i.fs + @NO_CROSS@GFORTHD="./gforth-ditc$(EXT) -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc$(EXT) --die-on-signal -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) $(STARTUP)" includedir=`pwd`/include bindir=`pwd` libccdir=`pwd`/lib/gforth$(ARCH)/$(VERSION)/libcc-named/ ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) $(STARTUP) # ------------- Make c-engine @@ -833,55 +863,95 @@ MAKELINE-noll-reg = OPT=-noll-reg OPTDEF 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@ +gforth$(OPT)$(EXT): $(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; \ + for i in $(OPTS); do $(MAKE) optgforth OPT=$$i && $(CP) gforth$${i}$(EXT) $@ && break; done; \ else \ ( cd engine && $(MAKE) $@ ) && \ $(CP) engine/$@ $@ && \ $(MASSAGE_EXE) $@; \ @GFORTH_EXE@; \ - @NO_EC@ $(MAKE) checkone check-nofast ENGINE=./engine/$@; \ + @NO_CROSS@ $(MAKE) checkone check-nofast ENGINE=./engine/$@; \ fi optgforth: - $(MAKE) gforth$(OPT)$(EC)$(EXE) $(MAKELINE$(OPT)) + $(MAKE) gforth$(OPT)$(EXT) $(MAKELINE$(OPT)) -gforth-fast$(OPT)$(EC)$(EXE): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE_FAST) engine/config.h +gforth-fast$(OPT)$(EXT): $(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; \ + for i in $(OPTS); do $(MAKE) optgforth-fast OPT=$$i && $(CP) gforth-fast$${i}$(EXT) $@ && break; done; \ else \ - ( cd engine && $(MAKE) $@ ) && \ + (cd engine && $(MAKE) $@ ) && \ $(CP) engine/$@ $@ && \ $(MASSAGE_EXE) $@; \ @GFORTHFAST_EXE@; \ - @NO_EC@ $(MAKE) checkone ENGINE=./engine/$@; \ + @NO_CROSS@ $(MAKE) checkone ENGINE=./engine/$@; \ fi optgforth-fast: - $(MAKE) gforth-fast$(OPT)$(EC)$(EXE) $(MAKELINE$(OPT)) + $(MAKE) gforth-fast$(OPT)$(EXT) $(MAKELINE$(OPT)) -gforth-native$(OPT)$(EC)$(EXE): engines-fast +gforth-native$(OPT)$(EXT): engines-fast $(CP) engine/$@ $@ -$(MASSAGE_EXE) $@ #@GFORTHX_EXE@ -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) $@ +gforth-itc$(EXT): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h + cd engine && $(MAKE) gforth-itc-noll$(EXT) $(MAKELINE-noll) + $(CP) engine/gforth-itc-noll$(EXT) $@ @GFORTHITC_EXE@ -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) $@ +gforth-ditc$(EXT): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h + cd engine && $(MAKE) gforth-ditc-noll$(EXT) $(MAKELINE-noll) + $(CP) engine/gforth-ditc-noll$(EXT) $@ @GFORTHDITC_EXE@ -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) $@ +gforth-prof$(EXT): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h + cd engine && $(MAKE) gforth-prof-noll$(EXT) $(MAKELINE-noll) + $(CP) engine/gforth-prof-noll$(EXT) $@ gforths: $(ENGINES) $(ENGINES_FAST) +#For now, we have no way to check if the engines build correctly +libgforth$(OPT)$(EXT): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/config.h @kernel_anti_dependence@ + if test -z "$(OPT)"; then \ + for i in $(OPTS); do $(MAKE) optlibgforth OPT=$$i && $(MAKE) optlibgforth2 OPT=$$i && $(LN_S) engine/$@ $@ && break; done; \ + else \ + (cd engine && $(MAKE) $@ ); \ + @NO_CROSS@ $(MAKE) checkone check-nofast ENGINE=./engine/$@; \ + fi + +optlibgforth: + $(MAKE) libgforth$(OPT)$(EXT) $(MAKELINE$(OPT)) + +optlibgforth2: + (cd engine && $(MAKE) libgforth$(EXT) $(MAKELINE$(OPT))) + +libgforth-fast$(OPT)$(EXT): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE_FAST) engine/config.h + if test -z "$(OPT)"; then \ + for i in $(OPTS); do $(MAKE) optlibgforth-fast OPT=$$i && $(MAKE) optlibgforth-fast2 OPT=$$i && $(LN_S) engine/$@ $@ && break; done; \ + else \ + (cd engine && $(MAKE) $@ ); \ + @NO_CROSS@ $(MAKE) checkone ENGINE=./engine/$@; \ + fi + +optlibgforth-fast: + $(MAKE) libgforth-fast$(OPT)$(EXT) $(MAKELINE$(OPT)) + +optlibgforth-fast2: + (cd engine && $(MAKE) libgforth-fast$(EXT) $(MAKELINE$(OPT))) + +libgforth-itc$(EXT): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h + cd engine && $(MAKE) libgforth-itc$(EXT) $(MAKELINE-noll) + +libgforth-ditc$(EXT): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h + cd engine && $(MAKE) libgforth-ditc$(EXT) $(MAKELINE-noll) + +libgforth-prof$(EXT): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h + cd engine && $(MAKE) libgforth-prof$(EXT) $(MAKELINE-noll) + +libgforths: $(ENGINES:%$(EXT)=lib%) $(ENGINES_FAST:%$(EXT)=lib%) + # ------------- additional C primitives .SUFFIXES: .c .pri @@ -902,14 +972,14 @@ tags: gforth.tags $(CP) gforth.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 + sed 's;^\$(srcdir)/;;' TAGS|$(PREFORTH) -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 +gforth.TAGS: @kernel_fi@ gforth$(EXT) $(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$(EC)$(EXE) $(GFORTH_FI_SRC) prim.tags kernel.tags +gforth.tags: @kernel_fi@ gforth$(EXT) $(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 @@ -1023,7 +1093,7 @@ engine/config.h: stamp-h stamp-h: engine/config.h.in config.status stamp-h.in ./config.status -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 +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 libforth.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