Mercurial > hg > octave-nkf

changeset 6358:61091f4af6e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2007-02-26 20:46:22 by jwe]
author jwe
date Mon, 26 Feb 2007 20:46:24 +0000
parents d93787dbedec
children 069ea93b3c45
files ChangeLog dlfcn/Makefile.in doc/ChangeLog doc/Makefile.in doc/faq/Makefile.in doc/interpreter/Makefile.in doc/liboctave/Makefile.in doc/refcard/Makefile.in emacs/Makefile.in examples/Makefile.in libcruft/ChangeLog libcruft/Makefile.in libcruft/Makerules.in liboctave/ChangeLog liboctave/Makefile.in octMakefile.in scripts/ChangeLog scripts/Makefile.in scripts/audio/Makefile.in scripts/control/Makefile.in scripts/control/base/Makefile.in scripts/control/hinf/Makefile.in scripts/control/obsolete/Makefile.in scripts/control/system/Makefile.in scripts/control/util/Makefile.in scripts/deprecated/Makefile.in scripts/elfun/Makefile.in scripts/finance/Makefile.in scripts/general/Makefile.in scripts/image/Makefile.in scripts/io/Makefile.in scripts/linear-algebra/Makefile.in scripts/miscellaneous/Makefile.in scripts/optimization/Makefile.in scripts/path/Makefile.in scripts/pkg/Makefile.in scripts/plot/Makefile.in scripts/polynomial/Makefile.in scripts/quaternion/Makefile.in scripts/set/Makefile.in scripts/signal/Makefile.in scripts/sparse/Makefile.in scripts/specfun/Makefile.in scripts/special-matrix/Makefile.in scripts/startup/Makefile.in scripts/statistics/Makefile.in scripts/statistics/base/Makefile.in scripts/statistics/distributions/Makefile.in scripts/statistics/models/Makefile.in scripts/statistics/tests/Makefile.in scripts/strings/Makefile.in scripts/testfun/Makefile.in scripts/time/Makefile.in src/ChangeLog src/Makefile.in test/ChangeLog test/Makefile.in
diffstat 57 files changed, 117 insertions(+), 69 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-02-26  John W. Eaton  <jwe@octave.org>
+
+	* octMakefile.in (DISTDIRS): Eliminate variable.
+
+2007-02-26  From Michael Goffioul  <michael.goffioul@swing.be>
+
+	* octMakefile.in, dlfcn/Makefile.in, emacs/Makefile.in:
+	Use $(LN_S) instead of ln or ln -s.
+
+	* octMakefile.in (dist): Use -9 instead of --best with gzip/bzip2.
+
 2007-02-21  John W. Eaton  <jwe@octave.org>
 
 	* configure.in: Also warn about missing functionality for
--- a/dlfcn/Makefile.in
+++ b/dlfcn/Makefile.in
@@ -67,11 +67,11 @@
 .PHONY: maintainer-clean
 
 dist:
-	ln $(DISTFILES) ../`cat ../.fname`/dlfcn
+	$(LN_S) $(DISTFILES) ../`cat ../.fname`/dlfcn
 .PHONY: dist
 
 conf-dist:
-	ln octave.cc Makefile.in ../`cat ../.fname`/dlfcn
+	$(LN_S) octave.cc Makefile.in ../`cat ../.fname`/dlfcn
 .PHONY: conf-dist
 
 ifndef omit_deps
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-26  From Michael Goffioul  <michael.goffioul@swing.be>
+
+	* Makefile.in, interpreter/Makefile.in, faq/Makefile.in,
+	liboctave/Makefile.in, refcard/Makefile.in:
+	Use $(LN_S) instead of ln or ln -s.
+
 2007-02-21  David Bateman  <dbateman@free.fr>
 
 	* interpreter/sparse.txi: Add functions sprank and normest to
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -61,6 +61,6 @@
 	rm -f tags TAGS Makefile
 
 dist: conf.texi
-	ln $(DISTFILES) ../`cat ../.fname`/doc
+	$(LN_S) $(DISTFILES) ../`cat ../.fname`/doc
 	for dir in $(DISTSUBDIRS); do mkdir ../`cat ../.fname`/doc/$$dir; $(MAKE) -C $$dir $@; done
 .PHONY: dist
