--- gforth/Makefile.in 1998/07/28 12:29:37 1.116 +++ gforth/Makefile.in 1998/10/18 23:16:50 1.123 @@ -37,6 +37,7 @@ DOSVERSION=`echo $VERSION|sed 's/\.//g'` machine=@machine@ kernel_fi=@kernel_fi@ +EXE=@EXE@ # this is the type of machine # used to extend the include path with ./arch/$machine @@ -84,8 +85,7 @@ CFLAGS = $(DEBUGFLAG) -I$(srcdir)/engine #John Wavrik should use -Xlinker -N to get a writable text (executable) XLDFLAGS = @LDFLAGS@ -GCCLDFLAGS = @GCCLDFLAGS@ -LDFLAGS = $(DEBUGFLAG) $(XLDFLAGS) $(GCCLDFLAGS) +LDFLAGS = $(DEBUGFLAG) $(XLDFLAGS) LDLIBS = @LIBS@ # ------------ Install Directorys @@ -113,6 +113,7 @@ KERN_SRC = \ kernel/aliases0.fs \ kernel/aliases.fs \ kernel/args.fs \ + chains.fs \ kernel/cond.fs \ kernel/cond-old.fs \ cross.fs \ @@ -140,13 +141,15 @@ KERN_SRC = \ kernel/getdoers.fs EC_SRC = \ - asm/00-readme \ + asm/CVS \ + asm/README \ asm/bitmask.fs \ asm/numref.fs \ asm/basic.fs \ asm/generic.fs \ asm/target.fs \ - ec/00-readme \ + ec/CVS \ + ec/README \ ec/mirror.fs \ ec/mirrors.fs \ ec/shex.fs \ @@ -193,18 +196,18 @@ 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 \ - etags.fs filedump.fs \ + envos.fs envos.dos envos.os2 etags.fs filedump.fs \ glosgen.fs gray.fs \ doc/makedoc.fs \ mach16b.fs mach16l.fs mach32b.fs mach32l.fs mach64b.fs mach64l.fs \ - more.fs other.fs prims2x.fs random.fs \ - siteinit.fs \ + machpc.fs more.fs other.fs prims2x.fs random.fs \ + siteinit.fs table.fs \ tt.fs sokoban.fs \ - wordsets.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 \ bubble.fs siev.fs matrix.fs fib.fs \ - oof.fs oofsampl.fs objects.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 @@ -213,22 +216,34 @@ GFORTH_TEXI = doc/gforth.texi doc/versi ALLSUBDIRS = engine -ARCHS = arch/generic/machine.h \ +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 \ @@ -236,21 +251,27 @@ ARCHS = arch/generic/machine.h \ 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 \ @@ -260,30 +281,32 @@ ARCHS = arch/generic/machine.h \ 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 \ +SOURCES = CVS engine/CVS compat Makefile.in engine/Makefile.in gforthmi \ + 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 Benchres aclocal.m4 \ - doc/gforth.ds doc/texinfo.tex doc/gforth.1 gforth.el \ + COPYING AUTHORS ChangeLog Benchres aclocal.m4 \ + doc/gforth.ds doc/texinfo.tex doc/gforth.1 doc/version.texi.in \ + doc/CVS gforth.el \ prim engine/engine.c engine/main.c engine/io.c engine/memcmpc.c \ $(ARCHS) \ - engine/cache.c engine/32bit.h \ + 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 config.bat \ - dosconf.h gforthmi.bat startup.dos history.dos mkinstalldirs \ + dosconf.h gforthmi.bat mkinstalldirs \ + versions.bsh \ configure.cmd mkos2mf.sed os2conf.h makefile.os2 engine/makefile.os2 \ gforthmi.cmd glosgen.glo doc/glossaries.doc \ $(INCLUDES) $(FORTH_SRC) $(COMPAT) \ - testclean testdist testdist1 timings.sc + timings.sc RCS_FILES = ToDo model high-level -GEN = gforth gforth-ditc kernel/version.fs version-stamp +GEN = gforth$(EXE) gforth-ditc$(EXE) kernel/version.fs version-stamp # 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 @@ -295,7 +318,7 @@ FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.ps #stuff in a binonly distribution -BINONLYDIST = config.status Makefile gforth gforth-ditc \ +BINONLYDIST = config.status Makefile gforth$(EXE) gforth-ditc$(EXE) \ $(OBJECTS0) $(OBJECTS) $(OBJECTS_DITC)\ arch/$(machine)/machine.h engine/config.h engine/Makefile \ stamp-h kernel/version.fs version-stamp \ @@ -327,10 +350,10 @@ version: Makefile.in # shell und file utilities. kernel/version.fs: version - $(MAKE) gforth + $(MAKE) gforth$(EXE) $(SHELL) versions.bsh $(VERSION) -more: engine $(FORTH_GEN) gforth +more: engine $(FORTH_GEN) gforth$(EXE) #from the gcc Makefile: #"Deletion of files made during compilation. @@ -344,7 +367,8 @@ more: engine $(FORTH_GEN) gforth # `realclean' also deletes everything that could be regenerated automatically." mostlyclean: FORCE - -$(RM) -rf *.s gforth.fi *.fi~ *.fi- kernel/version.fs *TAGS \ + -$(RM) -rf engine/*.s gforth.fi *.fi~ *.fi- kernel/version.fs \ + *TAGS gforth~ \ 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 \ @@ -353,11 +377,14 @@ mostlyclean: FORCE gforth-$(VERSION).tar.gz clean: mostlyclean - -$(RM) -rf $(GEN) *.o engine/*.o arch/*/*.o + -$(RM) -rf $(GEN) engine/gforth$(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 stamp-h + -$(RM) config.cache config.log config.status \ + engine/config.h Makefile engine/Makefile \ + stamp-h engine/stamp-h \ + doc/version.texi #realclean is useless, but dangerous, so it's commented out #realclean: distclean @@ -444,11 +471,11 @@ 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$(EXE) $(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) + -$(RM) $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) + $(INSTALL_PROGRAM) -s gforth$(EXE) $(bindir) + ln $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) -$(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 \ @@ -477,14 +504,14 @@ 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" -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 $(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$(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" @@ -519,14 +546,18 @@ kernl64l.fi-: $(KERN_SRC) kernel/version 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" -kernl-%.fi: arch/%/mach.fs $(KERN_SRC) kernel/version.fs $(FORTH_GEN0) \ - arch/%/prim.fs arch/%/asm.fs +kernl-%.fi: arch/%/mach.fs \ + $(KERN_SRC) kernel/version.fs $(FORTH_GEN0) $(FORTHK) -e 's" $<"' 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 @@ -555,7 +586,7 @@ kernl64l.fi: $(KERNLS) # -$(CP) $@ $@~ # -$(CP) $< $@ -gforth.fi: $(kernel_fi) gforthmi gforth gforth-ditc $(GFORTH_FI_SRC) +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" $(srcdir)/gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) startup.fs # ------------- Make c-engine @@ -585,14 +616,14 @@ kernel/prim.fs: prim.b prims2x.fs kernel $(CP) $@- $@ $(RM) $@- -gforth: FORCE - -$(CP) gforth gforth~ - cd engine; make gforth; cd .. +gforth$(EXE): FORCE + -$(CP) gforth$(EXE) gforth~ + cd engine && $(MAKE) gforth$(EXE) $(CP) engine/$@ $@ @GFORTH_EXE@ -gforth-ditc: FORCE - cd engine; make gforth-ditc; cd .. +gforth-ditc$(EXE): FORCE + cd engine && $(MAKE) gforth-ditc$(EXE) $(CP) engine/$@ $@ @GFORTHDITC_EXE@ @@ -633,7 +664,7 @@ doc/gforth.texi: doc/gforth.ds prim.b ds $(RM) $@- checkdoc: doc/gforth.ds prim.b ds2texi.fs prims2x.fs doc/doc.fd doc/crossdoc.fd answords.fs doc/gforth.texi - $(FORTHK) ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc process-file" doc/crossdoc.fd doc/doc.fd answords.fs -e bye + $(FORTHK) -m 1M ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc process-file" doc/crossdoc.fd doc/doc.fd answords.fs -e bye -grep unknown doc/gforth.texi dvi: doc/gforth.dvi @@ -676,14 +707,11 @@ stamp-h.in: configure.in acconfig.h engine/config.h: stamp-h stamp-h: config.h.in config.status CONFIG_FILES=$@ CONFIG_HEADERS=engine/config.h ./config.status - echo > stamp-h + echo timestamp > stamp-h -Makefile: Makefile.in config.status +Makefile: Makefile.in engine/Makefile.in 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 @@ -700,14 +728,3 @@ makefile.os2: mkos2mf.sed Makefile.in en echo ' $$(GCC) $$(CFLAGS) -c $$<' >>makefile.os2 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 -# 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