Diff for /gforth/Makefile.in between versions 1.73 and 1.80

version 1.73, 1996/10/31 17:41:15 version 1.80, 1997/01/14 16:30:49
Line 23 Line 23
 #     (which will cause the Makefiles to be regenerated when you run `make');  #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.  # (2) otherwise, pass the desired values on the `make' command line.
   
 VERSION =0.2.0#gforth version  #gforth version
   VERSION_MAJOR=0
   VERSION_MINOR=2
   VERSION_RELEASE=9
   VERSION =$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE)
   DOSVERSION=$(VERSION_MAJOR)$(VERSION_MINOR)$(VERSION_RELEASE)
 SHELL   = /bin/sh  SHELL   = /bin/sh
 RM      = rm  RM      = rm
   RMTREE  = rm -rf
 CP      = cp  CP      = cp
   TAR     = tar cf -
 INSTALL = @INSTALL@  INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@  INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@  INSTALL_DATA = @INSTALL_DATA@
 INSTALL_DIR = $(srcdir)/install-sh -d  
 LN_S    = @LN_S@  LN_S    = @LN_S@
 GCC     = @CC@  GCC     = @CC@
 CC      = $(GCC)  CC      = $(GCC)
Line 119  GFORTH_FI_SRC = \ Line 125  GFORTH_FI_SRC = \
         wordinfo.fs          wordinfo.fs
   
 FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) \  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) \
         ansi.fs answords.fs \          ans-report.fs ansi.fs answords.fs \
         checkans.fs \          checkans.fs \
         code.fs colorize.fs \          code.fs colorize.fs \
         doskey.fs ds2texi.fs \          doskey.fs ds2texi.fs \
Line 134  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) Line 140  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
         wordsets.fs \          wordsets.fs \
         tester.fs coretest.fs postponetest.fs dbltest.fs \          tester.fs coretest.fs postponetest.fs dbltest.fs \
         bubble.fs siev.fs matrix.fs fib.fs \          bubble.fs siev.fs matrix.fs fib.fs \
         oof.fs oofsampl.fs          oof.fs oofsampl.fs objects.fs
   
 SOURCES = CVS compat Makefile.in configure.in configure config.sub config.guess \  SOURCES = CVS compat Makefile.in configure.in configure config.sub config.guess \
         acconfig.h config.h.in stamp-h.in \          acconfig.h config.h.in stamp-h.in \
Line 147  SOURCES = CVS compat Makefile.in configu Line 153  SOURCES = CVS compat Makefile.in configu
         strerror.c strsignal.c dblsub.c \          strerror.c strsignal.c dblsub.c \
         INSTALL.DOS makefile.dos mkdosmf.sed configure.bat dosconf.h \          INSTALL.DOS makefile.dos mkdosmf.sed configure.bat dosconf.h \
         startup.dos history.dos \          startup.dos history.dos \
         os2conf.h makefile.os2 \          configure.cmd mkos2mf.sed os2conf.h makefile.os2 \
         glosgen.glo glossaries.doc \          glosgen.glo glossaries.doc \
         $(INCLUDES) $(FORTH_SRC)          $(INCLUDES) $(FORTH_SRC)
   
Line 183  GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) gf Line 189  GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) gf
   
 all:    version.fs more  all:    version.fs more
   
 version.h:      Makefile.in  #this rule avoids remaking everything after minor changes in Makefile.in
   version-stamp:  Makefile.in
                   test x'$(VERSION)' = x`cat $@` || echo $(VERSION) >$@
   
   version.h:      version-stamp
                 echo "static char gforth_version[]=\"$(VERSION)\" ;" >$@                  echo "static char gforth_version[]=\"$(VERSION)\" ;" >$@
   
 version.fs:     Makefile.in  version.fs:     version-stamp
                 $(MAKE) gforth                  $(MAKE) gforth
                 echo ": version-string s\" $(VERSION)\" ;" >$@                  echo ": version-string s\" $(VERSION)\" ;" >$@
   