--- a/doc/faq/Makefile.in
+++ b/doc/faq/Makefile.in
@@ -85,6 +85,6 @@
 .PHONY: maintainer-clean
 
 dist: all
-	ln $(DISTFILES) ../../`cat ../../.fname`/doc/faq
-	for dir in $(DISTDIRS); do ln -s ../../../doc/faq/$$dir ../../`cat ../../.fname`/doc/faq/$$dir; done
+	$(LN_S) $(DISTFILES) ../../`cat ../../.fname`/doc/faq
+	for dir in $(DISTDIRS); do $(LN_S) ../../doc/faq/$$dir ../../`cat ../../.fname`/doc/faq/$$dir; done
 .PHONY: dist
--- a/doc/interpreter/Makefile.in
+++ b/doc/interpreter/Makefile.in
@@ -246,7 +246,7 @@
 .PHONY: clean-texi
 
 dist: clean-texi all
-	ln $(DISTFILES) ../../`cat ../../.fname`/doc/interpreter
-	for dir in $(DISTDIRS); do ln -s ../../../doc/interpreter/$$dir ../../`cat ../../.fname`/doc/interpreter/$$dir; done
+	$(LN_S) $(DISTFILES) ../../`cat ../../.fname`/doc/interpreter
+	for dir in $(DISTDIRS); do $(LN_S) ../../doc/interpreter/$$dir ../../`cat ../../.fname`/doc/interpreter/$$dir; done
 	for dir in $(DISTSUBDIRS); do mkdir ../../`cat ../../.fname`/doc/interpreter/$$dir; $(MAKE) -C $$dir $@; done
 .PHONY: dist
--- a/doc/liboctave/Makefile.in
+++ b/doc/liboctave/Makefile.in
@@ -101,6 +101,6 @@
 .PHONY: maintainer-clean
 
 dist: all
-	ln $(DISTFILES) ../../`cat ../../.fname`/doc/liboctave
-	for dir in $(DISTDIRS); do ln -s ../../../doc/liboctave/$$dir ../../`cat ../../.fname`/doc/liboctave/$$dir; done
+	$(LN_S) $(DISTFILES) ../../`cat ../../.fname`/doc/liboctave
+	for dir in $(DISTDIRS); do $(LN_S) ../../doc/liboctave/$$dir ../../`cat ../../.fname`/doc/liboctave/$$dir; done
 .PHONY: dist
--- a/doc/refcard/Makefile.in
+++ b/doc/refcard/Makefile.in
@@ -77,5 +77,5 @@
 .PHONY: maintainer-clean
 
 dist: all
-	ln $(DISTFILES) ../../`cat ../../.fname`/doc/refcard
+	$(LN_S) $(DISTFILES) ../../`cat ../../.fname`/doc/refcard
 .PHONY: dist
--- a/emacs/Makefile.in
+++ b/emacs/Makefile.in
@@ -54,5 +54,5 @@
 .PHONY: maintainer-clean
 
 dist:
-	ln $(DISTFILES) ../`cat ../.fname`/emacs
+	$(LN_S) $(DISTFILES) ../`cat ../.fname`/emacs
 .PHONY: dist
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -87,5 +87,5 @@
 .PHONY: maintainer-clean
 
 dist:
-	ln $(DISTFILES) ../`cat ../.fname`/examples
+	$(LN_S) $(DISTFILES) ../`cat ../.fname`/examples
 .PHONY: dist
--- a/libcruft/ChangeLog
+++ b/libcruft/ChangeLog
@@ -1,3 +1,7 @@
+2007-02-26  From Michael Goffioul  <michael.goffioul@swing.be>
+
+	* Makefile.in, Makerules.in: Use $(LN_S) instead of ln or ln -s.
+
 2007-02-07  John W. Eaton  <jwe@octave.org>
 
 	* Makerules.in: Don't use wildcard function to generate source
--- a/libcruft/Makefile.in
+++ b/libcruft/Makefile.in
@@ -186,7 +186,7 @@
 
 dist:
 	for dir in $(DISTSUBDIRS); do mkdir ../`cat ../.fname`/libcruft/$$dir; $(MAKE) -C $$dir $@; done
