--- gforth/Makefile.in 1998/10/14 22:23:11 1.120 +++ gforth/Makefile.in 1999/01/10 22:00:22 1.144 @@ -1,6 +1,6 @@ #Makefile for Gforth -#Copyright (C) 1995-1997 Free Software Foundation, Inc. +#Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc. #This file is part of Gforth. @@ -31,12 +31,13 @@ # ------------- gforth version VERSION = @VERSION@ -DOSVERSION=`echo $VERSION|sed 's/\.//g'` +DOSVERSION=`echo $(VERSION)|sed 's/\.//g'` # ------------- System specific variables machine=@machine@ kernel_fi=@kernel_fi@ +EXE=@EXE@ # this is the type of machine # used to extend the include path with ./arch/$machine @@ -52,7 +53,8 @@ osclass = @OSCLASS@ SHELL = /bin/sh RM = rm RMTREE = rm -rf -CP = cp +CP = cp -p +MV = mv TAR = tar cf - INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -60,10 +62,14 @@ INSTALL_DATA = @INSTALL_DATA@ LN_S = @LN_S@ GCC = @CC@ CC = $(GCC) -FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(datadir)/gforth/site-forth$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION) +FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION) FORTHSIZES = @FORTHSIZES@ -FORTH = ./gforth --die-on-signal -p $(FORTHPATH)$(PATHSEP)$(srcdir) -FORTHKFLAGS= --die-on-signal -p .$(PATHSEP)$(srcdir) -i ./$(kernel_fi) +FORTH_ARGS = --die-on-signal -p $(FORTHPATH)$(PATHSEP)$(srcdir) +ENGINE = ./gforth +FORTH = $(ENGINE) $(FORTH_ARGS) +ENGINE_FAST = $(ENGINE)-fast +FORTH_FAST = $(ENGINE_FAST) $(FORTH_ARGS) +FORTHKFLAGS= --die-on-signal -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi) FORTHK = ./gforth $(FORTHKFLAGS) FORTHP = ./gforth --die-on-signal -i ./$(kernel_fi) STRIP = strip @@ -104,11 +110,19 @@ man1dir= $(mandir)/man1 man1ext= .1 #older emacses have their site-lisp in $(libdir)/emacs/ emacssitelispdir=@lispdir@ +siteforthdir=$(datadir)/gforth/site-forth -INCLUDES = engine/CVS engine/forth.h engine/threaded.h engine/io.h +CVSDIRS = CVS engine/CVS kernel/CVS doc/CVS asm/CVS ec/CVS test/CVS \ + compat/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 \ + +INCLUDES = engine/forth.h engine/threaded.h engine/io.h KERN_SRC = \ - kernel/CVS \ kernel/aliases0.fs \ kernel/aliases.fs \ kernel/args.fs \ @@ -140,14 +154,12 @@ KERN_SRC = \ kernel/getdoers.fs EC_SRC = \ - asm/CVS \ asm/README \ asm/bitmask.fs \ asm/numref.fs \ asm/basic.fs \ asm/generic.fs \ asm/target.fs \ - ec/CVS \ ec/README \ ec/mirror.fs \ ec/mirrors.fs \ @@ -195,54 +207,51 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) ans-report.fs ansi.fs answords.fs \ code.fs colorize.fs comp-i.fs \ doskey.fs ds2texi.fs \ - envos.fs envos.dos envos.os2 etags.fs filedump.fs \ + envos.fs envos.dos envos.os2 etags.fs filedump.fs fi2c.fs \ glosgen.fs gray.fs \ doc/makedoc.fs \ mach16b.fs mach16l.fs mach32b.fs mach32l.fs mach64b.fs mach64l.fs \ machpc.fs more.fs other.fs prims2x.fs random.fs \ - siteinit.fs table.fs \ + table.fs \ tt.fs sokoban.fs \ unbuffered.fs wordsets.fs \ test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs \ - test/other.fs test/checkans.fs test/CVS \ + test/other.fs test/checkans.fs \ bubble.fs siev.fs matrix.fs fib.fs \ oof.fs oofsampl.fs objects.fs objexamp.fs mini-oof.fs moof-exm.fs -COMPAT = compat/CVS compat/README compat/control.fs compat/anslocal.fs \ - compat/struct.fs compat/loops.fs +COMPAT = compat/README \ + compat/anslocal.fs \ + compat/assert.fs \ + compat/control.fs \ + compat/defer.fs \ + compat/exception.fs \ + compat/loops.fs \ + compat/required.fs \ + compat/struct.fs \ + compat/vocabulary.fs GFORTH_TEXI = doc/gforth.texi doc/version.texi ALLSUBDIRS = engine ARCHS = \ - arch/CVS \ - arch/generic/CVS \ arch/generic/machine.h \ - arch/m68k/CVS \ arch/m68k/machine.h \ - arch/mips/CVS \ arch/mips/machine.h \ - arch/386/CVS \ arch/386/machine.h \ - arch/hppa/CVS \ arch/hppa/machine.h \ arch/hppa/cache.c \ - arch/sparc/CVS \ arch/sparc/machine.h \ - arch/power/CVS \ arch/power/machine.h \ arch/power/_sync_cache_range.c \ - arch/alpha/CVS \ arch/alpha/machine.h \ - arch/4stack/CVS \ arch/4stack/README \ arch/4stack/asm.fs \ arch/4stack/mach.fs \ arch/4stack/prim.fs \ arch/4stack/mach.sh \ arch/4stack/relocate.fs \ - arch/misc/CVS \ arch/misc/README \ arch/misc/asm.fs \ arch/misc/mach.fs \ @@ -250,27 +259,21 @@ ARCHS = \ arch/misc/sim.fs \ arch/misc/sokoban.fs \ arch/misc/tt.fs \ - arch/6502/CVS \ 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/CVS \ arch/8086/asm.fs \ arch/8086/mach.fs \ arch/8086/mach.sh \ arch/8086/prim.fs \ - arch/avr/CVS \ arch/avr/asm.fs \ - arch/c165/CVS \ arch/c165/asm.fs \ arch/c165/mach.fs \ arch/c165/prim.fs \ - arch/h8/CVS \ arch/h8/asm.fs \ - arch/shboom/CVS \ arch/shboom/asm.fs \ arch/shboom/compiler.fs \ arch/shboom/dis.fs \ @@ -280,23 +283,22 @@ ARCHS = \ arch/shboom/sh.p \ arch/shboom/doers.fs -SOURCES = CVS engine/CVS compat Makefile.in engine/Makefile.in gforthmi \ +SOURCES = $(CVSDIRS) compat Makefile.in Makedist.in engine/Makefile.in gforthmi.in \ configure.in configure config.sub config.guess elisp-comp missing \ acconfig.h acinclude.m4 engine/config.h.in stamp-h.in \ install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS model \ COPYING AUTHORS ChangeLog Benchres aclocal.m4 \ doc/gforth.ds doc/texinfo.tex doc/gforth.1 doc/version.texi.in \ - doc/CVS gforth.el \ + gforth.el \ prim engine/engine.c engine/main.c engine/io.c engine/memcmpc.c \ $(ARCHS) \ - engine/32bit.h \ engine/getopt.c engine/getopt1.c engine/getopt.h engine/select.c \ engine/ecvt.c engine/memcmp.c engine/strtol.c engine/strtoul.c \ engine/ansidecl.h engine/memmove.c \ engine/pow10.c engine/atanh.c engine/cleanalign.c \ - engine/strerror.c engine/strsignal.c engine/strsig.c engine/dblsub.c \ - INSTALL.DOS makefile.dos engine/makefile.dos mkdosmf.sed configure.bat \ - dosconf.h gforthmi.bat mkinstalldirs \ + engine/strerror.c engine/strsignal.c engine/dblsub.c \ + INSTALL.DOS makefile.dos engine/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 \ gforthmi.cmd glosgen.glo doc/glossaries.doc \ @@ -305,7 +307,7 @@ SOURCES = CVS engine/CVS compat Makefile RCS_FILES = ToDo model high-level -GEN = gforth gforth-ditc kernel/version.fs version-stamp +GEN = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) kernel/version.fs # things that need a working forth system to be generated FORTH_GEN0 = prim.b engine/prim.i engine/prim_lab.i kernel/aliases.fs kernel/prim.fs @@ -316,18 +318,11 @@ FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ #distributed documentation DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.ps -#stuff in a binonly distribution -BINONLYDIST = config.status Makefile gforth gforth-ditc \ - $(OBJECTS0) $(OBJECTS) $(OBJECTS_DITC)\ - arch/$(machine)/machine.h engine/config.h engine/Makefile \ - stamp-h kernel/version.fs version-stamp \ - INSTALL.BINDIST - KERNLS = kernl16b.fi- kernl16l.fi- \ kernl32b.fi- kernl32l.fi- \ kernl64b.fi- kernl64l.fi- -GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) doc/gforth.texi doc/gforth.dvi doc/gforth.ps Makefile engine/Makefile configure +GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) doc/gforth.texi doc/gforth.dvi doc/gforth.ps Makefile Makedist engine/Makefile configure #standards.info recommends this: .SUFFIXES: @@ -349,10 +344,10 @@ version: Makefile.in # shell und file utilities. kernel/version.fs: version - $(MAKE) gforth - $(SHELL) versions.bsh $(VERSION) + $(MAKE) gforth$(EXE) + echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs -more: engine $(FORTH_GEN) gforth +more: engine $(FORTH_GEN) gforth$(EXE) #from the gcc Makefile: #"Deletion of files made during compilation. @@ -376,14 +371,15 @@ mostlyclean: FORCE gforth-$(VERSION).tar.gz clean: mostlyclean - -$(RM) -rf $(GEN) engine/gforth engine/gforth-ditc \ + -$(RM) -rf $(GEN) engine/gforth$(EXE) \ + engine/gforth-fast$(EXE) engine/gforth-ditc$(EXE) \ *.o engine/*.o arch/*/*.o version distclean: clean -$(RM) config.cache config.log config.status \ - engine/config.h Makefile engine/Makefile \ + engine/config.h Makefile Makedist engine/Makefile \ stamp-h engine/stamp-h \ - doc/version.texi + doc/version.texi gforthmi #realclean is useless, but dangerous, so it's commented out #realclean: distclean @@ -394,74 +390,32 @@ virtualclean: mostlyclean -$(RM) -rf gforth.fns gforth.texi gforth.ps gforth.info* \ gforth-$(VERSION).tar.gz config.cache *~ */*~ -#use dist targets only when srcdir=. -dist: $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) - -$(RMTREE) gforth-$(VERSION) - mkdir gforth-$(VERSION) - $(TAR) $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) | \ - (cd gforth-$(VERSION); tar xf -) - $(TAR) gforth-$(VERSION)|gzip -9 >gforth-$(VERSION).tar.gz - -$(RMTREE) gforth-$(VERSION) - -#use dist targets only when srcdir=. -dosdist: $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) - -$(RMTREE) gforth.$(DOSVERSION) - mkdir gforth.$(DOSVERSION) - $(TAR) $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) | \ - (cd gforth.$(DOSVERSION); tar xf -) - zip -r9 gf$(DOSVERSION)dos.zip gforth.$(DOSVERSION)/* - -$(RMTREE) gforth.$(DOSVERSION) - -#A source distribution contains only the things needed to install gforth, -#without the documents. -srcdist: $(SOURCES) $(FORTH_GEN0) @KERNEL@ - -$(RMTREE) gforth-$(VERSION) - mkdir gforth-$(VERSION) - $(TAR) $(SOURCES) $(FORTH_GEN0) @KERNEL@ | \ - (cd gforth-$(VERSION); tar xf -) - $(TAR) gforth-$(VERSION)|gzip -9 >gforth-src-$(VERSION).tar.gz - -$(RMTREE) gforth-$(VERSION) - -srconlydist: $(SOURCES) - -$(RMTREE) gforth-$(VERSION) - mkdir gforth-$(VERSION) - $(TAR) $(SOURCES) | \ - (cd gforth-$(VERSION); tar xf -) - $(TAR) gforth-$(VERSION)|gzip -9 >gforth-srconly-$(VERSION).tar.gz - -$(RMTREE) gforth-$(VERSION) - -#A document distribution contains only the documents, which can be created -#with MAKE. -docdist: $(DOCDIST) - -$(RMTREE) gforth-$(VERSION) - mkdir gforth-$(VERSION) - $(TAR) $(DOCDIST) | (cd gforth-$(VERSION); tar xf -) - $(TAR) gforth-$(VERSION)|gzip -9 >gforth-doc-$(VERSION).tar.gz - -$(RMTREE) gforth-$(VERSION) - -#a binary distribution contains the complete source distribution, -# the objects, the executable and the links. the objects are there for making -# make happy. -bindist: $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) $(BINONLYDIST) - -$(RMTREE) gforth-$(VERSION) - mkdir gforth-$(VERSION) - $(TAR) $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) $(BINONLYDIST) | (cd gforth-$(VERSION); tar xf -) - strip gforth-$(VERSION)/gforth - $(TAR) gforth-$(VERSION)|gzip -9 >gforth-$(VERSION)-@host@.tar.gz - -#makes a package with only the stuff not present in the source -#package. For installation the source package is still needed! -#This is useful if you want to distribute many binary versions in -#little space (e.g., on floppy disk): Put the source package and -#all the binonly packages you are interested in on the disk. The user -#then just has to unpack the source and his favourite binonly into the -#same directory and has a full binary distribution. -binonlydist: $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) $(BINONLYDIST) - -$(RMTREE) gforth-$(VERSION) - mkdir gforth-$(VERSION) - $(TAR) $(BINONLYDIST) | (cd gforth-$(VERSION); tar xf -) - strip gforth-$(VERSION)/gforth - $(TAR) gforth-$(VERSION)|gzip -9 >gforth-$(VERSION)-binonly-@host@.tar.gz +#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 FORCE + $(MAKE) -f Makedist d$@ + +dosdist: Makedist FORCE + $(MAKE) -f Makedist d$@ + +srcdist: Makedist FORCE + $(MAKE) -f Makedist d$@ + +srconlydist: Makedist FORCE + $(MAKE) -f Makedist d$@ + +docdist: Makedist FORCE + $(MAKE) -f Makedist d$@ + +htmldist: Makedist FORCE + $(MAKE) -f Makedist d$@ + +bindist: Makedist FORCE + $(MAKE) -f Makedist d$@ + +binonlydist: Makedist FORCE + $(MAKE) -f Makedist d$@ #strip gforth, because the debugging stuff is hardly useful once @@ -470,21 +424,26 @@ binonlydist: $(SOURCES) $(FORTH_GEN0) @K #install does not depend on gforth.info, because that would require #supplying a lot of files that can be easily generated (only info is #hard to generate) -install: gforth $(FORTH_SRC) $(kernel_fi) gforth.fi doc/gforth.1 prim gforth.TAGS installdirs - touch $(datadir)/gforth/site-forth/siteinit.fs - -$(RM) $(bindir)/gforth $(bindir)/gforth-$(VERSION) - $(INSTALL_PROGRAM) -s gforth $(bindir) - ln $(bindir)/gforth $(bindir)/gforth-$(VERSION) +install: gforth$(EXE) $(FORTH_SRC) $(kernel_fi) gforth.fi gforthmi doc/gforth.1 prim install.TAGS installdirs + touch $(siteforthdir)/siteinit.fs + -$(RM) $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforthmi + $(INSTALL_PROGRAM) -s gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) + $(LN_S) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforth$(EXE) + $(INSTALL_PROGRAM) -s gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE) + $(LN_S) $(bindir)/gforth-fast-$(VERSION)$(EXE) $(bindir)/gforth-fast$(EXE) + $(INSTALL_PROGRAM) gforthmi $(bindir)/gforthmi-$(VERSION) + $(LN_S) $(bindir)/gforthmi-$(VERSION) $(bindir)/gforthmi -$(INSTALL_DATA) $(srcdir)/doc/gforth.1 $(man1dir) - -for i in $(srcdir)/gforth.info*; do $(INSTALL_DATA) $$i $(infodir); done - for i in $(FORTH_SRC) prim; do \ - $(INSTALL_DATA) $(srcdir)/$$i $(datadir)/gforth/$(VERSION); \ + -for i in $(srcdir)/doc/gforth.info*; do $(INSTALL_DATA) $$i $(infodir); done + for i in $(FORTH_SRC) $(COMPAT) prim; do \ + $(INSTALL_DATA) $(srcdir)/$$i $(datadir)/gforth/$(VERSION)/$$i; \ done $(INSTALL_DATA) $(kernel_fi) $(datadir)/gforth/$(VERSION) - $(RM) gforth.fi; $(MAKE) gforth.fi #gforth.fi contains some path names + $(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.fs" ./gforthmi gforth.fi $(FORTHSIZES) startup.fs #gforth.fi contains some path names $(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION) - sed 's:^$(srcdir)/:$(datadir)/gforth/$(VERSION)/:' gforth.TAGS >TAGS; $(INSTALL_DATA) TAGS $(datadir)/gforth/$(VERSION) - @if test -d $(emacssitelispdir); then \ + $(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS + @if test -d "$(emacssitelispdir)"; then \ $(INSTALL_DATA) $(srcdir)/gforth.el $(emacssitelispdir); \ else \ echo ">>>>>Please install $(srcdir)/gforth.el in your .../emacs/site-lisp directory"; \ @@ -495,27 +454,35 @@ install: gforth $(FORTH_SRC) $(kernel_fi install-strip: install installdirs: mkinstalldirs - $(srcdir)/mkinstalldirs $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(datadir)/gforth/site-forth + for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir); do \ + $(srcdir)/mkinstalldirs $$i; \ + done + for i in $(CVSDIRS); do \ + $(srcdir)/mkinstalldirs $(datadir)/gforth/$(VERSION)/`dirname $$i`; \ + done + $(RM) -rf $(datadir)/gforth/$(VERSION)/arch $(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) - @echo -e "Type\n$(RM) -rf $(bindir)/gforth $(man1dir)/gforth.1 $(infodir)/gforth.info* $(datadir)/gforth $(libdir)/gforth\nto remove Gforth completely" + -$(RM) -rf $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforthmi-$(VERSION) + @echo -e "To remove Gforth completely, type\n$(RM) -rf $(bindir)/gforth$(EXE) $(bindir)/gforthmi $(man1dir)/gforth.1 $(infodir)/gforth.info* $(datadir)/gforth $(libdir)/gforth" -check test: gforth gforth.fi +check test: gforth$(EXE) gforth.fi $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs -e bye $(FORTH) test/other.fs -e bye + @echo "Expect 'Missing: EKEY EKEY>CHAR EKEY? EMIT?'" + @echo "Expect 'Missing: EDITOR FORGET'" $(FORTH) code.fs test/checkans.fs -e bye @echo 'Expect no differences' $(FORTHK) -m 100000 prims2x.fs -e "s\" $(srcdir)/prim.b\"' output-c process-file bye"| diff -c - $(srcdir)/engine/prim.i -bench: gforth gforth.fi +bench: gforth-fast$(EXE) gforth.fi @echo 'Each benchmark takes about 30s on a 486-66 (gcc-2.6.3 -DFORCE_REG)' - time $(FORTH) siev.fs -e "main bye" - time $(FORTH) bubble.fs -e "main bye" - time $(FORTH) -m 160000 matrix.fs -e "main bye" - time $(FORTH) fib.fs -e "main bye" + time $(FORTH_FAST) siev.fs -e "main bye" + time $(FORTH_FAST) bubble.fs -e "main bye" + time $(FORTH_FAST) -m 160000 matrix.fs -e "main bye" + time $(FORTH_FAST) fib.fs -e "main bye" # ------------- Make forth images @@ -531,28 +498,32 @@ kernl16l.fi-: $(KERN_SRC) kernel/version $(FORTHK) -e 's" mach16l.fs"' kernel/main.fs -e "save-cross kernl16l.fi- $(bindir)/gforth-$(VERSION) bye" kernl16b.fi-: $(KERN_SRC) kernel/version.fs mach16b.fs $(FORTH_GEN0) - $(FORTHK) -e 's" mach16b.fs"' kernel/main.fs -e "save-cross kernl16b.fi- $(bindir)/gforth-$(VERSION) bye" + $(FORTHK) -e 's" mach16b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16b.fi- $(bindir)/gforth-$(VERSION) bye" kernl32l.fi-: $(KERN_SRC) kernel/version.fs mach32l.fs $(FORTH_GEN0) - $(FORTHK) -e 's" mach32l.fs"' kernel/main.fs -e "save-cross kernl32l.fi- $(bindir)/gforth-$(VERSION) bye" + $(FORTHK) -e 's" mach32l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl32l.fi- $(bindir)/gforth-$(VERSION) bye" kernl32b.fi-: $(KERN_SRC) kernel/version.fs mach32b.fs $(FORTH_GEN0) - $(FORTHK) -e 's" mach32b.fs"' kernel/main.fs -e "save-cross kernl32b.fi- $(bindir)/gforth-$(VERSION) bye" + $(FORTHK) -e 's" mach32b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl32b.fi- $(bindir)/gforth-$(VERSION) bye" kernl64l.fi-: $(KERN_SRC) kernel/version.fs mach64l.fs $(FORTH_GEN0) - $(FORTHK) -e 's" mach64l.fs"' kernel/main.fs -e "save-cross kernl64l.fi- $(bindir)/gforth-$(VERSION) bye" + $(FORTHK) -e 's" mach64l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64l.fi- $(bindir)/gforth-$(VERSION) bye" kernl64b.fi-: $(KERN_SRC) kernel/version.fs mach64b.fs $(FORTH_GEN0) - $(FORTHK) -e 's" mach64b.fs"' kernel/main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye" + $(FORTHK) -e 's" mach64b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye" -kernl-%.fi: arch/%/mach.fs $(KERN_SRC) kernel/version.fs $(FORTH_GEN0) \ - arch/%/prim.fs arch/%/asm.fs - $(FORTHK) -e 's" $<"' kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye" +kernl-%.fi: arch/%/mach.fs \ + $(KERN_SRC) kernel/version.fs $(FORTH_GEN0) + $(FORTHK) -e 's" $<"' $(srcdir)/kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye" if [ -f `echo $< | sed s/fs/sh/` ]; \ then sh `echo $< | sed s/fs/sh/` $@; \ else $(CP) $@- $@; \ fi +arch/%/mach.fs: arch/%/prim.fs + +arch/%/prim.fs: arch/%/asm.fs + kernl16b.fi: $(KERNLS) -$(CP) kernl16b.fi kernl16b.fi~ -$(CP) kernl16b.fi- kernl16b.fi @@ -581,8 +552,8 @@ kernl64l.fi: $(KERNLS) # -$(CP) $@ $@~ # -$(CP) $< $@ -gforth.fi: $(kernel_fi) gforthmi gforth gforth-ditc $(GFORTH_FI_SRC) - GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) startup.fs" $(srcdir)/gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) startup.fs +gforth.fi: $(kernel_fi) gforthmi gforth$(EXE) gforth-ditc$(EXE) $(GFORTH_FI_SRC) + GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) startup.fs" ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) startup.fs # ------------- Make c-engine @@ -611,17 +582,22 @@ kernel/prim.fs: prim.b prims2x.fs kernel $(CP) $@- $@ $(RM) $@- -gforth: FORCE - -$(CP) gforth gforth~ - $(MAKE) -C engine gforth +gforth$(EXE): engines + -$(CP) gforth$(EXE) gforth~ $(CP) engine/$@ $@ @GFORTH_EXE@ -gforth-ditc: FORCE - $(MAKE) -C engine gforth-ditc +gforth-fast$(EXE): engines + $(CP) engine/$@ $@ + @GFORTHFAST_EXE@ + +gforth-ditc$(EXE): engines $(CP) engine/$@ $@ @GFORTHDITC_EXE@ +engines: FORCE engine/Makefile + cd engine && $(MAKE) gforth$(EXE) gforth-fast$(EXE) gforth-ditc$(EXE) + # ------------- additional C primitives %.c: %.pri prim2cl.fs @@ -636,6 +612,9 @@ gforth-ditc: FORCE TAGS: gforth.TAGS $(CP) gforth.TAGS $@ +install.TAGS: gforth.TAGS + sed 's:^\$(srcdir)/:$(datadir)/gforth/$(VERSION)/:' gforth.TAGS >install.TAGS + gforth.TAGS: @kernel_fi@ gforth $(GFORTH_FI_SRC) prim.TAGS $(FORTHK) etags.fs startup.fs -e bye cat TAGS prim.TAGS kernel.TAGS >gforth.TAGS @@ -683,7 +662,7 @@ html: $(GFORTH_TEXI) doc/gforth.txt: $(GFORTH_TEXI) -cd doc; $(MAKEINFO) --no-headers --no-split gforth.texi >gforth.txt -doc: doc/gforth.ps html +doc: doc/gforth.ps html doc/gforth.txt # For an explanation of the following Makefile rules, see node # `Automatic Remaking' in GNU Autoconf documentation. @@ -694,22 +673,19 @@ aclocal.m4: acinclude.m4 configure.in aclocal # autoheader might not change config.h.in, so touch a stamp file. -config.h.in: stamp-h.in +engine/config.h.in: stamp-h.in stamp-h.in: configure.in acconfig.h cd $(srcdir) && autoheader echo timestamp > $(srcdir)/stamp-h.in engine/config.h: stamp-h -stamp-h: config.h.in config.status +stamp-h: engine/config.h.in config.status CONFIG_FILES=$@ CONFIG_HEADERS=engine/config.h ./config.status echo timestamp > stamp-h -Makefile: Makefile.in config.status - CONFIG_FILES="$@ engine/$@" CONFIG_HEADERS=engine/config.h ./config.status +Makefile Makedist engine/Makefile gforthmi: Makefile.in Makedist.in engine/Makefile.in gforthmi.in config.status + CONFIG_FILES="$@" CONFIG_HEADERS=engine/config.h ./config.status -engine/Makefile: engine/Makefile.in config.status - CONFIG_FILES="$@ engine/$@" CONFIG_HEADERS=engine/config.h ./config.status - config.status: configure ./config.status --recheck