Diff for /gforth/Makefile.in between versions 1.378 and 1.382

version 1.378, 2008/01/07 20:54:15 version 1.382, 2008/01/14 17:23:24
Line 382  VMGEN_EX = vmgen-ex/CVS vmgen-ex/Makefil Line 382  VMGEN_EX = vmgen-ex/CVS vmgen-ex/Makefil
   
 VMGEN_EX2 = $(VMGEN_EX:vmgen-ex/%=vmgen-ex2/%)  VMGEN_EX2 = $(VMGEN_EX:vmgen-ex/%=vmgen-ex2/%)
   
 SOURCES = $(CVSDIRS) compat Makefile.in Makedist.in engine/Makefile.in \  ENGINE_SOURCES = engine/Makefile.in engine/config.h.in \
         gforthmi.in vmgen.in gfgen README.vmgen NEWS.vmgen \  
         configure.in configure config.sub config.guess elisp-comp missing \  
         engine/config.h.in 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 \  
         doc/gforth.ds doc/gforth.1 doc/version.texi.in \  
         doc/vmgen.texi doc/fdl.texi doc/gpl.texi \  
         gforth.el \  
         prim cache0.vmg cache1.vmg peeprules.vmg \  
         engine/engine.c engine/main.c \          engine/engine.c engine/main.c \
         engine/io.c engine/support.c engine/signals.c engine/libcc.h.in \          engine/io.c engine/support.c engine/signals.c engine/libcc.h.in \
         $(ARCHS) \  
         engine/profile.c \          engine/profile.c \
         engine/getopt.c engine/getopt1.c engine/getopt.h engine/select.c \          engine/getopt.c engine/getopt1.c engine/getopt.h engine/select.c \
         engine/ecvt.c engine/memcmp.c engine/rint.c \          engine/ecvt.c engine/memcmp.c engine/rint.c \
Line 404  SOURCES = $(CVSDIRS) compat Makefile.in Line 393  SOURCES = $(CVSDIRS) compat Makefile.in
         engine/pow10.c engine/atanh.c engine/cleanalign.c \          engine/pow10.c engine/atanh.c engine/cleanalign.c \
         engine/strerror.c engine/strsignal.c engine/dblsub.c \          engine/strerror.c engine/strsignal.c engine/dblsub.c \
         engine/fnmatch.h engine/fnmatch.c \          engine/fnmatch.h engine/fnmatch.c \
         INSTALL.DOS makefile.dos engine/makefile.dos mkdosmf.sed config.bat \          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 \
           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 \
           doc/gforth.ds doc/gforth.1 doc/version.texi.in \
           doc/vmgen.texi doc/fdl.texi doc/gpl.texi \
           gforth.el \
           $(ARCHS) \
           INSTALL.DOS makefile.dos mkdosmf.sed config.bat \
         dosconf.h gforthmi.bat mkinstalldirs siteinit.fs \          dosconf.h gforthmi.bat mkinstalldirs siteinit.fs \
         versions.bsh \          versions.bsh \
         configure.cmd mkos2mf.sed os2conf.h makefile.os2 engine/makefile.os2 \          configure.cmd mkos2mf.sed os2conf.h makefile.os2 \
         gforthmi.cmd glosgen.glo doc/glossaries.doc \          gforthmi.cmd glosgen.glo doc/glossaries.doc \
         $(INCLUDES) $(FORTH_SRC) $(COMPAT) $(VMGEN_EX) $(VMGEN_EX2) \          $(INCLUDES) $(FORTH_SRC) $(COMPAT) $(VMGEN_EX) $(VMGEN_EX2) \
         timings.sc \          timings.sc \