-	ln $(DISTFILES) ../`cat ../.fname`/libcruft
+	$(LN_S) $(DISTFILES) ../`cat ../.fname`/libcruft
 .PHONY: dist
 
 .NOTPARALLEL:
--- a/libcruft/Makerules.in
+++ b/libcruft/Makerules.in
@@ -102,5 +102,5 @@
 .PHONY: maintainer-clean
 
 dist:
-	ln $(EXTERNAL_DISTFILES) ../../`cat ../../.fname`/libcruft/$(THISDIR)
+	$(LN_S) $(EXTERNAL_DISTFILES) ../../`cat ../../.fname`/libcruft/$(THISDIR)
 .PHONY: dist
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,7 @@
+2007-02-26  From Michael Goffioul  <michael.goffioul@swing.be>
+
+	* Makefile.in: Use $(LN_S) instead of ln or ln -s.
+
 2007-02-18  David Bateman  <dbateman@free.fr>
 
 	* oct-rand.cc (do_old_initialization()): call setcgn(1) prior to
--- a/liboctave/Makefile.in
+++ b/liboctave/Makefile.in
@@ -331,8 +331,8 @@
 .PHONY: maintainer-clean
 
 dist: stamp-prereq
-	ln $(DISTFILES) ../`cat ../.fname`/liboctave
-	for dir in $(DISTDIRS); do ln -s ../../liboctave/$$dir ../`cat ../.fname`/liboctave; done
+	$(LN_S) $(DISTFILES) ../`cat ../.fname`/liboctave
+	for dir in $(DISTDIRS); do $(LN_S) ../../liboctave/$$dir ../`cat ../.fname`/liboctave; done
 .PHONY: dist
 
 $(OPTS_INC) : %.h : %.in $(top_srcdir)/mk-opts.pl
--- a/octMakefile.in
+++ b/octMakefile.in
@@ -27,14 +27,12 @@
 DISTFILES = $(CONF_DISTFILES) \
 	BUGS COPYING FLEX.patch INSTALL INSTALL.OCTAVE NEWS \
 	NEWS.[0-9] PROJECTS README README.Linux README.Windows \
+	README.Cygwin README.MSVC \
 	README.MachTen README.kpathsea ROADMAP SENDING-PATCHES \
 	THANKS move-if-change octave-sh octave-bug.in \
 	octave-config.in mk-opts.pl mkinstalldirs \
 	mkoctfile.in run-octave.in gdbinit.in ChangeLog ChangeLog.[0-9]
 
-# Complete directory trees to distribute.
-DISTDIRS = # plplot
-
 # Subdirectories in which to run `make all'.
 SUBDIRS = @DLFCN_DIR@ libcruft liboctave src scripts doc examples
 
@@ -45,8 +43,7 @@
 CONF_DISTSUBDIRS = src
 
 # Subdirectories in which to run `make dist'.
-DISTSUBDIRS_1 = $(sort $(SUBDIRS) dlfcn test emacs)
-DISTSUBDIRS = $(filter-out $(DISTDIRS), $(DISTSUBDIRS_1))
+DISTSUBDIRS = $(sort $(SUBDIRS) dlfcn test emacs)
 
 # Subdirectories in which to run clean targets.
 CLEANSUBDIRS = $(DISTSUBDIRS)
@@ -166,8 +163,7 @@
 	echo octave-$(version) > .fname
 	rm -rf `cat .fname`
 	mkdir `cat .fname`
-	ln $(DISTFILES) `cat .fname`
-	for dir in $(DISTDIRS); do ln -s ../$$dir `cat .fname`; done
+	$(LN_S) $(DISTFILES) `cat .fname`
 	for dir in $(DISTSUBDIRS); do \
 	  mkdir `cat .fname`/$$dir; \
 	  $(MAKE) -C $$dir dist; \
@@ -186,8 +182,8 @@
 	chmod -R a+rwX `cat .fname`
 	tar cf `cat .fname`.tar `cat .fname`
 	rm -rf `cat .fname`
