Mercurial > hg > octave-nkf
changeset 5196:cd5cc2a80589
[project @ 2005-03-09 15:22:58 by jwe]
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2005-03-09 John W. Eaton <jwe@octave.org> + + * examples/Makefile.in (bin-dist): Delete target. + (BINDISTFILES): Delete variable. + * emacs/Makefile.in: Likewise. + + * octMakefile.in (VERSION, ARCH, binary-dist): Delete targets. + (XBINDISTFILES, BINDISTFILES, BINDISTSUBDIRS): Delete variables. + 2005-03-04 John W. Eaton <jwe@octave.org> * configure.in (GXX_PICKY_FLAGS): Don't include
--- a/Makefile.in +++ b/Makefile.in @@ -22,18 +22,6 @@ $(NO_DEP_TARGETS): FORCE $(MAKE) -f octMakefile omit_deps=true $@ -binary-dist: FORCE - @if test -f configure && test -f octMakefile.in; then \ - ./configure --enable-shared --enable-lite-kernel ; \ - else \ - echo ""; \ - echo "*** You must run make binary-dist in the source directory."; \ - echo ""; \ - exit 1; \ - fi - $(MAKE) -f octMakefile CFLAGS=-O CXXFLAGS=-O all - $(MAKE) -f octMakefile binary-dist - # Maybe this message will prevent people from asking why the # Makefiles don't work for them. Maybe not. @@ -77,7 +65,6 @@ @echo "" @echo " dist create a source distribution" @echo " conf-dist create a config files 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"
--- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,14 @@ +2005-03-09 John W. Eaton <jwe@octave.org> + + * Makefile.in (bin-dist): Delete target. + (BINDISTSUBDIRS): Delete variable. + + * refcard/Makefile.in (bin-dist): Delete target. + (BINDISTFILES): Delete variable. + * liboctave/Makefile.in: Likewise. + * interpreter/Makefile.in: Likewise. + * faq/Makefile.in: Likewise. + 2005-02-25 John W. Eaton <jwe@octave.org> Sparse merge.
--- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -26,8 +26,6 @@ DISTSUBDIRS = $(SUBDIRS) -BINDISTSUBDIRS = $(SUBDIRS) - all: $(SUBDIRS) .PHONY: all @@ -63,7 +61,3 @@ ln $(DISTFILES) ../`cat ../.fname`/doc for dir in $(DISTSUBDIRS); do mkdir ../`cat ../.fname`/doc/$$dir; $(MAKE) -C $$dir $@; done .PHONY: dist - -bin-dist: - for dir in $(BINDISTSUBDIRS); do mkdir ../`cat ../.fname`/doc/$$dir; $(MAKE) -C $$dir $@; done -.PHONY: bin-dist
--- a/doc/faq/Makefile.in +++ b/doc/faq/Makefile.in @@ -27,8 +27,6 @@ DISTFILES := Makefile.in $(TEXINFO) $(FORMATTED) -BINDISTFILES = - SPELL := $(patsubst %.texi, %.spell, $(ALL_TEXINFO)) %.spell : %.texi @@ -92,9 +90,3 @@ dist: all ln $(DISTFILES) ../../`cat ../../.fname`/doc/faq .PHONY: dist - -bin-dist: - if [ -n "$(BINDISTFILES)" ]; then \ - ln $(BINDISTFILES) ../../`cat ../../.fname`/doc/faq; \ - fi -.PHONY: bin-dist
--- a/doc/interpreter/Makefile.in +++ b/doc/interpreter/Makefile.in @@ -47,12 +47,6 @@ DISTFILES = Makefile.in dir munge-texi.cc $(MAN_SRC) \ $(SOURCES) $(TEXINFO) $(FORMATTED) -ifeq ($(wildcard octave.info), ) - BINDISTFILES = $(addprefix $(srcdir)/, $(MAN_SRC) $(FORMATTED)) -else - BINDISTFILES = $(addprefix $(srcdir)/, $(MAN_SRC)) $(FORMATTED) -endif - # Look for version.h to get version information. xfiles := $(TOPDIR)/src/version.h $(srcdir)/$(TOPDIR)/src/version.h @@ -205,9 +199,3 @@ dist: clean-texi all ln $(DISTFILES) ../../`cat ../../.fname`/doc/interpreter .PHONY: dist - -bin-dist: - if [ -n "$(BINDISTFILES)" ]; then \ - ln $(BINDISTFILES) ../../`cat ../../.fname`/doc/interpreter; \ - fi -.PHONY: bin-dist
--- a/doc/interpreter/install.txi +++ b/doc/interpreter/install.txi @@ -428,17 +428,4 @@ modify Octave's configuration script to automatically determine the proper thing to do. -@item -After installing the binary distribution of Octave in an alternate -directory, the Emacs command @code{run-octave} doesn't work. Emacs -hangs in @code{accept-process-output} in @code{inferior-octave-startup}. - -This seems to be a problem with executing a shell script using the -comint package. You can avoid the problem by changing the way Octave is -installed to eliminate the need for the shell script. You can either -compile and install Octave using the source distribution, reinstall the -binary distribution in the default directory, or copy the commands in -the octave shell script wrapper to your shell startup files (and the -shell startup files for anyone else who is using Octave) and then -rename the file @file{octave.bin} to be @file{octave}. @end itemize
--- a/doc/liboctave/Makefile.in +++ b/doc/liboctave/Makefile.in @@ -30,8 +30,6 @@ DISTFILES = Makefile.in gpl.texi $(TEXINFO) $(FORMATTED) -BINDISTFILES = - SPELL = $(patsubst %.texi, %.spell, $(TEXINFO)) %.spell : %.texi @@ -104,9 +102,3 @@ dist: all ln $(DISTFILES) ../../`cat ../../.fname`/doc/liboctave .PHONY: dist - -bin-dist: - if [ -n "$(BINDISTFILES)" ]; then \ - ln $(BINDISTFILES) ../../`cat ../../.fname`/doc/liboctave; \ - fi -.PHONY: bin-dist
--- a/doc/refcard/Makefile.in +++ b/doc/refcard/Makefile.in @@ -26,12 +26,6 @@ DISTFILES := Makefile.in $(TEX) $(FORMATTED) -ifeq ($(wildcard refcard-letter.ps), ) - BINDISTFILES = $(addprefix $(srcdir)/, $(FORMATTED)) -else - BINDISTFILES = $(FORMATTED) -endif - all: $(FORMATTED) refcard-a4.dvi: refcard-a4.tex refcard.tex @@ -91,9 +85,3 @@ dist: all ln $(DISTFILES) ../../`cat ../../.fname`/doc/refcard .PHONY: dist - -bin-dist: - if [ -n "$(BINDISTFILES)" ]; then \ - ln $(BINDISTFILES) ../../`cat ../../.fname`/doc/refcard; \ - fi -.PHONY: bin-dist
--- a/emacs/Makefile.in +++ b/emacs/Makefile.in @@ -25,8 +25,6 @@ DISTFILES = Makefile.in $(EL_FILES) otags otags.1 NEWS TODO README -BINDISTFILES = $(addprefix $(srcdir)/, $(EL_FILES) otags NEWS TODO README) - all: .PHONY: all @@ -58,9 +56,3 @@ dist: ln $(DISTFILES) ../`cat ../.fname`/emacs .PHONY: dist - -bin-dist: - if [ -n "$(BINDISTFILES)" ]; then \ - ln $(BINDISTFILES) ../`cat ../.fname`/emacs; \ - fi -.PHONY: bin-dist
--- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -25,8 +25,6 @@ DISTFILES = Makefile.in $(SOURCES) $(SCRIPTS) -BINDISTFILES = $(addprefix $(srcdir)/, $(SCRIPTS)) - SUBDIRS = DISTSUBDIRS = @@ -60,9 +58,3 @@ dist: ln $(DISTFILES) ../`cat ../.fname`/examples .PHONY: dist - -bin-dist: - if [ -n "$(BINDISTFILES)" ]; then \ - ln $(BINDISTFILES) ../`cat ../.fname`/examples; \ - fi -.PHONY: bin-dist
--- a/libcruft/ChangeLog +++ b/libcruft/ChangeLog @@ -1,3 +1,8 @@ +2005-03-09 John W. Eaton <jwe@octave.org> + + * Makefile.in (bin-dist): Delete target. + (BINDISTLIBS, BINDISTFILES): Delete variables. + 2005-03-01 John W. Eaton <jwe@octave.org> * Makefile.in (CRUFT_DIRS): Remove it from the list.
--- a/libcruft/Makefile.in +++ b/libcruft/Makefile.in @@ -41,11 +41,6 @@ DISTFILES = Makefile.in ChangeLog Makerules.in $(SOURCES) STOP.patch -ifeq ($(SHARED_LIBS), true) - BINDISTLIBS = libcruft/libcruft - BINDISTFILES = libcruft.$(SHLEXT_VER) -endif - # include BLAS and FFTW just in case some of libcruft depends on them LINK_DEPS = $(BLAS_LIBS) $(FFTW_LIBS) $(FLIBS) @@ -180,13 +175,4 @@ ln $(DISTFILES) ../`cat ../.fname`/libcruft .PHONY: dist -bin-dist: - if [ -n "$(BINDISTFILES)" ]; then \ - ln $(BINDISTFILES) ../`cat ../.fname`/libcruft; \ - fi - if [ -n "$(BINDISTLIBS)" ]; then \ - echo $(BINDISTLIBS) >> ../`cat ../.fname`/LIBRARIES; \ - fi -.PHONY: bin-dist - .NOTPARALLEL:
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,8 @@ +2005-03-09 John W. Eaton <jwe@octave.org> + + * Makefile.in (bin-dist): Delete target. + (BINDISTLIBS, BINDISTFILES): Delete variables. + 2005-03-01 John W. Eaton <jwe@octave.org> * ODESSA.h, ODESSA.cc, ODESSA-opts.in: Delete.
--- a/liboctave/Makefile.in +++ b/liboctave/Makefile.in @@ -160,11 +160,6 @@ # Complete directory trees to distribute. DISTDIRS := COLAMD UMFPACK -ifeq ($(SHARED_LIBS), true) - BINDISTLIBS = liboctave/liboctave - BINDISTFILES = liboctave.$(SHLEXT_VER) -endif - MAKEDEPS_2 := $(SOURCES) $(COLAMD_SRC) MAKEDEPS_1 := $(patsubst %.cc, %.d, $(MAKEDEPS_2)) MAKEDEPS := $(patsubst %.c, %.d, $(MAKEDEPS_1)) @@ -345,15 +340,6 @@ for dir in $(DISTDIRS); do ln -s ../../liboctave/$$dir ../`cat ../.fname/liboctave`; done .PHONY: dist -bin-dist: - if [ -n "$(BINDISTFILES)" ]; then \ - ln $(BINDISTFILES) ../`cat ../.fname`/liboctave; \ - fi - if [ -n "$(BINDISTLIBS)" ]; then \ - echo $(BINDISTLIBS) >> ../`cat ../.fname`/LIBRARIES; \ - fi -.PHONY: bin-dist - $(OPTS_INC) : %.h : %.in $(top_srcdir)/mk-opts.pl @echo making $@ from $< @perl $(top_srcdir)/mk-opts.pl --opt-class-header $< > $@-t
--- a/octMakefile.in +++ b/octMakefile.in @@ -50,17 +50,6 @@ DISTSUBDIRS_1 = $(sort $(ALL_SUBDIRS) dlfcn test emacs) DISTSUBDIRS = $(filter-out $(DISTDIRS), $(DISTSUBDIRS_1)) -XBINDISTFILES = BUGS COPYING INSTALL INSTALL.OCTAVE NEWS NEWS.[0-9] \ - PROJECTS README README.Linux README.Windows README.MachTen \ - SENDING-PATCHES THANKS octave-sh install-octave mkinstalldirs \ - ChangeLog ChangeLog.[0-9] - -BINDISTFILES = $(addprefix $(srcdir)/, $(XBINDISTFILES)) \ - octave-bug octave-config config.status config.h VERSION ARCH - -# Subdirectories in which to run `make bin-dist'. -BINDISTSUBDIRS = libcruft liboctave src scripts doc emacs examples - # Subdirectories in which to run clean targets. CLEANSUBDIRS = $(DISTSUBDIRS) @@ -227,42 +216,4 @@ rm -f .fname .PHONY: conf-dist -# Rules for making a binary distribution. - -VERSION: - echo $(version) > VERSION -.PHONY: VERSION - -ARCH: - echo $(canonical_host_type) > ARCH -.PHONY: ARCH - -binary-dist: VERSION ARCH octave-bug octave-config dist-info-files - echo octave-$(version)-$(canonical_host_type) > .fname - rm -rf `cat .fname` - mkdir `cat .fname` - ln $(BINDISTFILES) `cat .fname` - for dir in $(BINDISTSUBDIRS); do \ - mkdir `cat .fname`/$$dir; \ - $(MAKE) -C $$dir bin-dist; \ - done - tar chf `cat .fname`.tar `cat .fname` - rm -rf `cat .fname` - tar xf `cat .fname`.tar - find `cat .fname` \( \( -name RCS -a -type d \) \ - -o \( -name CVS -a -type d \) -o \( -name OLD -a -type d \) \ - -o -name "=*" -o -name '*~' -o -name '#*#' -o -name Makefile \ - -o -name c-auto.h \) -print | xargs rm -rf - rm -f `cat .fname`/test/octave.test/*.m - chmod -R a+rw `cat .fname` - find `cat .fname` \( -perm 766 -o -perm 676 -o -perm 667 \ - -o -perm 776 -o -perm 677 -o -perm 767 \) -print | \ - xargs chmod a+x scripts - strip src/octave - tar cf `cat .fname`.tar `cat .fname` - rm -rf `cat .fname` - gzip --best `cat .fname`.tar - rm -f .fname -.PHONY: binary-dist - .NOTPARALLEL:
--- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,41 @@ +2005-03-09 John W. Eaton <jwe@octave.org> + + * statistics/Makefile.in (bin-dist): Delete target. + (BINDISTSUBDIRS): Delete variable. + * scripts/control/Makefile.in: Likewise. + + * scripts/audio/Makefile.in (bin-dist): Delete target. + (BINDISTFILES): Delete variable. + * scripts/control/base/Makefile.in: Likewise. + * scripts/control/hinf/Makefile.in: Likewise. + * scripts/control/obsolete/Makefile.in: Likewise. + * scripts/control/system/Makefile.in: Likewise. + * scripts/control/util/Makefile.in: Likewise. + * scripts/deprecated/Makefile.in: Likewise. + * scripts/elfun/Makefile.in: Likewise. + * scripts/finance/Makefile.in: Likewise. + * scripts/general/Makefile.in: Likewise. + * scripts/image/Makefile.in: Likewise. + * scripts/sparse/Makefile.in: Likewise. + * scripts/io/Makefile.in: Likewise. + * scripts/plot/Makefile.in: Likewise. + * scripts/Makefile.in: Likewise. + * scripts/miscellaneous/Makefile.in: Likewise. + * scripts/linear-algebra/Makefile.in: Likewise. + * scripts/polynomial/Makefile.in: Likewise. + * scripts/quaternion/Makefile.in: Likewise. + * scripts/set/Makefile.in: Likewise. + * scripts/signal/Makefile.in: Likewise. + * scripts/specfun/Makefile.in: Likewise. + * scripts/special-matrix/Makefile.in: Likewise. + * scripts/startup/Makefile.in: Likewise. + * scripts/statistics/base/Makefile.in: Likewise. + * scripts/statistics/distributions/Makefile.in: Likewise. + * scripts/statistics/models/Makefile.in: Likewise. + * scripts/statistics/tests/Makefile.in: Likewise. + * scripts/strings/Makefile.in: Likewise. + * scripts/time/Makefile.in: Likewise. + 2005-03-08 John W. Eaton <jwe@octave.org> * general/repmat.m: Correctly diagnose 3-argument non-scalar
--- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -36,8 +36,6 @@ DISTSUBDIRS = $(SUBDIRS) -BINDISTSUBDIRS = $(SUBDIRS) - FCN_FILES = # $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = # $(notdir $(FCN_FILES)) @@ -94,7 +92,3 @@ ln $(DISTFILES) ../`cat ../.fname`/scripts for dir in $(DISTSUBDIRS); do mkdir ../`cat ../.fname`/scripts/$$dir; $(MAKE) -C $$dir $@; done .PHONY: dist - -bin-dist: - for dir in $(BINDISTSUBDIRS); do mkdir ../`cat ../.fname`/scripts/$$dir; $(MAKE) -C $$dir $@; done -.PHONY: bin-dist
--- a/scripts/audio/Makefile.in +++ b/scripts/audio/Makefile.in @@ -27,8 +27,6 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) -BINDISTFILES = $(FCN_FILES) - all: .PHONY: all @@ -63,7 +61,3 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/audio .PHONY: dist - -bin-dist: - ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/audio -.PHONY: bin-dist
--- a/scripts/control/Makefile.in +++ b/scripts/control/Makefile.in @@ -24,8 +24,6 @@ DISTSUBDIRS = $(SUBDIRS) -BINDISTSUBDIRS = $(SUBDIRS) - DISTFILES = Makefile.in all: @@ -53,7 +51,3 @@ ln $(DISTFILES) ../../`cat ../../.fname`/scripts/control for dir in $(DISTSUBDIRS); do mkdir ../../`cat ../../.fname`/scripts/control/$$dir; $(MAKE) -C $$dir $@; done .PHONY: dist - -bin-dist: - for dir in $(BINDISTSUBDIRS); do mkdir ../../`cat ../../.fname`/scripts/control/$$dir; $(MAKE) -C $$dir $@; done -.PHONY: bin-dist
--- a/scripts/control/base/Makefile.in +++ b/scripts/control/base/Makefile.in @@ -27,8 +27,6 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) -BINDISTFILES = $(FCN_FILES) - all: .PHONY: all @@ -63,7 +61,3 @@ dist: ln $(DISTFILES) ../../../`cat ../../../.fname`/scripts/$(script_sub_dir) .PHONY: dist - -bin-dist: - ln $(BINDISTFILES) ../../../`cat ../../../.fname`/scripts/$(script_sub_dir) -.PHONY: bin-dist
--- a/scripts/control/hinf/Makefile.in +++ b/scripts/control/hinf/Makefile.in @@ -27,8 +27,6 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) -BINDISTFILES = $(FCN_FILES) - all: .PHONY: all @@ -63,7 +61,3 @@ dist: ln $(DISTFILES) ../../../`cat ../../../.fname`/scripts/$(script_sub_dir) .PHONY: dist - -bin-dist: - ln $(BINDISTFILES) ../../../`cat ../../../.fname`/scripts/$(script_sub_dir) -.PHONY: bin-dist
--- a/scripts/control/obsolete/Makefile.in +++ b/scripts/control/obsolete/Makefile.in @@ -27,8 +27,6 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) -BINDISTFILES = $(FCN_FILES) - all: .PHONY: all @@ -63,7 +61,3 @@ dist: ln $(DISTFILES) ../../../`cat ../../../.fname`/scripts/$(script_sub_dir) .PHONY: dist - -bin-dist: - ln $(BINDISTFILES) ../../../`cat ../../../.fname`/scripts/$(script_sub_dir) -.PHONY: bin-dist
--- a/scripts/control/system/Makefile.in +++ b/scripts/control/system/Makefile.in @@ -27,8 +27,6 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) -BINDISTFILES = $(FCN_FILES) - all: .PHONY: all @@ -63,7 +61,3 @@ dist: ln $(DISTFILES) ../../../`cat ../../../.fname`/scripts/$(script_sub_dir) .PHONY: dist - -bin-dist: - ln $(BINDISTFILES) ../../../`cat ../../../.fname`/scripts/$(script_sub_dir) -.PHONY: bin-dist
--- a/scripts/control/util/Makefile.in +++ b/scripts/control/util/Makefile.in @@ -27,8 +27,6 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) -BINDISTFILES = $(FCN_FILES) - all: .PHONY: all @@ -63,7 +61,3 @@ dist: ln $(DISTFILES) ../../../`cat ../../../.fname`/scripts/$(script_sub_dir) .PHONY: dist - -bin-dist: - ln $(BINDISTFILES) ../../../`cat ../../../.fname`/scripts/$(script_sub_dir) -.PHONY: bin-dist
--- a/scripts/deprecated/Makefile.in +++ b/scripts/deprecated/Makefile.in @@ -27,8 +27,6 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) -BINDISTFILES = $(FCN_FILES) - all: .PHONY: all @@ -63,7 +61,3 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/deprecated .PHONY: dist - -bin-dist: - ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/deprecated -.PHONY: bin-dist
--- a/scripts/elfun/Makefile.in +++ b/scripts/elfun/Makefile.in @@ -27,8 +27,6 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) -BINDISTFILES = $(FCN_FILES) - all: .PHONY: all @@ -63,7 +61,3 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/elfun .PHONY: dist - -bin-dist: - ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/elfun -.PHONY: bin-dist
--- a/scripts/finance/Makefile.in +++ b/scripts/finance/Makefile.in @@ -27,8 +27,6 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) -BINDISTFILES = $(FCN_FILES) - all: .PHONY: all @@ -63,7 +61,3 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/finance .PHONY: dist - -bin-dist: - ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/finance -.PHONY: bin-dist
--- a/scripts/general/Makefile.in +++ b/scripts/general/Makefile.in @@ -27,8 +27,6 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) -BINDISTFILES = $(FCN_FILES) - all: .PHONY: all @@ -63,7 +61,3 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/general .PHONY: dist - -bin-dist: - ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/general -.PHONY: bin-dist
--- a/scripts/image/Makefile.in +++ b/scripts/image/Makefile.in @@ -31,8 +31,6 @@ IMAGE_FILES = $(wildcard $(srcdir)/*.img) IMAGE_FILES_NO_DIR = $(notdir $(IMAGE_FILES)) -BINDISTFILES = $(FCN_FILES) $(IMAGE_FILES) - all: .PHONY: all @@ -76,7 +74,3 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/image .PHONY: dist - -bin-dist: - ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/image -.PHONY: bin-dist
--- a/scripts/io/Makefile.in +++ b/scripts/io/Makefile.in @@ -27,8 +27,6 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) -BINDISTFILES = $(FCN_FILES) - all: .PHONY: all @@ -63,7 +61,3 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/io .PHONY: dist - -bin-dist: - ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/io -.PHONY: bin-dist
--- a/scripts/linear-algebra/Makefile.in +++ b/scripts/linear-algebra/Makefile.in @@ -27,8 +27,6 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) -BINDISTFILES = $(FCN_FILES) - all: .PHONY: all @@ -63,7 +61,3 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/linear-algebra .PHONY: dist - -bin-dist: - ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/linear-algebra -.PHONY: bin-dist
--- a/scripts/miscellaneous/Makefile.in +++ b/scripts/miscellaneous/Makefile.in @@ -27,8 +27,6 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) -BINDISTFILES = $(FCN_FILES) - all: .PHONY: all @@ -63,7 +61,3 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/miscellaneous .PHONY: dist - -bin-dist: - ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/miscellaneous -.PHONY: bin-dist
--- a/scripts/plot/Makefile.in +++ b/scripts/plot/Makefile.in @@ -27,8 +27,6 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) -BINDISTFILES = $(FCN_FILES) - all: .PHONY: all @@ -63,7 +61,3 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/plot .PHONY: dist - -bin-dist: - ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/plot -.PHONY: bin-dist
--- a/scripts/polynomial/Makefile.in +++ b/scripts/polynomial/Makefile.in @@ -27,8 +27,6 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) -BINDISTFILES = $(FCN_FILES) - all: .PHONY: all @@ -63,7 +61,3 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/polynomial .PHONY: dist - -bin-dist: - ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/polynomial -.PHONY: bin-dist
--- a/scripts/quaternion/Makefile.in +++ b/scripts/quaternion/Makefile.in @@ -27,8 +27,6 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) -BINDISTFILES = $(FCN_FILES) - all: .PHONY: all @@ -63,7 +61,3 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/quaternion .PHONY: dist - -bin-dist: - ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/quaternion -.PHONY: bin-dist
--- a/scripts/set/Makefile.in +++ b/scripts/set/Makefile.in @@ -27,8 +27,6 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) -BINDISTFILES = $(FCN_FILES) - all: .PHONY: all @@ -63,7 +61,3 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/set .PHONY: dist - -bin-dist: - ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/set -.PHONY: bin-dist
--- a/scripts/signal/Makefile.in +++ b/scripts/signal/Makefile.in @@ -27,8 +27,6 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) -BINDISTFILES = $(FCN_FILES) - all: .PHONY: all @@ -63,7 +61,3 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/signal .PHONY: dist - -bin-dist: - ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/signal -.PHONY: bin-dist
--- a/scripts/sparse/Makefile.in +++ b/scripts/sparse/Makefile.in @@ -27,8 +27,6 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) -BINDISTFILES = $(FCN_FILES) - all: .PHONY: all @@ -63,7 +61,3 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/sparse .PHONY: dist - -bin-dist: - ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/sparse -.PHONY: bin-dist
--- a/scripts/specfun/Makefile.in +++ b/scripts/specfun/Makefile.in @@ -27,8 +27,6 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) -BINDISTFILES = $(FCN_FILES) - all: .PHONY: all @@ -63,7 +61,3 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/specfun .PHONY: dist - -bin-dist: - ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/specfun -.PHONY: bin-dist
--- a/scripts/special-matrix/Makefile.in +++ b/scripts/special-matrix/Makefile.in @@ -27,8 +27,6 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) -BINDISTFILES = $(FCN_FILES) - all: .PHONY: all @@ -63,7 +61,3 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/special-matrix .PHONY: dist - -bin-dist: - ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/special-matrix -.PHONY: bin-dist
--- a/scripts/startup/Makefile.in +++ b/scripts/startup/Makefile.in @@ -27,8 +27,6 @@ FCN_FILES = # $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = # $(notdir $(FCN_FILES)) -BINDISTFILES = $(srcdir)/octaverc - all: .PHONY: all @@ -81,7 +79,3 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/startup .PHONY: dist - -bin-dist: - ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/startup -.PHONY: bin-dist
--- a/scripts/statistics/Makefile.in +++ b/scripts/statistics/Makefile.in @@ -26,8 +26,6 @@ DISTSUBDIRS = $(SUBDIRS) -BINDISTSUBDIRS = $(SUBDIRS) - all: $(SUBDIRS) .PHONY: all @@ -53,7 +51,3 @@ ln $(DISTFILES) ../../`cat ../../.fname`/scripts/statistics for dir in $(DISTSUBDIRS); do mkdir ../../`cat ../../.fname`/scripts/statistics/$$dir; $(MAKE) -C $$dir $@; done .PHONY: dist - -bin-dist: - for dir in $(BINDISTSUBDIRS); do mkdir ../../`cat ../../.fname`/scripts/statistics/$$dir; $(MAKE) -C $$dir $@; done -.PHONY: bin-dist
--- a/scripts/statistics/base/Makefile.in +++ b/scripts/statistics/base/Makefile.in @@ -27,8 +27,6 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) -BINDISTFILES = $(FCN_FILES) - all: .PHONY: all @@ -63,7 +61,3 @@ dist: ln $(DISTFILES) ../../../`cat ../../../.fname`/scripts/$(script_sub_dir) .PHONY: dist - -bin-dist: - ln $(BINDISTFILES) ../../../`cat ../../../.fname`/scripts/$(script_sub_dir) -.PHONY: bin-dist
--- a/scripts/statistics/distributions/Makefile.in +++ b/scripts/statistics/distributions/Makefile.in @@ -27,8 +27,6 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) -BINDISTFILES = $(FCN_FILES) - all: .PHONY: all @@ -63,7 +61,3 @@ dist: ln $(DISTFILES) ../../../`cat ../../../.fname`/scripts/$(script_sub_dir) .PHONY: dist - -bin-dist: - ln $(BINDISTFILES) ../../../`cat ../../../.fname`/scripts/$(script_sub_dir) -.PHONY: bin-dist
--- a/scripts/statistics/models/Makefile.in +++ b/scripts/statistics/models/Makefile.in @@ -27,8 +27,6 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) -BINDISTFILES = $(FCN_FILES) - all: .PHONY: all @@ -63,7 +61,3 @@ dist: ln $(DISTFILES) ../../../`cat ../../../.fname`/scripts/$(script_sub_dir) .PHONY: dist - -bin-dist: - ln $(BINDISTFILES) ../../../`cat ../../../.fname`/scripts/$(script_sub_dir) -.PHONY: bin-dist
--- a/scripts/statistics/tests/Makefile.in +++ b/scripts/statistics/tests/Makefile.in @@ -27,8 +27,6 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) -BINDISTFILES = $(FCN_FILES) - all: .PHONY: all @@ -63,7 +61,3 @@ dist: ln $(DISTFILES) ../../../`cat ../../../.fname`/scripts/$(script_sub_dir) .PHONY: dist - -bin-dist: - ln $(BINDISTFILES) ../../../`cat ../../../.fname`/scripts/$(script_sub_dir) -.PHONY: bin-dist
--- a/scripts/strings/Makefile.in +++ b/scripts/strings/Makefile.in @@ -27,8 +27,6 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) -BINDISTFILES = $(FCN_FILES) - all: .PHONY: all @@ -63,7 +61,3 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/strings .PHONY: dist - -bin-dist: - ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/strings -.PHONY: bin-dist
--- a/scripts/time/Makefile.in +++ b/scripts/time/Makefile.in @@ -27,8 +27,6 @@ FCN_FILES = $(wildcard $(srcdir)/*.m) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES)) -BINDISTFILES = $(FCN_FILES) - all: .PHONY: all @@ -63,7 +61,3 @@ dist: ln $(DISTFILES) ../../`cat ../../.fname`/scripts/time .PHONY: dist - -bin-dist: - ln $(BINDISTFILES) ../../`cat ../../.fname`/scripts/time -.PHONY: bin-dist
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2005-03-09 John W. Eaton <jwe@octave.org> + + * Makefile.in (bin-dist): Delete target. + (BINDISTFILES, BINDISTLIBS): Delete variables. + 2005-03-04 John W. Eaton <jwe@octave.org> * octave.cc (octave_main): Concatenate all --eval arguments.
--- a/src/Makefile.in +++ b/src/Makefile.in @@ -251,13 +251,6 @@ octave.cc parse.cc lex.cc y.tab.h \ $(INCLUDES) $(DIST_SRC) $(OPT_HANDLERS) $(EXTRAS) -ifeq ($(SHARED_LIBS), true) - BINDISTLIBS = src/liboctinterp - BINDISTFILES = octave $(OCT_FILES) liboctinterp.$(SHLEXT_VER) -else - BINDISTFILES = octave $(OCT_FILES) -endif - all: octave$(EXEEXT) stamp-oct-links PKG_ADD DOCSTRINGS .PHONY: all @@ -513,20 +506,6 @@ ln octave.cc Makefile.in ../`cat ../.fname`/src .PHONY: conf-dist -bin-dist: - if [ -n "$(BINDISTFILES)" ]; then \ - ln $(BINDISTFILES) ../`cat ../.fname`/src; \ - fi - if [ -n "$(OCT_FILES)" ]; then \ - $(srcdir)/mk-oct-links -p $(octfiledir) \ - $(addprefix $(srcdir)/, $(DLD_SRC)) \ - > ../`cat ../.fname`/src/links-to-make; \ - fi - if [ -n "$(BINDISTLIBS)" ]; then \ - echo $(BINDISTLIBS) >> ../`cat ../.fname`/LIBRARIES; \ - fi -.PHONY: bin-dist - # Special rules -- these files need special things to be defined. $(OPT_HANDLERS) : %.cc : $(top_srcdir)/liboctave/%.in $(top_srcdir)/mk-opts.pl