Line 416  SOURCES = $(CVSDIRS) compat Makefile.in Line 418  SOURCES = $(CVSDIRS) compat Makefile.in
   
 RCS_FILES =  ToDo model high-level  RCS_FILES =  ToDo model high-level
   
 ENGINES = gforth$(OPT)$(EC)$(EXE) gforth-ditc$(OPT)$(EC)$(EXE) gforth-itc$(OPT)$(EC)$(EXE) $(PROFEXES)  ENGINES = gforth$(OPT)$(EC)$(EXE) gforth-ditc$(EC)$(EXE) gforth-itc$(EC)$(EXE) $(PROFEXES)
   
 ENGINES_FAST = gforth-fast$(OPT)$(EC)$(EXE) #gforth-native$(EXE)   
   
 #names of engines without $(OPT) etc.  
 ENGINES_BASE = gforth gforth-ditc gforth-itc gforth-fast  
 # !! should include PROFEXES  
   
   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) kernel/version.fs gforth.elc
   
Line 467  GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) \ Line 464  GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) \
 .SUFFIXES:  .SUFFIXES:
 .SUFFIXES: .c .o  .SUFFIXES: .c .o
   
 OPTS = @OPTS@  all: kernel/version.fs more
   
 MAKELINE-ll   = OPT=-ll OPTDEFINES=-DFORCE_LL OPTOBJECTS=  
 MAKELINE-noll = OPT=-noll OPTDEFINES= OPTOBJECTS=dblsub.o  
   
 all:  
         if test -z "$(OPT)"; then \  
                 for i in $(OPTS); do make optall OPT=$$i && break; done \  
         else \  
                 make allbut1; \  
         fi  
   
 allbut1: kernel/version.fs more  
   
 optall:  
         make $(MAKELINE$(OPT))  
   
   
 # use this dependency for phony targets just as mostlyclean,...  # use this dependency for phony targets just as mostlyclean,...
 FORCE: ;  FORCE: ;
Line 500  version: Makefile.in configure.in Line 481  version: Makefile.in configure.in
 kernel/version.fs:      version  kernel/version.fs:      version
         echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs          echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs
   
 more:   engines $(FORTH_GEN) $(GEN)  more:   $(ENGINES) $(FORTH_GEN) $(GEN)
         @make check          @make check
         @$(FORTH_FAST) --diag -e bye          @$(FORTH_FAST) --diag -e bye
         test -z "$(OPT)" || for i in $(ENGINES_BASE); do $(CP) $${i}$(OPT)$(EC)$(EXE) $${i}$(EC)$(EXE); done  
   
 #from the gcc Makefile:   #from the gcc Makefile: 
 #"Deletion of files made during compilation.  #"Deletion of files made during compilation.
Line 535  docclean: FORCE Line 515  docclean: FORCE
                 doc/gforth.toc doc/gforth.tp doc/gforth.vr html                  doc/gforth.toc doc/gforth.tp doc/gforth.vr html
   
 clean:          mostlyclean  clean:          mostlyclean
                 -$(RM) -rf $(GEN) *.o engine/*.o arch/*/*.o version \          -$(RM) -rf $(GEN) *.o engine/*.o arch/*/*.o version \
                 engine/gforth$(OPT)$(EC)$(EXE) engine/gforth-fast$(OPT)$(EC)$(EXE) \          gforth-itc-noll$(EC)$(EXE)  engine/gforth-itc-noll$(EC)$(EXE)  \
                 engine/gforth-native$(OPT)$(EC)$(EXE) engine/gforth-itc$(OPT)$(EC)$(EXE) \          gforth-ditc-noll$(EC)$(EXE) engine/gforth-ditc-noll$(EC)$(EXE) \
                 engine/gforth-ditc$(OPT)$(EC)$(EXE) engine/gforth-prof$(OPT)$(EC)$(EXE) \          gforth-prof-noll$(EC)$(EXE) engine/gforth-prof-noll$(EC)$(EXE) \
                 engine/prim-s.i          engine/prim-s.i
           for i in gforth gforth-fast gforth-native; do for j in $(OPTS); do rm -f engine/$$i$${j}$(EC)$(EXE) $$i$${j}$(EC)$(EXE); done; done
   
 distclean:      clean  distclean:      clean
                 -$(RM) -rf config.cache config.log config.status \                  -$(RM) -rf config.cache config.log config.status \