-	gzip --best --stdout `cat .fname`.tar > `cat .fname`.tar.gz
-	bzip2 --best --stdout `cat .fname`.tar > `cat .fname`.tar.bz2
+	gzip -9 --stdout `cat .fname`.tar > `cat .fname`.tar.gz
+	bzip2 -9 --stdout `cat .fname`.tar > `cat .fname`.tar.bz2
 	date -u > md5sum
 	md5sum `cat .fname`.tar.gz `cat .fname`.tar.bz2 >> md5sum
 	touch `cat .fname`.tar.gz `cat .fname`.tar.bz2 md5sum
@@ -219,7 +215,7 @@
 	echo config-dist-$(version) > .fname
 	rm -rf `cat .fname`
 	mkdir `cat .fname`
-	ln $(CONF_DISTFILES) `cat .fname`
+	$(LN_S) $(CONF_DISTFILES) `cat .fname`
 	for dir in $(CONF_DISTSUBDIRS); do \
 	  mkdir `cat .fname`/$$dir; \
 	  $(MAKE) -C $$dir conf-dist; \
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,22 @@
+2007-02-26  From Michael Goffioul  <michael.goffioul@swing.be>
+
+	* Makefile.in, audio/Makefile.in, control/Makefile.in,
+	control/base/Makefile.in, control/hinf/Makefile.in,
+	control/obsolete/Makefile.in, control/system/Makefile.in,
+	control/util/Makefile.in, deprecated/Makefile.in,
+	elfun/Makefile.in, finance/Makefile.in, general/Makefile.in,
+	image/Makefile.in, io/Makefile.in, linear-algebra/Makefile.in,
+	miscellaneous/Makefile.in, optimization/Makefile.in,
+	path/Makefile.in, pkg/Makefile.in, plot/Makefile.in,
+	polynomial/Makefile.in, quaternion/Makefile.in, set/Makefile.in,
+	signal/Makefile.in, sparse/Makefile.in, specfun/Makefile.in,
+	special-matrix/Makefile.in, startup/Makefile.in,
+	statistics/Makefile.in, statistics/base/Makefile.in,
+	statistics/distributions/Makefile.in,
+	statistics/models/Makefile.in, statistics/tests/Makefile.in,
+	strings/Makefile.in, testfun/Makefile.in, time/Makefile.in:
+	Use $(LN_S) instead of ln or ln -s.
+
 2007-02-24  David Bateman  <dbateman@free.fr>
 
 	* pkg/pkg.m (configure_make): Ignore blank lines and trailing
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -85,6 +85,6 @@
 	rm -f tags TAGS configure
 
 dist:
-	ln $(DISTFILES) ../`cat ../.fname`/scripts
+	$(LN_S) $(DISTFILES) ../`cat ../.fname`/scripts
 	for dir in $(DISTSUBDIRS); do mkdir ../`cat ../.fname`/scripts/$$dir; $(MAKE) -C $$dir $@; done
 .PHONY: dist
--- a/scripts/audio/Makefile.in
+++ b/scripts/audio/Makefile.in
@@ -64,5 +64,5 @@
 .PHONY: maintainer-clean
 
 dist:
-	ln $(DISTFILES) ../../`cat ../../.fname`/scripts/audio
+	$(LN_S) $(DISTFILES) ../../`cat ../../.fname`/scripts/audio
 .PHONY: dist
--- a/scripts/control/Makefile.in
+++ b/scripts/control/Makefile.in
@@ -48,6 +48,6 @@
 	rm -f tags TAGS Makefile
 
 dist:
-	ln $(DISTFILES) ../../`cat ../../.fname`/scripts/control
+	$(LN_S) $(DISTFILES) ../../`cat ../../.fname`/scripts/control
 	for dir in $(DISTSUBDIRS); do mkdir ../../`cat ../../.fname`/scripts/control/$$dir; $(MAKE) -C $$dir $@; done
 .PHONY: dist
--- a/scripts/control/base/Makefile.in
+++ b/scripts/control/base/Makefile.in
@@ -69,5 +69,5 @@
 .PHONY: maintainer-clean
 
 dist:
