--- gforth/Makefile.in 1997/05/21 20:39:15 1.100 +++ gforth/Makefile.in 1998/07/08 16:47:31 1.114 @@ -23,12 +23,32 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. -#gforth version -VERSION_MAJOR=0 -VERSION_MINOR=3 -VERSION_RELEASE=1 -VERSION =$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE) -DOSVERSION=$(VERSION_MAJOR)$(VERSION_MINOR)$(VERSION_RELEASE) +# Warning: +# For some stupid reason setting SHELL to bash does not work properly with +# DOS. If you want to use shell-specific things that must run with DOS make +# an external batch file and call it with bash (see versions.bsh). + +# ------------- gforth version + +VERSION = @VERSION@ +DOSVERSION=`echo $VERSION|sed 's/\.//g'` + +# ------------- System specific variables + +machine=@machine@ +kernel_fi=@kernel_fi@ + +# this is the type of machine +# used to extend the include path with ./arch/$machine +# so we can include a machine specific +# machine.h file + +PATHSEP = @PATHSEP@ + +osclass = @OSCLASS@ + +# ------------- Utility programs + SHELL = /bin/sh RM = rm RMTREE = rm -rf @@ -40,25 +60,27 @@ INSTALL_DATA = @INSTALL_DATA@ LN_S = @LN_S@ GCC = @CC@ CC = $(GCC) -PATHSEP = @PATHSEP@ -FORTHPATH = $(libdir)/gforth/site-forth$(PATHSEP)$(datadir)/gforth/site-forth$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION)$(PATHSEP). +FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(datadir)/gforth/site-forth$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION) FORTHSIZES = @FORTHSIZES@ -FORTH = ./gforth -p $(FORTHPATH)$(PATHSEP)$(srcdir) -FORTHKFLAGS= -p .$(PATHSEP)$(srcdir) -i ./kernel.fi +FORTH = ./gforth --die-on-signal -p $(FORTHPATH)$(PATHSEP)$(srcdir) +FORTHKFLAGS= --die-on-signal -p .$(PATHSEP)$(srcdir) -i ./$(kernel_fi) FORTHK = ./gforth $(FORTHKFLAGS) -FORTHP = ./gforth -i ./kernel.fi +FORTHP = ./gforth --die-on-signal -i ./$(kernel_fi) STRIP = strip TEXI2DVI = texi2dvi -DVI2PS = dvips -D300 +DVI2PS = dvips -Z #you can get texi2html from http://wwwcn.cern.ch/dci/texi2html/ TEXI2HTML = texi2html MAKEINFO = makeinfo + +# ------------- Compiler Flags + XCFLAGS = @CFLAGS@ XDEFINES = @DEFS@ SWITCHES = $(XCFLAGS) $(XDEFINES) #-DNDEBUG #turn off assertions ENGINE_FLAGS = @ENGINE_FLAGS@ -fno-defer-pop -fcaller-saves DEBUGFLAG = @DEBUGFLAG@ -CFLAGS = $(DEBUGFLAG) -I$(srcdir)/engine -I$(srcdir) -O4 -Wall $(SWITCHES) -DDEFAULTPATH=\"$(FORTHPATH)\" +CFLAGS = $(DEBUGFLAG) -I$(srcdir)/engine -I$(srcdir)/arch/$(machine) -O4 -Wall $(SWITCHES) -DDEFAULTPATH=\"$(FORTHPATH)\" #John Wavrik should use -Xlinker -N to get a writable text (executable) XLDFLAGS = @LDFLAGS@ @@ -66,6 +88,8 @@ GCCLDFLAGS = @GCCLDFLAGS@ LDFLAGS = $(DEBUGFLAG) $(XLDFLAGS) $(GCCLDFLAGS) LDLIBS = @LIBS@ +# ------------ Install Directorys + VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -80,7 +104,7 @@ mandir = $(prefix)/man man1dir= $(mandir)/man1 man1ext= .1 #older emacses have their site-lisp in $(libdir)/emacs/ -emacssitelispdir=$(datadir)/emacs/site-lisp +emacssitelispdir=@lispdir@ INCLUDES = engine/CVS engine/forth.h engine/threaded.h engine/io.h @@ -106,11 +130,30 @@ KERN_SRC = \ kernel/vars.fs \ kernel/accept.fs \ kernel/basics.fs \ - kernel/interp.fs \ + kernel/int.fs \ + kernel/comp.fs \ kernel/io.fs \ kernel/license.fs \ kernel/nio.fs \ - kernel/saccept.fs + kernel/saccept.fs \ + kernel/doers.fs \ + kernel/getdoers.fs + +EC_SRC = \ + asm/00-readme \ + asm/bitmask.fs \ + asm/numref.fs \ + asm/basic.fs \ + asm/generic.fs \ + asm/target.fs \ + ec/00-readme \ + ec/mirror.fs \ + ec/mirrors.fs \ + ec/shex.fs \ + ec/builttag.fs \ + ec/dotx.fs \ + ec/mirrored.fs \ + ec/nesting.fs GFORTH_FI_SRC = \ assert.fs \ @@ -128,6 +171,7 @@ GFORTH_FI_SRC = \ hash.fs \ history.fs \ intcomp.fs \ + locals.fs \ look.fs \ search.fs \ see.fs \ @@ -140,9 +184,12 @@ GFORTH_FI_SRC = \ termsize.fs \ vt100.fs \ vt100key.fs \ - wordinfo.fs + wordinfo.fs \ + lib.fs \ + sieve.fs \ + add.fs -FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) \ +FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_SRC) \ ans-report.fs ansi.fs answords.fs \ code.fs colorize.fs comp-i.fs \ doskey.fs ds2texi.fs \ @@ -162,37 +209,80 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) COMPAT = compat/CVS compat/README compat/control.fs compat/anslocal.fs \ compat/struct.fs compat/loops.fs +GFORTH_TEXI = doc/gforth.texi doc/version.texi + ALLSUBDIRS = engine +ARCHS = arch/generic/machine.h \ + arch/m68k/machine.h \ + arch/mips/machine.h \ + arch/386/machine.h \ + arch/hppa/machine.h \ + arch/sparc/machine.h \ + arch/power/machine.h \ + arch/alpha/machine.h \ + 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/README \ + arch/misc/asm.fs \ + arch/misc/mach.fs \ + arch/misc/prim.fs \ + arch/misc/sim.fs \ + arch/misc/sokoban.fs \ + arch/misc/tt.fs \ + arch/6502/asm.fs \ + arch/6502/prim.fs \ + arch/6502/mach.fs \ + arch/6502/zero.fs \ + arch/6502/softuart.fs \ + arch/6502/cold.fs \ + arch/8086/asm.fs \ + arch/8086/mach.fs \ + arch/8086/mach.sh \ + arch/8086/prim.fs \ + arch/avr/asm.fs \ + arch/c165/asm.fs \ + arch/c165/mach.fs \ + arch/c165/prim.fs \ + arch/h8/asm.fs \ + arch/shboom/asm.fs \ + arch/shboom/compiler.fs \ + arch/shboom/dis.fs \ + arch/shboom/mach.fs \ + arch/shboom/prim.fs \ + arch/shboom/dis2.fs \ + arch/shboom/sh.p \ + arch/shboom/doers.fs + SOURCES = CVS compat Makefile.in engine/Makefile.in gforthmi \ configure.in configure config.sub config.guess \ acconfig.h engine/config.h.in stamp-h.in \ - install-sh INSTALL README ToDo BUGS model COPYING Benchres \ + install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS model \ + COPYING Benchres aclocal.m4 \ doc/gforth.ds doc/texinfo.tex doc/gforth.1 gforth.el \ prim engine/engine.c engine/main.c engine/io.c engine/memcmpc.c \ - arch/m68k/machine.h arch/mips/machine.h arch/386/machine.h \ - arch/hppa/machine.h arch/sparc/machine.h arch/power/machine.h \ - arch/alpha/machine.h \ + $(ARCHS) \ engine/cache.c 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/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 config.bat \ dosconf.h gforthmi.bat startup.dos history.dos mkinstalldirs \ configure.cmd mkos2mf.sed os2conf.h makefile.os2 engine/makefile.os2 \ gforthmi.cmd glosgen.glo doc/glossaries.doc \ - $(INCLUDES) $(FORTH_SRC) $(COMPAT) + $(INCLUDES) $(FORTH_SRC) $(COMPAT) \ + testclean testdist testdist1 timings.sc RCS_FILES = ToDo model high-level GEN = gforth gforth-ditc kernel/version.fs version-stamp -OBJECTS0 = engine/replace.a -OBJECTS = engine/engine.o engine/main.o -OBJECTS_DITC = engine/engine-ditc.o engine/main-ditc.o - # 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 FORTH_GEN = $(FORTH_GEN0) @KERNEL@ gforth.fi @@ -205,34 +295,40 @@ DOCDIST = doc/gforth.info doc/gforth.inf #stuff in a binonly distribution BINONLYDIST = config.status Makefile gforth gforth-ditc \ $(OBJECTS0) $(OBJECTS) $(OBJECTS_DITC)\ - machine/machine.h engine/config.h kernel.fi \ - stamp-h engine/version.h kernel/version.fs version-stamp \ + 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 configure +GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) doc/gforth.texi doc/gforth.dvi doc/gforth.ps Makefile engine/Makefile configure #standards.info recommends this: .SUFFIXES: .SUFFIXES: .c .o + all: kernel/version.fs more +# use this dependency for phony targets just as mostlyclean,... +FORCE: ; + #this rule avoids remaking everything after minor changes in Makefile.in version: Makefile.in if test -r $@ && test x'$(VERSION)' = x`cat $@` ; then true ; else echo $(VERSION) > $@ ; fi -engine/version.h: version - echo "static char gforth_version[]=\"$(VERSION)\" ;" >$@ +# With dos we use normal dos echo +# we cannot pipe the output to engine/version.h directly because +# of the "/ and \" problem. Copying works because we use the +# shell und file utilities. kernel/version.fs: version - $(MAKE) gforth - echo ": version-string s\" $(VERSION)\" ;" >$@ + $(MAKE) gforth + $(SHELL) versions.bsh $(VERSION) -more: $(OBJECTS) $(FORTH_GEN) gforth +more: engine $(FORTH_GEN) gforth #from the gcc Makefile: #"Deletion of files made during compilation. @@ -245,22 +341,21 @@ more: $(OBJECTS) $(FORTH_GEN) gforth # `distclean' also deletes the files made by config. # `realclean' also deletes everything that could be regenerated automatically." -mostlyclean: +mostlyclean: FORCE -$(RM) -rf *.s gforth.fi *.fi~ *.fi- kernel/version.fs *TAGS \ doc/crossdoc.fd doc/doc.fd doc/gforth.texi doc/gforth.fns \ doc/gforth.aux doc/gforth.cp doc/gforth.cps \ doc/gforth.dvi doc/gforth.fn doc/gforth.ky doc/gforth.log \ doc/gforth.pg \ doc/gforth.toc doc/gforth.tp doc/gforth.vr html \ - gforth-$(VERSION).tar.gz \ - engine/version.h + gforth-$(VERSION).tar.gz clean: mostlyclean -$(RM) -rf $(GEN) *.o engine/*.o engine/*.a distclean: clean - -$(RM) machine/machine.h kernel.fi config.cache config.log \ - config.status engine/config.h Makefile stamp-h + -$(RM) config.cache config.log \ + config.status engine/config.h Makefile engine/Makefile stamp-h #realclean is useless, but dangerous, so it's commented out #realclean: distclean @@ -347,7 +442,7 @@ 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 +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) @@ -357,16 +452,16 @@ install: gforth $(FORTH_SRC) kernel.fi g for i in $(FORTH_SRC) prim; do \ $(INSTALL_DATA) $(srcdir)/$$i $(datadir)/gforth/$(VERSION); \ done - $(INSTALL_DATA) kernel.fi $(libdir)/gforth/$(VERSION) + $(INSTALL_DATA) $(kernel_fi) $(datadir)/gforth/$(VERSION) $(RM) gforth.fi; $(MAKE) gforth.fi #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 \ + @if test -d $(emacssitelispdir); then \ $(INSTALL_DATA) $(srcdir)/gforth.el $(emacssitelispdir); \ else \ echo ">>>>>Please install $(srcdir)/gforth.el in your .../emacs/site-lisp directory"; \ fi - echo ">>>>> Please make an entry for Gforth in your info dir file; e.g.:"; \ + @echo ">>>>> Please make an entry for Gforth in your info dir file; e.g.:"; \ echo "* Gforth: (gforth). A fast interpreter for the Forth language." install-strip: install @@ -376,7 +471,7 @@ installdirs: mkinstalldirs #deinstall all files specific to this version of gforth #to uninstall version foo, type `make uninstall VERSION=foo' -uninstall: +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" @@ -385,7 +480,7 @@ check test: gforth gforth.fi $(FORTH) test/other.fs -e bye $(FORTH) code.fs test/checkans.fs -e bye @echo 'Expect no differences' - $(FORTH) -m 100000 prims2x.fs -e "s\" $(srcdir)/prim.b\"' output-c process-file bye"| diff -c - $(srcdir)/engine/prim.i + $(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 @echo 'Each benchmark takes about 30s on a 486-66 (gcc-2.6.3 -DFORCE_REG)' @@ -394,16 +489,15 @@ bench: gforth gforth.fi time $(FORTH) -m 160000 matrix.fs -e "main bye" time $(FORTH) fib.fs -e "main bye" -dvi: gforth.dvi - -gforth: $(OBJECTS) $(OBJECTS0) - -$(CP) gforth gforth~ - $(GCC) $(LDFLAGS) $(OBJECTS) $(OBJECTS0) $(LDLIBS) -o $@ - @GFORTH_EXE@ +# ------------- Make forth images -gforth-ditc: $(OBJECTS_DITC) $(OBJECTS0) - $(GCC) $(LDFLAGS) $(OBJECTS_DITC) $(OBJECTS0) $(LDLIBS) -o $@ - @GFORTHDITC_EXE@ +# Hot to make new images: +# 1. Produce an image called kernlXYZ.fi- +# the original kernel.fi is not touched because it's needed for creation +# 2. copy old kernlXYZ.fi to kernlXYZ.fi~ +# that's a backup copy in case the new kernels don't work +# 3. copy new kernels to kernlXYZ.fi +# these are the ones we want to use now kernl16l.fi-: $(KERN_SRC) kernel/version.fs mach16l.fs $(FORTH_GEN0) $(FORTHK) -e 's" mach16l.fs"' kernel/main.fs -e "save-cross kernl16l.fi- $(bindir)/gforth-$(VERSION) bye" @@ -459,37 +553,10 @@ 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 - -#TAGS is a GNU standard target -TAGS: gforth.TAGS - $(CP) gforth.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 - rm TAGS - -engine/replace.a: - cd engine; $(MAKE) replace.a - -engine.s: engine/engine.c engine/prim.i engine/prim_lab.i machine/machine.h engine/threaded.h $(INCLUDES) engine/config.h - $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -S $(srcdir)/engine/engine.c - -engine/engine.o: engine/engine.c engine/prim.i engine/prim_lab.i machine/machine.h engine/threaded.h $(INCLUDES) engine/config.h - $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -c $(srcdir)/engine/engine.c -o $@ - -engine/engine-ditc.o: engine/engine.c engine/prim.i engine/prim_lab.i machine/machine.h engine/threaded.h $(INCLUDES) engine/config.h - $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -DDOUBLY_INDIRECT -o $@ -c $(srcdir)/engine/engine.c - -engine/main.o: engine/main.c machine/machine.h engine/threaded.h $(INCLUDES) engine/config.h engine/version.h - $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -o $@ -c $(srcdir)/engine/main.c - -engine/main-ditc.o: engine/main.c machine/machine.h engine/threaded.h $(INCLUDES) engine/config.h engine/version.h - $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -DDOUBLY_INDIRECT -o $@ -c $(srcdir)/engine/main.c +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 -engine/strtoul.o: strtoul.c strtol.c +# ------------- Make c-engine prim.b: prim m4 -s $(srcdir)/prim >$@ @@ -516,13 +583,43 @@ kernel/prim.fs: prim.b prims2x.fs kernel $(CP) $@- $@ $(RM) $@- +gforth: FORCE + -$(CP) gforth gforth~ + cd engine; make gforth; cd .. + $(CP) engine/$@ $@ + @GFORTH_EXE@ + +gforth-ditc: FORCE + cd engine; make gforth-ditc; cd .. + $(CP) engine/$@ $@ + @GFORTHDITC_EXE@ + +# ------------- additional C primitives + +%.c: %.pri prim2cl.fs + $(FORTHK) prim2cl.fs -e "file $< altogether bye" >$@ + +%.so: %.c + $(GCC) -shared $(CFLAGS) $< -o $@ + +# ------------- Make Documentation + +#TAGS is a GNU standard target +TAGS: gforth.TAGS + $(CP) gforth.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 + rm TAGS + prim.TAGS: prim.b prims2x.fs $(FORTHK) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag process-file bye" >$@- $(CP) $@- $@ $(RM) $@- -doc/doc.fd: doc/makedoc.fs $(GFORTH_FI_SRC) - $(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs startup.fs code.fs -e bye +doc/doc.fd: doc/makedoc.fs $(GFORTH_FI_SRC) code.fs objects.fs oof.fs mini-oof.fs + $(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs startup.fs code.fs objects.fs oof.fs mini-oof.fs -e bye doc/crossdoc.fd: $(KERN_SRC) kernel/version.fs $(FORTH_GEN0) $(FORTHK) -e 's" mach32l.fs"' kernel/main.fs -e bye @@ -539,7 +636,7 @@ checkdoc: doc/gforth.ds prim.b ds2texi.f dvi: doc/gforth.dvi -doc/gforth.dvi doc/gforth.fns: doc/gforth.texi +doc/gforth.dvi doc/gforth.fns: $(GFORTH_TEXI) cd doc; $(TEXI2DVI) gforth.texi doc/gforth.ps: doc/gforth.dvi @@ -547,21 +644,27 @@ doc/gforth.ps: doc/gforth.dvi info: doc/gforth.info -doc/gforth.info doc/gforth.info-*: doc/gforth.texi +doc/gforth.info doc/gforth.info-*: $(GFORTH_TEXI) -cd doc; $(MAKEINFO) gforth.texi -html: doc/gforth.texi +html: $(GFORTH_TEXI) -$(RM) html/* -mkdir html cd html; $(TEXI2HTML) -menu -split_node ../doc/gforth.texi +doc/gforth.txt: $(GFORTH_TEXI) + -cd doc; $(MAKEINFO) --no-headers --no-split gforth.texi >gforth.txt + doc: doc/gforth.ps html # For an explanation of the following Makefile rules, see node # `Automatic Remaking' in GNU Autoconf documentation. -$(srcdir)/configure: configure.in +$(srcdir)/configure: configure.in aclocal.m4 cd $(srcdir) && autoconf +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 stamp-h.in: configure.in acconfig.h @@ -572,19 +675,23 @@ engine/config.h: stamp-h stamp-h: config.h.in config.status CONFIG_FILES=$@ CONFIG_HEADERS=engine/config.h ./config.status echo > stamp-h + Makefile: Makefile.in config.status - CONFIG_FILES=$@ CONFIG_HEADERS=engine/config.h ./config.status + CONFIG_FILES="$@ engine/$@" 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 #create files for DOS, because DOS cannot do it itself -makefile.dos: mkdosmf.sed Makefile.in +makefile.dos: mkdosmf.sed Makefile.in engine/Makefile.in sed -f mkdosmf.sed makefile.dos sed -f mkdosmf.sed engine/makefile.dos -makefile.os2: mkos2mf.sed Makefile.in +makefile.os2: mkos2mf.sed Makefile.in engine/Makefile.in sed -f mkos2mf.sed makefile.os2 sed -f mkos2mf.sed engine/makefile.os2 echo '%.o: %.c' >>makefile.os2 @@ -592,10 +699,13 @@ makefile.os2: mkos2mf.sed Makefile.in echo '%.o: %.c' >>engine/makefile.os2 echo ' $$(GCC) $$(CFLAGS) -c $$<' >>engine/makefile.os2 +# Garbage: +# to be deleted! + # history is a little bit different now! JAW -#history.dos: history.fs Makefile.in +# history.dos: history.fs Makefile.in # sed -e "s,~/\.gforth-history,/gforth.his,g" history.dos -startup.dos: startup.fs Makefile.in - sed -e "s/\\\\ include doskey/include doskey/g" \ - -e "s/include vt100key/\\\\ include vt100key/g" startup.dos +# startup.dos: startup.fs Makefile.in +# sed -e "s/\\\\ include doskey/include doskey/g" \ +# -e "s/include vt100key/\\\\ include vt100key/g" startup.dos