--- gforth/Makefile.in 1998/10/14 22:36:41 1.121 +++ gforth/Makefile.in 1998/11/08 23:08:03 1.124 @@ -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 @@ -105,10 +106,17 @@ man1ext= .1 #older emacses have their site-lisp in $(libdir)/emacs/ emacssitelispdir=@lispdir@ -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 +148,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,7 +201,7 @@ 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 \ @@ -204,11 +210,11 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) 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 = compat/README compat/control.fs compat/anslocal.fs \ compat/struct.fs compat/loops.fs GFORTH_TEXI = doc/gforth.texi doc/version.texi @@ -216,33 +222,22 @@ GFORTH_TEXI = doc/gforth.texi doc/versi 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 +245,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,13 +269,13 @@ 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 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 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 \ @@ -305,7 +294,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) 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 @@ -317,7 +306,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 \ @@ -349,10 +338,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. @@ -376,7 +365,7 @@ mostlyclean: FORCE gforth-$(VERSION).tar.gz clean: mostlyclean - -$(RM) -rf $(GEN) engine/gforth engine/gforth-ditc \ + -$(RM) -rf $(GEN) engine/gforth$(EXE) engine/gforth-ditc$(EXE) \ *.o engine/*.o arch/*/*.o version distclean: clean @@ -470,11 +459,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 \ @@ -503,14 +492,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" @@ -545,14 +534,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 @@ -581,7 +574,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 @@ -611,14 +604,14 @@ kernel/prim.fs: prim.b prims2x.fs kernel $(CP) $@- $@ $(RM) $@- -gforth: FORCE - -$(CP) gforth gforth~ - $(MAKE) -C engine gforth +gforth$(EXE): FORCE + -$(CP) gforth$(EXE) gforth~ + cd engine && $(MAKE) gforth$(EXE) $(CP) engine/$@ $@ @GFORTH_EXE@ -gforth-ditc: FORCE - $(MAKE) -C engine gforth-ditc +gforth-ditc$(EXE): FORCE + cd engine && $(MAKE) gforth-ditc$(EXE) $(CP) engine/$@ $@ @GFORTHDITC_EXE@ @@ -704,12 +697,9 @@ stamp-h: config.h.in config.status CONFIG_FILES=$@ CONFIG_HEADERS=engine/config.h ./config.status 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