Line 667  check:  gforths gforth.fi Line 648  check:  gforths gforth.fi
                 $(MAKE) checkone ENGINE="./gforth-fast$(OPT)" >/dev/null 2>&1                  $(MAKE) checkone ENGINE="./gforth-fast$(OPT)" >/dev/null 2>&1
                 @echo "*** Check successful ***"                  @echo "*** Check successful ***"
   
 checkone test:  gforth$(OPT)$(EC)$(EXE) gforth.fi engine/prim-s.i  checkone test: gforth.fi engine/prim-s.i
                 $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs test/float.fs test/deferred.fs test/coreext.fs test/search.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/coretest.out                  $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs test/float.fs test/deferred.fs test/coreext.fs test/search.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/coretest.out
                 $(FORTH) test/other.fs -e bye                  $(FORTH) test/other.fs -e bye
                 $(FORTHS) test/signals.fs -e bye                  $(FORTHS) test/signals.fs -e bye
Line 677  checkone test: gforth$(OPT)$(EC)$(EXE) g Line 658  checkone test: gforth$(OPT)$(EC)$(EXE) g
                   "c-flag on s\" prim.i\" out-filename 2! s\" $(srcdir)/prim.b\" ' output-c ' output-c-combined process-file bye"| \                    "c-flag on s\" prim.i\" out-filename 2! s\" $(srcdir)/prim.b\" ' output-c ' output-c-combined process-file bye"| \
                   tr -d '\015' | grep -v '^#line '|diff -c - engine/prim-s.i                    tr -d '\015' | grep -v '^#line '|diff -c - engine/prim-s.i
   
 check-nofast: gforth$(OPT)$(EC)$(EXE) gforth.fi  check-nofast: gforth.fi
                 $(FORTHS) test/gforth-nofast.fs -e bye                  $(FORTHS) test/gforth-nofast.fs -e bye
   
 test/primtest.fi: test/primtest.fs mach32l.fs cross.fs  test/primtest.fi: test/primtest.fs mach32l.fs cross.fs
Line 696  bench:  gforth-fast$(OPT)$(EC)$(EXE) gfo Line 677  bench:  gforth-fast$(OPT)$(EC)$(EXE) gfo
 onebench one-bench:  onebench one-bench:
         $(FORTH_FAST) onebench.fs          $(FORTH_FAST) onebench.fs
   
 all-bench allbench:     gforth-fast$(OPT)$(EC)$(EXE) gforth$(OPT)$(EC)$(EXE) gforth-itc$(OPT)$(EC)$(EXE) gforth-ditc$(OPT)$(EC)$(EXE) gforth.fi  all-bench allbench:
         ./gforth-fast --dynamic onebench.fs          ./gforth-fast --dynamic onebench.fs
         ./gforth-fast --no-dynamic onebench.fs          ./gforth-fast --no-dynamic onebench.fs
         ./gforth --dynamic onebench.fs          ./gforth --dynamic onebench.fs
Line 776  kernl64l$(EC).fi: $(KERNLS) Line 757  kernl64l$(EC).fi: $(KERNLS)
 #               -$(CP) $@ $@~  #               -$(CP) $@ $@~
 #               -$(CP) $< $@  #               -$(CP) $< $@
   
 gforth.fi:      $(kernel_fi) gforthmi gforth$(OPT)$(EC)$(EXE) gforth-ditc$(OPT)$(EC)$(EXE) $(GFORTH_FI_SRC) comp-i.fs  gforth.fi:      $(kernel_fi) gforthmi gforth-ditc$(OPT)$(EC)$(EXE) $(GFORTH_FI_SRC) comp-i.fs
                 GFORTHD="./gforth-ditc$(OPT) -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc$(OPT) --die-on-signal -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) $(STARTUP)" includedir=`pwd`/include bindir=`pwd` ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) $(STARTUP)                  GFORTHD="./gforth-ditc$(OPT) -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc$(OPT) --die-on-signal -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) $(STARTUP)" includedir=`pwd`/include bindir=`pwd` ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) $(STARTUP)
   
 # ------------- Make c-engine  # ------------- Make c-engine