-	ln $(DISTFILES) ../../../`cat ../../../.fname`/scripts/$(script_sub_dir)
+	$(LN_S) $(DISTFILES) ../../../`cat ../../../.fname`/scripts/$(script_sub_dir)
 .PHONY: dist
--- a/scripts/control/hinf/Makefile.in
+++ b/scripts/control/hinf/Makefile.in
@@ -65,5 +65,5 @@
 .PHONY: maintainer-clean
 
 dist:
-	ln $(DISTFILES) ../../../`cat ../../../.fname`/scripts/$(script_sub_dir)
+	$(LN_S) $(DISTFILES) ../../../`cat ../../../.fname`/scripts/$(script_sub_dir)
 .PHONY: dist
--- a/scripts/control/obsolete/Makefile.in
+++ b/scripts/control/obsolete/Makefile.in
@@ -64,5 +64,5 @@
 .PHONY: maintainer-clean
 
 dist:
-	ln $(DISTFILES) ../../../`cat ../../../.fname`/scripts/$(script_sub_dir)
+	$(LN_S) $(DISTFILES) ../../../`cat ../../../.fname`/scripts/$(script_sub_dir)
 .PHONY: dist
--- a/scripts/control/system/Makefile.in
+++ b/scripts/control/system/Makefile.in
@@ -77,5 +77,5 @@
 .PHONY: maintainer-clean
 
 dist:
-	ln $(DISTFILES) ../../../`cat ../../../.fname`/scripts/$(script_sub_dir)
+	$(LN_S) $(DISTFILES) ../../../`cat ../../../.fname`/scripts/$(script_sub_dir)
 .PHONY: dist
--- a/scripts/control/util/Makefile.in
+++ b/scripts/control/util/Makefile.in
@@ -65,5 +65,5 @@
 .PHONY: maintainer-clean
 
 dist:
-	ln $(DISTFILES) ../../../`cat ../../../.fname`/scripts/$(script_sub_dir)
+	$(LN_S) $(DISTFILES) ../../../`cat ../../../.fname`/scripts/$(script_sub_dir)
 .PHONY: dist
--- a/scripts/deprecated/Makefile.in
+++ b/scripts/deprecated/Makefile.in
@@ -81,5 +81,5 @@
 .PHONY: maintainer-clean
 
 dist:
-	ln $(DISTFILES) ../../`cat ../../.fname`/scripts/deprecated
+	$(LN_S) $(DISTFILES) ../../`cat ../../.fname`/scripts/deprecated
 .PHONY: dist
--- a/scripts/elfun/Makefile.in
+++ b/scripts/elfun/Makefile.in
@@ -66,5 +66,5 @@
 .PHONY: maintainer-clean
 
 dist:
-	ln $(DISTFILES) ../../`cat ../../.fname`/scripts/elfun
+	$(LN_S) $(DISTFILES) ../../`cat ../../.fname`/scripts/elfun
 .PHONY: dist
--- a/scripts/finance/Makefile.in
+++ b/scripts/finance/Makefile.in
@@ -63,5 +63,5 @@
 .PHONY: maintainer-clean
 
 dist:
-	ln $(DISTFILES) ../../`cat ../../.fname`/scripts/finance
+	$(LN_S) $(DISTFILES) ../../`cat ../../.fname`/scripts/finance
 .PHONY: dist
--- a/scripts/general/Makefile.in
+++ b/scripts/general/Makefile.in
@@ -73,5 +73,5 @@
 .PHONY: maintainer-clean
 
 dist:
-	ln $(DISTFILES) ../../`cat ../../.fname`/scripts/general
+	$(LN_S) $(DISTFILES) ../../`cat ../../.fname`/scripts/general
 .PHONY: dist
--- a/scripts/image/Makefile.in
+++ b/scripts/image/Makefile.in
@@ -80,5 +80,5 @@
 .PHONY: maintainer-clean
 
 dist:
-	ln $(DISTFILES) ../../`cat ../../.fname`/scripts/image
+	$(LN_S) $(DISTFILES) ../../`cat ../../.fname`/scripts/image
 .PHONY: dist
--- a/scripts/io/Makefile.in
+++ b/scripts/io/Makefile.in
@@ -63,5 +63,5 @@
 .PHONY: maintainer-clean