# HG changeset patch # User jwe # Date 855952262 0 # Node ID b2e3cceb63ad3f29eab68a47095f4c838c0b48ad # Parent 02bad9e9816730cd9c40ea39006ff668926d1fef [project @ 1997-02-14 20:31:02 by jwe] diff -r 02bad9e98167 -r b2e3cceb63ad ChangeLog --- a/ChangeLog Fri Feb 14 20:17:20 1997 +0000 +++ b/ChangeLog Fri Feb 14 20:31:02 1997 +0000 @@ -1,3 +1,19 @@ +Fri Feb 14 14:07:08 1997 John W. Eaton + + * octMakefile.in (bin-dist-type): Delete target. + (binary-dist): Don't depend on bin-dist-type. + Don't delete config.status or config.h here. + (BINDISTFILES): Include config.status and config.h here. + + * Makefile.in (config-check): New target. + (all): Depend on config-check. + (static-binary-distribution, dynamic-binary-distribution): Delete. + (binary-distribution): If in source directory, run configure and + make with appropriate args. + + * octMakefile.in (maintainer-clean, distclean): Don't delete Makefile. + (CONF_DISTFILES): Distribute Makefile too. + Thu Feb 13 16:25:09 1997 John W. Eaton * configure.in (SH_LD, SH_LDFLAGS): New variables. diff -r 02bad9e98167 -r b2e3cceb63ad Makefile.in --- a/Makefile.in Fri Feb 14 20:17:20 1997 +0000 +++ b/Makefile.in Fri Feb 14 20:31:02 1997 +0000 @@ -25,24 +25,16 @@ $(MAKE) -f octMakefile INSTALL_PROGRAM='${INSTALL} -s' install binary-dist: FORCE - @echo "***" - @echo "*** you must specify either static or dynamic:" - @echo "***" - @echo "*** make dynamic-binary-dist" - @echo "***" - @echo "*** dynamically linked version typically including support" - @echo "*** for shared libraried and dynamically linked functions" - @echo "***" - @echo "*** make static-binary-dist" - @echo "***" - @echo "*** statically linked version" - @echo "***" - -static-binary-dist: FORCE - $(MAKE) -f octMakefile DIST_TYPE=static binary-dist - -dynamic-binary-dist: FORCE - $(MAKE) -f octMakefile DIST_TYPE=dynamic binary-dist + @if test -f configure && test -f octMakefile.in ; then \ + ./configure --disable-shared --disable-dl --disable-shl ; \ + else \ + echo "" ; \ + echo "*** You must run make binary-dist in the source directory." ; \ + echo "" ; \ + exit 1 ; \ + fi + $(MAKE) -f octMakefile CFLAGS=-O CXXFLAGS=-O LDFLAGS=-static all + $(MAKE) -f octMakefile binary-dist # Maybe this message will prevent people from asking why the # Makefiles don't work for them. Maybe not. @@ -84,8 +76,7 @@ @echo "" @echo " dist create a source distribution" @echo " conf-dist create a config files distribution" - @echo " static-binary-dist create a binary distribution" - @echo " dynamic-binary-dist create a binary distribution" + @echo " binary-dist create a binary distribution" @echo "" @echo " clean remove files created by make all" @echo " mostlyclean remove most files created by make all" diff -r 02bad9e98167 -r b2e3cceb63ad doc/interpreter/octave.texi --- a/doc/interpreter/octave.texi Fri Feb 14 20:17:20 1997 +0000 +++ b/doc/interpreter/octave.texi Fri Feb 14 20:31:02 1997 +0000 @@ -66,11 +66,11 @@ @end ifinfo @titlepage -@title{Octave} -@subtitle{A high-level interactive language for numerical computations} -@subtitle{Edition 3 for Octave version @value{VERSION}} -@subtitle{October 1996} -@author{John W. Eaton} +@title Octave +@subtitle A high-level interactive language for numerical computations +@subtitle Edition 3 for Octave version @value{VERSION} +@subtitle October 1996 +@author John W. Eaton @page @vskip 0pt plus 1filll Copyright @copyright{} 1996, 1997 John W. Eaton. diff -r 02bad9e98167 -r b2e3cceb63ad octMakefile.in --- a/octMakefile.in Fri Feb 14 20:17:20 1997 +0000 +++ b/octMakefile.in Fri Feb 14 20:31:02 1997 +0000 @@ -19,7 +19,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_DATA = @INSTALL_DATA@ -CONF_DISTFILES = Makefile.in octMakefile.in Makeconf.in configure \ +CONF_DISTFILES = Makefile Makefile.in octMakefile.in Makeconf.in configure \ configure.in config.guess config.sub aclocal.m4 config.h.in \ acconfig.h config.h.bot install-sh @@ -50,7 +50,7 @@ ChangeLog ChangeLog.[0-9] BINDISTFILES = $(addprefix $(srcdir)/, $(XBINDISTFILES)) \ - octave-bug VERSION ARCH + octave-bug config.status config.h VERSION ARCH # Subdirectories in which to run `make bin-dist'. BINDISTSUBDIRS = libcruft liboctave src kpathsea readline info \ @@ -125,7 +125,7 @@ .PHONY: clean mostlyclean distclean maintainer-clean maintainer-clean distclean:: - rm -f octMakefile octave-bug Makefile Makeconf config.cache + rm -f octMakefile octave-bug Makeconf config.cache rm -f config.h config.log config.status Makerules.f77 rm -f mk-oct-links mkoctfile @@ -201,17 +201,6 @@ # Rules for making a binary distribution. -bin-dist-type: - @if [ -z "$(DIST_TYPE)" ]; then \ - echo "***" ; \ - echo "*** Must specify a value for DIST_TYPE (static or dynamic)" ; \ - echo "***" ; \ - exit 1 ; \ - else \ - exit 0 ; \ - fi -.PHONY: bin-dist-type - VERSION: echo $(version) > VERSION .PHONY: VERSION @@ -220,8 +209,8 @@ echo $(target_host_type) > ARCH .PHONY: ARCH -binary-dist: bin-dist-type VERSION ARCH octave-bug dist-info-files - echo octave-$(version)-$(target_host_type)-$(DIST_TYPE) > .fname +binary-dist: VERSION ARCH octave-bug dist-info-files + echo octave-$(version)-$(target_host_type) > .fname rm -rf `cat .fname` mkdir `cat .fname` ln $(BINDISTFILES) `cat .fname` @@ -236,8 +225,7 @@ tar xf `cat .fname`.tar find `cat .fname` \( \( -name RCS -a -type d \) \ -o \( -name OLD -a -type d \) -o -name "=*" \ - -o -name '*~' -o -name '#*#' -o -name config.log \ - -o -name config.status -o -name Makefile \ + -o -name '*~' -o -name '#*#' -o -name Makefile \ -o -name c-auto.h \) -print | xargs rm -rf rm -f `cat .fname`/test/octave.test/*.m rm -rf `cat .fname`/test/octave.test/npsol