--- gforth/Makefile.in 2008/04/20 15:33:47 1.395 +++ gforth/Makefile.in 2009/09/05 17:38:37 1.446 @@ -1,6 +1,6 @@ #Makefile for Gforth -#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007 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. @@ -45,8 +45,6 @@ EXE=@EXEEXT@ PATHSEP = @PATHSEP@ -osclass = @OSCLASS@ - EC = @EC@ # ------------- Utility programs @@ -66,7 +64,9 @@ INSTALL_INFO = @INSTALL_INFO@ LN_S = @LN_S@ M4 = @M4@ GCC = @CC@ -PREFORTH = @PREFORTH@ -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" +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) FORTHSIZES = @FORTHSIZES@ @@ -82,7 +82,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) @@ -129,6 +129,7 @@ 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@ @@ -142,14 +143,14 @@ siteforthdir=$(datadir)/gforth/site-fort 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 @@ -229,9 +230,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 \ @@ -255,14 +259,20 @@ GFORTH_FI_SRC = \ arch/mips/testasm.fs arch/mips/testdisasm.fs \ arch/power/asm.fs arch/power/disasm.fs arch/power/inst.fs -FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_SRC) \ +LIBCC_SRC = cstr.fs unix/socket.fs + +LIBCC_DIST_SRC = libffi.fs fflib.fs $(LIBCC_SRC) + +LIBCC_BUILD_SRC = @LIBCC_BUILD_SRC@ $(LIBCC_SRC) + +FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_SRC) $(LIBCC_DIST_SRC) \ ans-report.fs ansi.fs answords.fs \ colorize.fs comp-i.fs complex.fs \ depth-changes.fs dosekey.fs doskey.fs ds2texi.fs \ 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,7 +285,7 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) bubble.fs siev.fs matrix.fs fib.fs \ oof.fs oofsampl.fs objects.fs objexamp.fs mini-oof.fs moof-exm.fs \ moofglos.fs fixpath.fs \ - add.fs lib.fs oldlib.fs fflib.fs libffi.fs sieve.fs unix/socket.fs \ + add.fs lib.fs oldlib.fs sieve.fs \ endtry-iferror.fs recover-endtry.fs COMPAT = compat/README \ @@ -345,14 +355,15 @@ ARCHS = \ arch/sharc/types.h \ arch/sharc/g21k-3.3.4-bp1.diff \ arch/r8c/asm.fs \ - arch/r8c/asm-test.fs \ + arch/r8c/mach.fs \ + arch/r8c/errors.fs \ arch/r8c/prim.fs \ + arch/r8c/asm-test.fs \ arch/r8c/errors.fs \ - arch/r8c/tt.fs \ - arch/r8c/tasker.fs \ arch/r8c/lauflicht.fs \ + arch/r8c/tasker.fs \ arch/r8c/terminal.fs \ - arch/r8c/mach.fs + arch/sharc/unistd.h #not included in distribution until distribution terms are included: ARCHS_NO_DIST = \ @@ -369,9 +380,9 @@ ARCHS_NO_DIST = \ arch/c165/mach.fs \ arch/c165/prim.fs \ arch/h8/asm.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 \ @@ -394,10 +405,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 \ - gforthmi.in vmgen.in gfgen README.vmgen NEWS.vmgen \ - configure.in configure config.sub config.guess elisp-comp missing \ - stamp-h.in envos.fs.in \ +SOURCES = $(ENGINE_SOURCES) compat Makefile.in Makedist.in \ + gforthmi.in vmgen.in preforth.in gfgen README.vmgen NEWS.vmgen \ + autogen.sh configure.in configure config.sub config.guess \ + elisp-comp missing stamp-h.in envos.fs.in \ iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS \ BUILD-FROM-SCRATCH model \ COPYING COPYING.LIB COPYING.DOC AUTHORS ChangeLog Benchres aclocal.m4 \ @@ -421,7 +432,7 @@ ENGINES = gforth$(EC)$(EXE) gforth-ditc$ ENGINES_FAST = gforth-fast$(OPT)$(EC)$(EXE) #gforth-native$(OPT)$(EC)$(EXE) -GEN = $(ENGINES) $(ENGINES_FAST) kernel/version.fs gforth.elc +GEN = $(ENGINES) $(ENGINES_FAST) gforth.elc # things that need a working forth system to be generated FORTH_GEN_ENGINE=engine/prim.i engine/prim_lab.i engine/prim_names.i \ @@ -464,11 +475,14 @@ GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) \ .SUFFIXES: .SUFFIXES: .c .o -all: kernel/version.fs more +all: kernel/version.fs more 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 @@ -481,8 +495,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. @@ -525,7 +538,7 @@ 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 @@ -537,6 +550,8 @@ 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). @@ -581,7 +596,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) @@ -593,52 +608,59 @@ 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 $(srcdir)/doc/gforth.info* $(srcdir)/doc/vmgen.info*; do $(INSTALL_DATA) $$i $(DESTDIR)$(infodir); done for i in $(FORTH_SRC) $(COMPAT) 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.el $(DESTDIR)$(emacssitelispdir); \ $(INSTALL_DATA) gforth.elc $(DESTDIR)$(emacssitelispdir); \ else \ - echo ">>>>>Please install gforth.elc in your .../emacs/site-lisp directory"; \ + echo '>>>>>Please install gforth.{el,elc} in your .../emacs/site-lisp directory'; \ fi -$(RM) gforth.fi - GFORTHD="./gforth-ditc -p $(DESTDIR)$(libdir)/gforth/site-forth$(PATHSEP)$(DESTDIR)$(siteforthdir)$(PATHSEP)$(DESTDIR)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) $(STARTUP)" includedir=$(includedir) bindir=$bindir GFORTHPATH=.:"$$GFORTHPATH" GFORTHDESTDIR="$(DESTDIR)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP) + GFORTHD="./gforth-ditc -p $(DESTDIR)$(libdir)/gforth/site-forth$(PATHSEP)$(DESTDIR)$(siteforthdir)$(PATHSEP)$(DESTDIR)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc -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) + 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 installdirs: mkinstalldirs $(NORMAL_INSTALL) - for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir) $(includedir)/gforth/$(VERSION); do \ + for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir) $(includedir)/gforth/$(VERSION) $(libccdir); do \ $(srcdir)/mkinstalldirs $(DESTDIR)$$i; \ done - for i in $(CVSDIRS); do \ - $(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: gforths gforth.fi +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 + +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 @@ -753,20 +775,20 @@ kernl64l$(EC).fi: $(KERNLS) # -$(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` ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) $(STARTUP) + 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) -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 - GFORTH="$(FORTHP)" $(srcdir)/gfgen -fast + GFORTH="$(PREFORTH)" $(srcdir)/gfgen -fast $(FORTH_GEN_ENGINE): prim.b prims2x.fs GFORTH="$(PREFORTH)" $(srcdir)/gfgen @@ -794,12 +816,11 @@ 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 +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@; \ @@ -846,10 +867,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 @@ -861,8 +884,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 @@ -888,14 +911,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 @@ -914,7 +937,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 @@ -971,7 +994,7 @@ configure: configure.in aclocal.m4 cd $(srcdir) && autoconf aclocal.m4: configure.in - aclocal -I libltdl/m4 + aclocal # autoheader might not change config.h.in, so touch a stamp file. engine/config.h.in: stamp-h.in @@ -983,21 +1006,25 @@ engine/config.h: stamp-h stamp-h: engine/config.h.in config.status stamp-h.in ./config.status -Makefile Makedist engine/Makefile gforthmi vmgen machpc.fs doc/version.texi envos.fs build-ec: Makefile.in Makedist.in engine/Makefile.in gforthmi.in vmgen.in machpc.fs.in doc/version.texi.in config.status configure.in envos.fs.in build-ec.in +Makefile Makedist engine/Makefile gforthmi vmgen preforth machpc.fs doc/version.texi envos.fs build-ec: Makefile.in Makedist.in engine/Makefile.in gforthmi.in vmgen.in preforth.in machpc.fs.in doc/version.texi.in config.status configure.in envos.fs.in build-ec.in engine/libcc.h.in ./config.status config.status: configure ./config.status --recheck #create files for DOS, because DOS cannot do it itself -makefile.dos 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