Line 228  virtualclean: mostlyclean Line 238  virtualclean: mostlyclean
   
 #use dist targets only when srcdir=.  #use dist targets only when srcdir=.
 dist:           $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST)  dist:           $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST)
                 -rm -rf gforth-$(VERSION)                  -$(RMTREE) gforth-$(VERSION)
                 mkdir gforth-$(VERSION)                  mkdir gforth-$(VERSION)
                 $(CP) -rp $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) gforth-$(VERSION)                  $(CP) -rp $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) gforth-$(VERSION)
                 tar cvf - gforth-$(VERSION)|gzip -9 >gforth-$(VERSION).tar.gz                  $(TAR) gforth-$(VERSION)|gzip -9 >gforth-$(VERSION).tar.gz
                 -rm -rf gforth-$(VERSION)                  -$(RMTREE) gforth-$(VERSION)
   
   #use dist targets only when srcdir=.
   dosdist:        $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST)
                   -$(RMTREE) gforth.$(DOSVERSION)
                   mkdir gforth.$(DOSVERSION)
                   $(CP) -rp $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) gforth.$(DOSVERSION)
                   zip -r9 gforth.zip gforth.$(DOSVERSION)/*
                   -$(RMTREE) gforth.$(DOSVERSION)
   
 #A source distribution contains only the things needed to install gforth,  #A source distribution contains only the things needed to install gforth,
 #without the documents.  #without the documents.
 srcdist:        $(SOURCES) $(FORTH_GEN0) @KERNEL@  srcdist:        $(SOURCES) $(FORTH_GEN0) @KERNEL@
                 -rm -rf gforth-$(VERSION)                  -$(RMTREE) gforth-$(VERSION)
                 mkdir gforth-$(VERSION)                  mkdir gforth-$(VERSION)
                 $(CP) -rp $(SOURCES) $(FORTH_GEN0) @KERNEL@ gforth-$(VERSION)                  $(CP) -rp $(SOURCES) $(FORTH_GEN0) @KERNEL@ gforth-$(VERSION)
                 tar cvf - gforth-$(VERSION)|gzip -9 >gforth-src-$(VERSION).tar.gz                  $(TAR) gforth-$(VERSION)|gzip -9 >gforth-src-$(VERSION).tar.gz
                 -rm -rf gforth-$(VERSION)                  -$(RMTREE) gforth-$(VERSION)
   
 #A document distribution contains only the documents, which can be created  #A document distribution contains only the documents, which can be created
 #with MAKE.  #with MAKE.
 docdist:        $(DOCDIST)  docdist:        $(DOCDIST)
                 -rm -rf gforth-$(VERSION)                  -$(RMTREE) gforth-$(VERSION)
                 mkdir gforth-$(VERSION)                  mkdir gforth-$(VERSION)
                 $(CP) -rp $(DOCDIST) gforth-$(VERSION)                  $(CP) -rp $(DOCDIST) gforth-$(VERSION)
                 tar cvf - gforth-$(VERSION)|gzip -9 >gforth-doc-$(VERSION).tar.gz                  $(TAR) gforth-$(VERSION)|gzip -9 >gforth-doc-$(VERSION).tar.gz
                 -rm -rf gforth-$(VERSION)                  -$(RMTREE) gforth-$(VERSION)
   
 #a binary distribution contains the complete source distribution,  #a binary distribution contains the complete source distribution,
 # the objects, the executable and the links. the objects are there for making  # the objects, the executable and the links. the objects are there for making
 # make happy.  # make happy.
 bindist:        $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) $(BINONLYDIST)  bindist:        $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) $(BINONLYDIST)
                 -rm -rf gforth-$(VERSION)                  -$(RMTREE) gforth-$(VERSION)
                 mkdir gforth-$(VERSION)                  mkdir gforth-$(VERSION)
                 $(CP) -rp -d $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) $(BINONLYDIST) gforth-$(VERSION)                  $(CP) -rp -d $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) $(BINONLYDIST) gforth-$(VERSION)
                 strip gforth-$(VERSION)/gforth                  strip gforth-$(VERSION)/gforth
                 tar cvf - gforth-$(VERSION)|gzip -9 >gforth-$(VERSION)-@host@.tar.gz                  $(TAR) gforth-$(VERSION)|gzip -9 >gforth-$(VERSION)-@host@.tar.gz
   
 #makes a package with only the stuff not present in the source  #makes a package with only the stuff not present in the source
 #package. For installation the source package is still needed!  #package. For installation the source package is still needed!
Line 270  bindist: $(SOURCES) $(FORTH_GEN0) @KERNE Line 288  bindist: $(SOURCES) $(FORTH_GEN0) @KERNE
 #then just has to unpack the source and his favourite binonly into the  #then just has to unpack the source and his favourite binonly into the
 #same directory and has a full binary distribution.  #same directory and has a full binary distribution.
 binonlydist:    $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) $(BINONLYDIST)  binonlydist:    $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) $(BINONLYDIST)
                 -rm -rf gforth-$(VERSION)                  -$(RMTREE) gforth-$(VERSION)
                 mkdir gforth-$(VERSION)                  mkdir gforth-$(VERSION)
                 $(CP) -p -d  $(BINONLYDIST) gforth-$(VERSION)                  $(CP) -p -d  $(BINONLYDIST) gforth-$(VERSION)
                 strip gforth-$(VERSION)/gforth                  strip gforth-$(VERSION)/gforth
                 tar cvf - gforth-$(VERSION)|gzip -9 >gforth-$(VERSION)-binonly-@host@.tar.gz                  $(TAR) gforth-$(VERSION)|gzip -9 >gforth-$(VERSION)-binonly-@host@.tar.gz
   
   
 #strip gforth, because the debugging stuff is hardly useful once  #strip gforth, because the debugging stuff is hardly useful once
Line 283  binonlydist: $(SOURCES) $(FORTH_GEN0) @K Line 301  binonlydist: $(SOURCES) $(FORTH_GEN0) @K
 #install does not depend on gforth.info, because that would require  #install does not depend on gforth.info, because that would require
 #supplying a lot of files that can be easily generated (only info is  #supplying a lot of files that can be easily generated (only info is
 #hard to generate)  #hard to generate)
 install:        gforth $(FORTH_SRC) kernel.fi gforth.fi gforth.1 primitives gforth.TAGS  install:        gforth $(FORTH_SRC) kernel.fi gforth.fi gforth.1 primitives gforth.TAGS installdirs
                 for i in $(bindir) $(mandir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(datadir)/gforth/site-forth; do \  
                         $(INSTALL_DIR) $$i; \  
                 done  
                 touch $(datadir)/gforth/site-forth/site-init.fs                  touch $(datadir)/gforth/site-forth/site-init.fs
                 -$(RM) $(bindir)/gforth $(bindir)/gforth-$(VERSION)                  -$(RM) $(bindir)/gforth $(bindir)/gforth-$(VERSION)
                 $(INSTALL_PROGRAM) -s gforth $(bindir)                  $(INSTALL_PROGRAM) -s gforth $(bindir)
                 ln $(bindir)/gforth $(bindir)/gforth-$(VERSION)                  ln $(bindir)/gforth $(bindir)/gforth-$(VERSION)
                 $(INSTALL_DATA) $(srcdir)/gforth.1 $(mandir)                  $(INSTALL_DATA) $(srcdir)/gforth.1 $(man1dir)
                 for i in $(srcdir)/gforth.info*; do $(INSTALL_DATA) $$i $(infodir); done                  for i in $(srcdir)/gforth.info*; do $(INSTALL_DATA) $$i $(infodir); done
                 for i in $(FORTH_SRC) primitives; do \                  for i in $(FORTH_SRC) primitives; do \
                         $(INSTALL_DATA) $(srcdir)/$$i $(datadir)/gforth/$(VERSION); \                          $(INSTALL_DATA) $(srcdir)/$$i $(datadir)/gforth/$(VERSION); \
                 done                  done
                 $(INSTALL_DATA) kernel.fi $(libdir)/gforth/$(VERSION)                  $(INSTALL_DATA) kernel.fi $(libdir)/gforth/$(VERSION)
                 $(FORTHP) $(FORTHSIZES) startup.fs -e "savesystem $(libdir)/gforth/$(VERSION)/gforth.fi bye" #gforth.fi contains some path names                  $(RM) gforth.fi; $(MAKE) gforth.fi #gforth.fi contains some path names
                 sed s:$(srcdir)/:$(datadir)/gforth/$(VERSION)/: gforth.TAGS >TAGS; $(INSTALL_DATA) TAGS $(datadir)/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); \                          $(INSTALL_DATA) $(srcdir)/gforth.el $(emacssitelispdir); \
                 else \                  else \
Line 309  install: gforth $(FORTH_SRC) kernel.fi g Line 324  install: gforth $(FORTH_SRC) kernel.fi g
   
 install-strip:  install  install-strip:  install
   
   installdirs:    mkinstalldirs
                   $(srcdir)/mkinstalldirs $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(datadir)/gforth/site-forth
   
 #deinstall all files specific to this version of gforth  #deinstall all files specific to this version of gforth
 #to uninstall version foo, type `make uninstall VERSION=foo'  #to uninstall version foo, type `make uninstall VERSION=foo'
 uninstall:        uninstall:      
Line 319  check test: gforth gforth.fi Line 337  check test: gforth gforth.fi
                 $(FORTH) tester.fs coretest.fs postponetest.fs dbltest.fs -e bye                  $(FORTH) tester.fs coretest.fs postponetest.fs dbltest.fs -e bye
                 $(FORTH) code.fs checkans.fs -e bye                  $(FORTH) code.fs checkans.fs -e bye
                 @echo 'Expect no differences'                  @echo 'Expect no differences'
                 $(FORTH) prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' output-c process-file bye"| diff -c - $(srcdir)/primitives.i                  $(FORTH) -m 100000 prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' output-c process-file bye"| diff -c - $(srcdir)/primitives.i
   
 bench:          gforth gforth.fi  bench:          gforth gforth.fi
                 @echo 'Each benchmark takes about 30s on a 486-66 (gcc-2.6.3 -DFORCE_REG)'                  @echo 'Each benchmark takes about 30s on a 486-66 (gcc-2.6.3 -DFORCE_REG)'
Line 384  kernl64l.fi: $(KERNLS) Line 402  kernl64l.fi: $(KERNLS)
                 @LINK_KERNL64L@                  @LINK_KERNL64L@
   
 gforth.fi:      @kernel_fi@ gforth $(GFORTH_FI_SRC)  gforth.fi:      @kernel_fi@ gforth $(GFORTH_FI_SRC)
                 $(FORTHK) $(FORTHSIZES) startup.fs -e "savesystem gforth.fi bye"                  $(FORTHK) --clear-dictionary $(FORTHSIZES) startup.fs -e "savesystem gforth.fi1 bye"
                   $(FORTHK)  --clear-dictionary --offset-image $(FORTHSIZES) startup.fs -e "savesystem gforth.fi2 bye"
                   $(FORTHK) -m 100000 startup.fs  comp-image.fs -e "comp-image gforth.fi1 gforth.fi2 gforth.fi bye"
   
 #TAGS is a GNU standard target  #TAGS is a GNU standard target
 TAGS:           gforth.TAGS  TAGS:           gforth.TAGS

Removed from v.1.73  
changed lines
  Added in v.1.80


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