Line 810  kernel/prim.fs: prim.b prims2x.fs kernel Line 791  kernel/prim.fs: prim.b prims2x.fs kernel
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
 gforth$(OPT)$(EC)$(EXE):                engines  
                 -$(CP) gforth$(OPT)$(EC)$(EXE) gforth~  
                 $(CP) engine/$@ $@  
                 -$(MASSAGE_EXE) $@  
                 @GFORTH_EXE@  
   
 gforth-fast$(OPT)$(EC)$(EXE):   engines-fast  OPTS = @OPTS@
                 $(CP) engine/$@ $@  
                 -$(MASSAGE_EXE) $@  MAKELINE-ll-reg   = OPT=-ll-reg OPTDEFINES="-DFORCE_LL -DFORCE_REG" OPTOBJECTS=
                 @GFORTHFAST_EXE@  MAKELINE-noll-reg = OPT=-noll-reg OPTDEFINES=-DFORCE_REG OPTOBJECTS=dblsub.o
   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
           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@; \
                   make checkone check-nofast ENGINE=./engine/$@; \
           fi
   
   optgforth:
           make gforth$(OPT)$(EC)$(EXE) $(MAKELINE$(OPT))
   
   gforth-fast$(OPT)$(EC)$(EXE): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE_FAST) engine/config.h
           if test -z "$(OPT)"; then \
                   for i in $(OPTS); do make optgforth-fast OPT=$$i && $(CP) gforth-fast$${i}$(EC)$(EXE) $@ && break; done; \
           else \
                   ( cd engine && $(MAKE) $@ ) && \
                   $(CP) engine/$@ $@ && \
                   $(MASSAGE_EXE) $@; \
                   @GFORTHFAST_EXE@; \
                   make checkone ENGINE=./engine/$@; \
           fi
   
   optgforth-fast:
           make gforth-fast$(OPT)$(EC)$(EXE) $(MAKELINE$(OPT))
   
 gforth-native$(OPT)$(EC)$(EXE): engines-fast  gforth-native$(OPT)$(EC)$(EXE): engines-fast
                 $(CP) engine/$@ $@                  $(CP) engine/$@ $@
                 -$(MASSAGE_EXE) $@                  -$(MASSAGE_EXE) $@
 #@GFORTHX_EXE@  #@GFORTHX_EXE@
   
 gforth-itc$(OPT)$(EC)$(EXE):    engines  gforth-itc$(EC)$(EXE): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h
                 $(CP) engine/$@ $@                  cd engine && $(MAKE) gforth-itc-noll$(EC)$(EXE) $(MAKELINE-noll)
                   $(CP) engine/gforth-itc-noll$(EC)$(EXE) $@
                 @GFORTHITC_EXE@                  @GFORTHITC_EXE@
   
 gforth-ditc$(OPT)$(EC)$(EXE):   engines  gforth-ditc$(EC)$(EXE): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h
                 $(CP) engine/$@ $@                  cd engine && $(MAKE) gforth-ditc-noll$(EC)$(EXE) $(MAKELINE-noll)
                   $(CP) engine/gforth-ditc-noll$(EC)$(EXE) $@
                 @GFORTHDITC_EXE@                  @GFORTHDITC_EXE@
   
 gforth-prof$(OPT)$(EC)$(EXE):   engines  gforth-prof$(EC)$(EXE): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h
                 $(CP) engine/$@ $@                  cd engine && $(MAKE) gforth-prof-noll$(EC)$(EXE) $(MAKELINE-noll)
                   $(CP) engine/gforth-prof-noll$(EC)$(EXE) $@
   
 gforths: $(ENGINES) $(ENGINES_FAST)  gforths: $(ENGINES) $(ENGINES_FAST)
   
 engines:        FORCE $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h  
                 cd engine && $(MAKE) $(ENGINES) \  
   
 engines-fast:   FORCE $(FORTH_GEN_ENGINE_FAST) engine/Makefile engine/config.h  
                 cd engine && $(MAKE) $(ENGINES_FAST)  
   
 # ------------- additional C primitives  # ------------- additional C primitives
   
 %.c:            %.pri prim2cl.fs  %.c:            %.pri prim2cl.fs

Removed from v.1.378  
changed lines
  Added in v.1.382


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>