Mercurial > hg > octave-lyh
changeset 6796:59c0c3637633
[project @ 2007-07-25 15:45:04 by jwe]
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-07-25 David Bateman <dbateman@free.fr> + + * octMakefile.in, dlfcn/Makefile.in, emacs/Makefile.in, + examples/Makefile.in, test/Makefile.in: Adjust DISTFILES to allow + out of tree "make dist" to work. + 2007-07-24 Michael Goffioul <michael.goffioul@swing.be> * configure.in (*-*-msdosmsvc): Only add -g to DL_LDFLAGS and
--- a/dlfcn/Makefile.in +++ b/dlfcn/Makefile.in @@ -26,7 +26,7 @@ MAKEDEPS := $(SOURCES:.c=.d) -DISTFILES := $(SOURCES) $(INCLUDES) README dl.exp Makefile.in ftp-site +DISTFILES := $(addprefix $srcdir)/,$(SOURCES) $(INCLUDES) README dl.exp Makefile.in ftp-site) all: libdlfcn.a .PHONY: all @@ -71,7 +71,7 @@ .PHONY: dist conf-dist: - ln octave.cc Makefile.in ../`cat ../.fname`/dlfcn + ln $(addprefix $(srcdir)/,octave.cc Makefile.in) ../`cat ../.fname`/dlfcn .PHONY: conf-dist ifndef omit_deps
--- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,9 @@ +2007-07-25 David Bateman <dbateman@free.fr> + + * Makefile.in, faq/Makefile.in, interpreter/Makwfile.in, + liboctave/Makefile.in, refcard/Makefile.in: Adjust DISTFILES + to allow out of tree "make dist" to work. + 2007-07-23 David Bateman <dbateman@free.fr> * interpreter/Makefile.in (SUB_SOURCE): remove bit.txi.
--- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -21,7 +21,7 @@ SOURCES = -DISTFILES = Makefile.in ChangeLog conf.texi.in conf.texi texinfo.tex +DISTFILES = $(addprefix $(srcdir)/,Makefile.in ChangeLog conf.texi.in texinfo.tex) conf.texi SUBDIRS = faq interpreter liboctave refcard
--- a/doc/faq/Makefile.in +++ b/doc/faq/Makefile.in @@ -24,7 +24,7 @@ FORMATTED := Octave-FAQ.info Octave-FAQ.dvi Octave-FAQ.ps Octave-FAQ.pdf -DISTFILES := Makefile.in $(TEXINFO) $(FORMATTED) +DISTFILES := $(addprefix $srcdir)/,Makefile.in $(TEXINFO) $(FORMATTED)) DISTDIRS := HTML
--- a/doc/interpreter/Makefile.in +++ b/doc/interpreter/Makefile.in @@ -97,8 +97,8 @@ MAN_SRC := $(addsuffix .1, $(MAN_BASE)) # FIXME -- need to include generated figures here... -DISTFILES = Makefile.in contributors.in mkcontrib.awk dir \ - munge-texi.cc $(MAN_SRC) $(SOURCES) $(TEXINFO_SOURCE) $(FORMATTED) $(IMAGES) +DISTFILES = $(addprefix $(srcdir)/,Makefile.in contributors.in mkcontrib.awk dir \ + munge-texi.cc $(MAN_SRC) $(SOURCES) $(TEXINFO_SOURCE)) $(FORMATTED) $(IMAGES) DISTDIRS = HTML
--- a/doc/liboctave/Makefile.in +++ b/doc/liboctave/Makefile.in @@ -34,7 +34,8 @@ FORMATTED = liboctave.dvi liboctave.ps liboctave.pdf liboctave.info -DISTFILES = Makefile.in gpl.texi $(TEXINFO_SOURCE) $(FORMATTED) +DISTFILES = $(addprefix $(srcdir)/,Makefile.in gpl.texi $(TEXINFO_SOURCE)) \ + $(FORMATTED) DISTDIRS = HTML
--- a/doc/refcard/Makefile.in +++ b/doc/refcard/Makefile.in @@ -24,7 +24,7 @@ refcard-legal.dvi refcard-legal.ps refcard-legal.pdf \ refcard-letter.dvi refcard-letter.ps refcard-letter.pdf -DISTFILES := Makefile.in $(TEX) $(FORMATTED) +DISTFILES := $(addprefix $(srcdir)/,Makefile.in $(TEX)) $(FORMATTED) all: $(FORMATTED)
--- a/emacs/Makefile.in +++ b/emacs/Makefile.in @@ -23,7 +23,7 @@ SOURCES = $(EL_FILES) octave-tags -DISTFILES = Makefile.in $(EL_FILES) octave-tags octave-tags.1 NEWS TODO README +DISTFILES = $(addprefix $(srcdir)/,Makefile.in $(EL_FILES) octave-tags octave-tags.1 NEWS TODO README) all: .PHONY: all
--- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -57,7 +57,8 @@ IMAGE_FILES = $(srcdir)/octave-sombrero.png IMAGE_FILES_NO_DIR = $(notdir $(IMAGE_FILES)) -DISTFILES = Makefile.in $(SOURCES) $(SCRIPTS) $(IMAGE_FILES) +DISTFILES = $(addprefix $(srcdir)/,Makefile.in $(SOURCES) $(SCRIPTS)) \ + $(IMAGE_FILES) SUBDIRS =
--- a/libcruft/ChangeLog +++ b/libcruft/ChangeLog @@ -1,3 +1,9 @@ +2007-07-25 David Bateman <dbateman@free.fr> + + * Makefile.in, Makerules.in, fftpack/Makefile.in, + randlib/Makefile.in: Adjust DISTFILES to allow out of tree "make dist" + to work. + 2007-04-23 John W. Eaton <jwe@octave.org> * ranlib/phrtsd.f (phrtsd): Store result of call to index
--- 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 $(addprefix $(srcdir)/,$(DISTFILES)) ../`cat ../.fname`/libcruft .PHONY: dist .NOTPARALLEL:
--- a/libcruft/Makerules.in +++ b/libcruft/Makerules.in @@ -37,7 +37,7 @@ CRUFT_DEFS = $(CRUFT_FDEFS) $(CRUFT_CDEFS) $(CRUFT_CXXDEFS) -DISTFILES = Makefile.in $(CRUFT_SRC) $(SPECIAL) +DISTFILES = $(CRUFT_SRC) $(addprefix $(srcdir)/,Makefile.in $(SPECIAL)) ifeq ($(SHARED_LIBS), true) ifdef FPICFLAG
--- a/libcruft/fftpack/Makefile.in +++ b/libcruft/fftpack/Makefile.in @@ -12,7 +12,7 @@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -EXTERNAL_DISTFILES = $(DISTFILES) fftpack.doc +EXTERNAL_DISTFILES = $(DISTFILES) $(srcdir)/fftpack.doc FSRC = cfftb.f cfftb1.f cfftf.f cfftf1.f cffti.f cffti1.f passb.f \ passb2.f passb3.f passb4.f passb5.f passf.f passf2.f passf3.f \
--- a/libcruft/ranlib/Makefile.in +++ b/libcruft/ranlib/Makefile.in @@ -15,7 +15,7 @@ SPECIAL = HOWTOGET README randlib.chs randlib.fdoc \ tstbot.for tstgmn.for tstmid.for -EXTERNAL_DISTFILES = $(DISTFILES) Basegen.doc +EXTERNAL_DISTFILES = $(DISTFILES) $(srcdir)/Basegen.doc FSRC = advnst.f genbet.f genchi.f genexp.f genf.f gengam.f \ genmn.f genmul.f gennch.f gennf.f gennor.f genprm.f genunf.f \
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,8 @@ +2007-07-25 David Bateman <dbateman@free.fr> + + * Makefile.in: Adjust DISTFILES to allow out of tree "make dist" + to work. + 2007-06-04 David Bateman <dbateman@free.fr> * oct-inttypes.h (octave_int<T>& operator <<= (const T2&),
--- a/liboctave/Makefile.in +++ b/liboctave/Makefile.in @@ -30,7 +30,7 @@ MATRIX_INC := Array.h Array2.h Array3.h ArrayN.h DiagArray2.h \ Array-util.h ArrayN-idx.h MArray-defs.h \ MArray.h MArray2.h MDiagArray2.h Matrix.h MArrayN.h \ - base-lu.h dim-vector.h mx-base.h mx-op-defs.h mx-ops.h \ + base-lu.h dim-vector.h mx-base.h mx-op-defs.h \ mx-defs.h mx-ext.h CColVector.h CDiagMatrix.h CMatrix.h \ CNDArray.h CRowVector.h CmplxAEPBAL.h CmplxCHOL.h \ CmplxDET.h CmplxHESS.h CmplxLU.h CmplxQR.h CmplxQRP.h \ @@ -71,13 +71,15 @@ oct-env.h oct-fftw.h oct-getopt.h oct-group.h oct-inttypes.h \ oct-md5.h oct-passwd.h oct-rand.h oct-rl-edit.h oct-rl-hist.h \ oct-shlib.h oct-sort.h oct-spparms.h oct-syscalls.h \ - oct-sparse.h oct-time.h oct-types.h oct-uname.h \ + oct-sparse.h oct-time.h oct-uname.h \ pathlen.h pathsearch.h prog-args.h \ randgamma.h randmtzig.h randpoisson.h \ so-array.h sparse-sort.h statdefs.h str-vec.h \ sparse-util.h sun-utils.h sysdir.h systime.h syswait.h \ + $(MATRIX_INC) + +BUILT_INCLUDES := oct-types.h mx-ops.h \ $(OPTS_INC) \ - $(MATRIX_INC) \ $(MX_OP_INC) \ $(VX_OP_INC) \ $(SPARSE_MX_OP_INC) @@ -126,7 +128,9 @@ prog-args.cc so-array.cc sparse-sort.cc sparse-util.cc str-vec.cc \ $(TEMPLATE_SRC) \ $(TI_SRC) \ - $(MATRIX_SRC) \ + $(MATRIX_SRC) + +BUILT_LIBOCTAVE_CXX_SOURCES := \ $(MX_OP_SRC) \ $(VX_OP_SRC) \ $(SPARSE_MX_OP_SRC) @@ -137,7 +141,8 @@ rmdir.c strftime.c strptime.c strcasecmp.c strncase.c \ tempname.c tempnam.c -LIBOCTAVE_SOURCES := $(LIBOCTAVE_CXX_SOURCES) $(LIBOCTAVE_C_SOURCES) +LIBOCTAVE_SOURCES := $(LIBOCTAVE_CXX_SOURCES) $(BUILT_LIBOCTAVE_CXX_SOURCES) \ + $(LIBOCTAVE_C_SOURCES) LIBOCT_READLINE_CXX_SOURCES := cmd-edit.cc cmd-hist.cc @@ -159,17 +164,23 @@ EXTRAS := mx-inlines.cc kpse.cc intNDArray.cc -INCLUDES_FOR_INSTALL := $(INCLUDES) $(TEMPLATE_SRC) $(EXTRAS) +INCLUDES_FOR_INSTALL := $(INCLUDES) $(BUILT_INCLUDES) $(TEMPLATE_SRC) $(EXTRAS) -DISTFILES := Makefile.in ChangeLog mk-ops.awk mx-ops vx-ops \ - sparse-mk-ops.awk sparse-mx-ops oct-types.h.in \ - $(SOURCES) $(INCLUDES) $(EXTRAS) $(OPTS_INC_DATA) +DISTFILES := $(addprefix $(srcdir)/, Makefile.in ChangeLog mk-ops.awk \ + mx-ops vx-ops sparse-mk-ops.awk sparse-mx-ops oct-types.h.in \ + $(LIBOCTAVE_CXX_SOURCES) \ + $(LIBOCT_READLINE_SOURCES) \ + $(LIBOCT_PATHSEARCH_SOURCES) \ + $(LIBOCTAVE_C_SOURCES) \ + $(INCLUDES) $(EXTRAS) $(OPTS_INC_DATA)) \ + $(BUILT_LIBOCTAVE_CXX_SOURCES) $(BUILT_INCLUDES) MAKEDEPS_1 := $(patsubst %.cc, %.d, $(SOURCES)) MAKEDEPS := $(patsubst %.c, %.d, $(MAKEDEPS_1)) LIBOCTAVE_OBJECTS := \ $(LIBOCTAVE_CXX_SOURCES:.cc=.o) \ + $(BUILT_LIBOCTAVE_CXX_SOURCES:.cc=.o) \ $(LIBOCTAVE_C_SOURCES:.c=.o) \ $(LIBOCT_READLINE_CXX_SOURCES:.cc=.o) \ $(LIBOCT_READLINE_C_SOURCES:.c=.o) \
--- a/octMakefile.in +++ b/octMakefile.in @@ -20,12 +20,16 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_DATA = @INSTALL_DATA@ -CONF_DISTFILES = Makefile Makefile.in octMakefile.in Makeconf.in \ +BUILT_CONF_DISTFILES = Makefile + +CONF_DISTFILES = Makefile.in octMakefile.in Makeconf.in \ configure configure.in config.guess config.sub aclocal.m4 \ acx_blas.m4 acx_lapack.m4 config.h.in install-sh autogen.sh +BUILT_DISTFILES = $(BUILT_CONF_DISTFILES) BUGS INSTALL.OCTAVE + DISTFILES = $(CONF_DISTFILES) \ - BUGS COPYING FLEX.patch INSTALL INSTALL.OCTAVE NEWS \ + BUGS COPYING FLEX.patch INSTALL NEWS \ NEWS.[0-9] PROJECTS README README.Linux README.Windows \ README.Cygwin README.MSVC \ README.MachTen README.kpathsea ROADMAP SENDING-PATCHES \ @@ -170,7 +174,8 @@ echo octave-$(version) > .fname rm -rf `cat .fname` mkdir `cat .fname` - ln $(DISTFILES) `cat .fname` + ln $(addprefix, $(srcdir)/,$(DISTFILES)) `cat .fname` + ln $(BUILT_DISTFILES) `cat .fname` for dir in $(DISTSUBDIRS); do \ mkdir `cat .fname`/$$dir; \ $(MAKE) -C $$dir dist; \ @@ -223,6 +228,7 @@ rm -rf `cat .fname` mkdir `cat .fname` ln $(CONF_DISTFILES) `cat .fname` + ln $(BUILT_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-07-25 David Bateman <dbateman@free.fr> + + * 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, optimizaton/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: + Adjust DISTFILES to allow out of tree "make dist" to work. + 2007-07-25 John W. Eaton <jwe@octave.org> * plot/__plt2__.m: Return [](0x1) if both X and Y are empty.
--- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -25,9 +25,9 @@ ALL_M_FILES1 := $(shell find $(srcdir) -name '*.m' -print) ALL_M_FILES := $(patsubst $(srcdir)/%, %, $(ALL_M_FILES1)) -DISTFILES = Makefile.in ChangeLog $(SOURCES) configure.in \ - configure mkinstalldirs mkdoc mkpkgadd gethelp.cc \ - skip-autoheader DOCSTRINGS move-if-change +DISTFILES = $(addprefix $(srcdir)/,Makefile.in ChangeLog $(SOURCES) \ + configure.in configure mkinstalldirs mkdoc mkpkgadd gethelp.cc \ + skip-autoheader move-if-change) DOCSTRINGS SUBDIRS = audio control deprecated elfun finance general image io \ linear-algebra miscellaneous optimization path pkg plot polynomial \
--- a/scripts/audio/Makefile.in +++ b/scripts/audio/Makefile.in @@ -23,7 +23,7 @@ SOURCES = lin2mu.m loadaudio.m mu2lin.m playaudio.m record.m \ saveaudio.m setaudio.m wavread.m wavwrite.m -DISTFILES = Makefile.in $(SOURCES) +DISTFILES = $(addprefix $(srcdir)/,Makefile.in $(SOURCES)) FCN_FILES = $(addprefix $(srcdir)/, $(SOURCES)) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES))
--- a/scripts/control/Makefile.in +++ b/scripts/control/Makefile.in @@ -24,7 +24,7 @@ DISTSUBDIRS = $(SUBDIRS) -DISTFILES = Makefile.in +DISTFILES = $(srcdir)/Makefile.in all: .PHONY: all
--- a/scripts/control/base/Makefile.in +++ b/scripts/control/base/Makefile.in @@ -28,7 +28,7 @@ nyquist.m obsv.m place.m pzmap.m rldemo.m rlocus.m step.m \ tzero.m tzero2.m -DISTFILES = Makefile.in $(SOURCES) +DISTFILES = $(addprefix $(srcdir)/,Makefile.in $(SOURCES)) FCN_FILES = $(addprefix $(srcdir)/, $(SOURCES)) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES))
--- a/scripts/control/hinf/Makefile.in +++ b/scripts/control/hinf/Makefile.in @@ -24,7 +24,7 @@ hinfdemo.m hinfnorm.m hinfsyn.m hinfsyn_chk.m hinfsyn_ric.m \ is_dgkf.m wgt1o.m -DISTFILES = Makefile.in $(SOURCES) +DISTFILES = $(addprefix $(srcdir)/,Makefile.in $(SOURCES)) FCN_FILES = $(addprefix $(srcdir)/, $(SOURCES)) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES))
--- a/scripts/control/obsolete/Makefile.in +++ b/scripts/control/obsolete/Makefile.in @@ -23,7 +23,7 @@ SOURCES = dezero.m dlqg.m minfo.m packsys.m qzval.m rotg.m \ series.m swapcols.m swaprows.m syschnames.m unpacksys.m -DISTFILES = Makefile.in $(SOURCES) +DISTFILES = $(addprefix $(srcdir)/,Makefile.in $(SOURCES)) FCN_FILES = $(addprefix $(srcdir)/, $(SOURCES)) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES))
--- a/scripts/control/system/Makefile.in +++ b/scripts/control/system/Makefile.in @@ -36,7 +36,7 @@ sysupdate.m tf.m tf2ss.m tf2sys.m tf2zp.m tfout.m ugain.m zp.m \ zp2ss.m zp2sys.m zp2tf.m zpout.m -DISTFILES = Makefile.in $(SOURCES) +DISTFILES = $(addprefix $(srcdir)/,Makefile.in $(SOURCES)) FCN_FILES = $(addprefix $(srcdir)/, $(SOURCES)) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES))
--- a/scripts/control/util/Makefile.in +++ b/scripts/control/util/Makefile.in @@ -24,7 +24,7 @@ run_cmd.m sortcom.m strappend.m swap.m zgfmul.m zgfslv.m \ zginit.m zgreduce.m zgrownorm.m zgscal.m zgsgiv.m zgshsr.m -DISTFILES = Makefile.in $(SOURCES) +DISTFILES = $(addprefix $(srcdir)/,Makefile.in $(SOURCES)) FCN_FILES = $(addprefix $(srcdir)/, $(SOURCES)) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES))
--- a/scripts/deprecated/Makefile.in +++ b/scripts/deprecated/Makefile.in @@ -40,7 +40,7 @@ weibcdf.m weibinv.m weibpdf.m weibrnd.m weibull_cdf.m \ weibull_inv.m weibull_pdf.m weibull_rnd.m wiener_rnd.m -DISTFILES = Makefile.in $(SOURCES) +DISTFILES = $(addprefix $(srcdir)/,Makefile.in $(SOURCES)) FCN_FILES = $(addprefix $(srcdir)/, $(SOURCES)) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES))
--- a/scripts/elfun/Makefile.in +++ b/scripts/elfun/Makefile.in @@ -25,7 +25,7 @@ cot.m cotd.m coth.m csc.m cscd.m csch.m lcm.m sec.m secd.m \ sech.m sind.m tand.m -DISTFILES = Makefile.in $(SOURCES) +DISTFILES = $(addprefix $(srcdir)/,Makefile.in $(SOURCES)) FCN_FILES = $(addprefix $(srcdir)/, $(SOURCES)) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES))
--- a/scripts/finance/Makefile.in +++ b/scripts/finance/Makefile.in @@ -22,7 +22,7 @@ SOURCES = fv.m fvl.m irr.m nper.m npv.m pmt.m pv.m pvl.m rate.m vol.m -DISTFILES = Makefile.in $(SOURCES) +DISTFILES = $(addprefix $(srcdir)/,Makefile.in $(SOURCES)) FCN_FILES = $(addprefix $(srcdir)/, $(SOURCES)) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES))
--- a/scripts/io/Makefile.in +++ b/scripts/io/Makefile.in @@ -22,7 +22,7 @@ SOURCES = beep.m -DISTFILES = Makefile.in $(SOURCES) +DISTFILES = $(addprefix $(srcdir)/,Makefile.in $(SOURCES)) FCN_FILES = $(addprefix $(srcdir)/, $(SOURCES)) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES))
--- a/scripts/linear-algebra/Makefile.in +++ b/scripts/linear-algebra/Makefile.in @@ -24,7 +24,7 @@ duplication_matrix.m housh.m krylov.m krylovb.m logm.m norm.m \ null.m orth.m qzhess.m rank.m rref.m trace.m vec.m vech.m -DISTFILES = Makefile.in $(SOURCES) +DISTFILES = $(addprefix $(srcdir)/,Makefile.in $(SOURCES)) FCN_FILES = $(addprefix $(srcdir)/, $(SOURCES)) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES))
--- a/scripts/miscellaneous/Makefile.in +++ b/scripts/miscellaneous/Makefile.in @@ -31,7 +31,7 @@ tempdir.m tempname.m texas_lotto.m unix.m unpack.m untar.m \ unzip.m ver.m version.m warning_ids.m xor.m zip.m -DISTFILES = Makefile.in $(SOURCES) +DISTFILES = $(addprefix $(srcdir)/,Makefile.in $(SOURCES)) FCN_FILES = $(addprefix $(srcdir)/, $(SOURCES)) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES))
--- a/scripts/optimization/Makefile.in +++ b/scripts/optimization/Makefile.in @@ -24,7 +24,7 @@ EXTRAS = glpktest1 glpktest2 -DISTFILES = Makefile.in $(SOURCES) $(EXTRAS) +DISTFILES = $(addprefix $(srcdir)/,Makefile.in $(SOURCES)) FCN_FILES = $(addprefix $(srcdir)/, $(SOURCES)) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES))
--- a/scripts/path/Makefile.in +++ b/scripts/path/Makefile.in @@ -22,7 +22,7 @@ SOURCES = savepath.m -DISTFILES = Makefile.in $(SOURCES) +DISTFILES = $(addprefix $(srcdir)/,Makefile.in $(SOURCES)) FCN_FILES = $(addprefix $(srcdir)/, $(SOURCES)) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES))
--- a/scripts/pkg/Makefile.in +++ b/scripts/pkg/Makefile.in @@ -22,7 +22,7 @@ SOURCES = pkg.m -DISTFILES = Makefile.in $(SOURCES) +DISTFILES = $(addprefix $(srcdir)/,Makefile.in $(SOURCES)) FCN_FILES = $(addprefix $(srcdir)/, $(SOURCES)) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES))
--- a/scripts/polynomial/Makefile.in +++ b/scripts/polynomial/Makefile.in @@ -25,7 +25,7 @@ polyout.m polyreduce.m polyval.m polyvalm.m ppval.m residue.m \ roots.m spline.m unmkpp.m -DISTFILES = Makefile.in $(SOURCES) +DISTFILES = $(addprefix $(srcdir)/,Makefile.in $(SOURCES)) FCN_FILES = $(addprefix $(srcdir)/, $(SOURCES)) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES))
--- a/scripts/quaternion/Makefile.in +++ b/scripts/quaternion/Makefile.in @@ -24,7 +24,7 @@ qderivmat.m qinv.m qmult.m qtrans.m qtransv.m qtransvmat.m \ quaternion.m -DISTFILES = Makefile.in $(SOURCES) +DISTFILES = $(addprefix $(srcdir)/,Makefile.in $(SOURCES)) FCN_FILES = $(addprefix $(srcdir)/, $(SOURCES)) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES))
--- a/scripts/set/Makefile.in +++ b/scripts/set/Makefile.in @@ -23,7 +23,7 @@ SOURCES = complement.m create_set.m intersect.m ismember.m \ setdiff.m setxor.m union.m unique.m -DISTFILES = Makefile.in $(SOURCES) +DISTFILES = $(addprefix $(srcdir)/,Makefile.in $(SOURCES)) FCN_FILES = $(addprefix $(srcdir)/, $(SOURCES)) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES))
--- a/scripts/signal/Makefile.in +++ b/scripts/signal/Makefile.in @@ -29,7 +29,7 @@ spencer.m stft.m synthesis.m triangle_lw.m triangle_sw.m \ unwrap.m yulewalker.m -DISTFILES = Makefile.in $(SOURCES) +DISTFILES = $(addprefix $(srcdir)/,Makefile.in $(SOURCES)) FCN_FILES = $(addprefix $(srcdir)/, $(SOURCES)) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES))
--- a/scripts/sparse/Makefile.in +++ b/scripts/sparse/Makefile.in @@ -25,7 +25,7 @@ sphcat.m spones.m sprand.m sprandn.m sprandsym.m spstats.m \ spvcat.m spy.m treeplot.m -DISTFILES = Makefile.in $(SOURCES) +DISTFILES = $(addprefix $(srcdir)/,Makefile.in $(SOURCES)) FCN_FILES = $(addprefix $(srcdir)/, $(SOURCES)) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES))
--- a/scripts/specfun/Makefile.in +++ b/scripts/specfun/Makefile.in @@ -24,7 +24,7 @@ factorial.m gammai.m isprime.m legendre.m log2.m nchoosek.m \ perms.m pow2.m primes.m -DISTFILES = Makefile.in $(SOURCES) +DISTFILES = $(addprefix $(srcdir)/,Makefile.in $(SOURCES)) FCN_FILES = $(addprefix $(srcdir)/, $(SOURCES)) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES))
--- a/scripts/special-matrix/Makefile.in +++ b/scripts/special-matrix/Makefile.in @@ -23,7 +23,7 @@ SOURCES = hadamard.m hankel.m hilb.m invhilb.m magic.m pascal.m \ rosser.m sylvester_matrix.m toeplitz.m vander.m wilkinson.m -DISTFILES = Makefile.in $(SOURCES) +DISTFILES = $(addprefix $(srcdir)/,Makefile.in $(SOURCES)) FCN_FILES = $(addprefix $(srcdir)/, $(SOURCES)) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES))
--- a/scripts/startup/Makefile.in +++ b/scripts/startup/Makefile.in @@ -22,7 +22,7 @@ SOURCES = main-rcfile local-rcfile inputrc -DISTFILES = Makefile.in $(SOURCES) +DISTFILES = $(addprefix $(srcdir)/,Makefile.in $(SOURCES)) FCN_FILES = FCN_FILES_NO_DIR =
--- a/scripts/statistics/Makefile.in +++ b/scripts/statistics/Makefile.in @@ -20,7 +20,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -DISTFILES = Makefile.in +DISTFILES = $(srcdir)/Makefile.in SUBDIRS = base distributions models tests
--- a/scripts/statistics/base/Makefile.in +++ b/scripts/statistics/base/Makefile.in @@ -26,7 +26,7 @@ ranks.m run_count.m skewness.m spearman.m statistics.m std.m \ studentize.m table.m values.m var.m -DISTFILES = Makefile.in $(SOURCES) +DISTFILES = $(addprefix $(srcdir)/,Makefile.in $(SOURCES)) FCN_FILES = $(addprefix $(srcdir)/, $(SOURCES)) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES))
--- a/scripts/statistics/distributions/Makefile.in +++ b/scripts/statistics/distributions/Makefile.in @@ -38,7 +38,7 @@ tpdf.m trnd.m unidrnd.m unifcdf.m unifinv.m unifpdf.m unifrnd.m \ wblcdf.m wblinv.m wblpdf.m wblrnd.m wienrnd.m -DISTFILES = Makefile.in $(SOURCES) +DISTFILES = $(addprefix $(srcdir)/,Makefile.in $(SOURCES)) FCN_FILES = $(addprefix $(srcdir)/, $(SOURCES)) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES))
--- a/scripts/statistics/models/Makefile.in +++ b/scripts/statistics/models/Makefile.in @@ -23,7 +23,7 @@ SOURCES = logistic_regression.m logistic_regression_derivatives.m \ logistic_regression_likelihood.m -DISTFILES = Makefile.in $(SOURCES) +DISTFILES = $(addprefix $(srcdir)/,Makefile.in $(SOURCES)) FCN_FILES = $(addprefix $(srcdir)/, $(SOURCES)) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES))
--- a/scripts/statistics/tests/Makefile.in +++ b/scripts/statistics/tests/Makefile.in @@ -28,7 +28,7 @@ t_test_2.m t_test_regression.m u_test.m var_test.m welch_test.m \ wilcoxon_test.m z_test.m z_test_2.m -DISTFILES = Makefile.in $(SOURCES) +DISTFILES = $(addprefix $(srcdir)/,Makefile.in $(SOURCES)) FCN_FILES = $(addprefix $(srcdir)/, $(SOURCES)) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES))
--- a/scripts/strings/Makefile.in +++ b/scripts/strings/Makefile.in @@ -26,7 +26,7 @@ str2num.m strcat.m strcmpi.m strfind.m strjust.m strmatch.m \ strncmpi.m strrep.m strtok.m strtrunc.m strvcat.m substr.m upper.m -DISTFILES = Makefile.in $(SOURCES) +DISTFILES = $(addprefix $(srcdir)/,Makefile.in $(SOURCES)) FCN_FILES = $(addprefix $(srcdir)/, $(SOURCES)) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES))
--- a/scripts/testfun/Makefile.in +++ b/scripts/testfun/Makefile.in @@ -22,7 +22,7 @@ SOURCES = assert.m demo.m example.m fail.m speed.m test.m -DISTFILES = Makefile.in $(SOURCES) +DISTFILES = $(addprefix $(srcdir)/,Makefile.in $(SOURCES)) FCN_FILES = $(addprefix $(srcdir)/, $(SOURCES)) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES))
--- a/scripts/time/Makefile.in +++ b/scripts/time/Makefile.in @@ -24,7 +24,7 @@ datestr.m datevec.m eomday.m etime.m is_leap_year.m now.m \ tic.m toc.m weekday.m -DISTFILES = Makefile.in $(SOURCES) +DISTFILES = $(addprefix $(srcdir)/,Makefile.in $(SOURCES)) FCN_FILES = $(addprefix $(srcdir)/, $(SOURCES)) FCN_FILES_NO_DIR = $(notdir $(FCN_FILES))
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2007-07-25 David Bateman <dbateman@free.fr> + + * Makefile.in: Adjust DISTFILES to allow out of tree "make dist" + to work. + 2007-07-24 Shai Ayal <shaiay@users.sourceforge.net> * graphics.cc (color_property::operator = (const octave_value&)):
--- a/src/Makefile.in +++ b/src/Makefile.in @@ -186,11 +186,13 @@ SOURCES := $(DIST_SRC) $(OP_SRC) $(TI_SRC) -EXTRAS := ov-base-int.cc ov-base-mat.cc ov-base-scalar.cc mxarray.h +BUILT_EXTRAS := mxarray.h + +EXTRAS := ov-base-int.cc ov-base-mat.cc ov-base-scalar.cc EXTRA_OBJECTS := oct-errno.o octave.o builtins.o ops.o -INCLUDES_FOR_INSTALL := $(INCLUDES) $(EXTRAS) +INCLUDES_FOR_INSTALL := $(INCLUDES) $(EXTRAS) $(BUILT_EXTRAS) OBJECTS_4 := $(notdir $(SOURCES)) OBJECTS_3 := $(patsubst %.l, %.o, $(OBJECTS_4)) @@ -254,11 +256,14 @@ $(CAMD_LIBS) $(COLAMD_LIBS) $(CCOLAMD_LIBS) $(CXSPARSE_LIBS) $(BLAS_LIBS) \ $(FFTW_LIBS) $(LIBS) $(FLIBS) +BUILT_DISTFILES = DOCSTRINGS oct-gperf.h parse.cc lex.cc y.tab.h \ + __gnuplot_raw__.cc \ + $(OPT_HANDLERS) $(BUILT_EXTRAS) + DISTFILES = Makefile.in ChangeLog mkdefs mkops mkgendoc \ - DOCSTRINGS mkbuiltins mk-errno-list mk-pkg-add \ + mkbuiltins mk-errno-list mk-pkg-add \ defaults.h.in mxarray.h.in oct-conf.h.in oct-errno.cc.in octave.gperf \ - oct-gperf.h parse.cc lex.cc y.tab.h __gnuplot_raw__.cc \ - $(INCLUDES) $(DIST_SRC) $(OPT_HANDLERS) $(EXTRAS) + $(INCLUDES) $(DIST_SRC) $(EXTRAS) all: octave$(EXEEXT) $(OCT_FILES) PKG_ADD DOCSTRINGS .PHONY: all @@ -512,7 +517,8 @@ .PHONY: maintainer-clean dist: parse.cc lex.cc oct-gperf.h - ln $(DISTFILES) ../`cat ../.fname`/src + ln $(addprefix $(srcdir)/,$(DISTFILES)) ../`cat ../.fname`/src + ln $(BUILT_DISTFILES) ../`cat ../.fname`/src for f in DLD-FUNCTIONS OPERATORS TEMPLATE-INST; do \ if [ -d ../`cat ../.fname`/src/$$f ]; then \ true; \ @@ -520,16 +526,16 @@ mkdir ../`cat ../.fname`/src/$$f; \ fi; \ done - ln $(DLD_SRC) ../`cat ../.fname`/src/DLD-FUNCTIONS - ln $(OP_SRC) ../`cat ../.fname`/src/OPERATORS - ln $(OP_INCLUDES) ../`cat ../.fname`/src/OPERATORS - ln $(TI_SRC) ../`cat ../.fname`/src/TEMPLATE-INST + ln $(addprefix $(srcdir)/,$(DLD_SRC)) ../`cat ../.fname`/src/DLD-FUNCTIONS + ln $(addprefix $(srcdir)/,$(OP_SRC)) ../`cat ../.fname`/src/OPERATORS + ln $(addprefix $(srcdir)/,$(OP_INCLUDES)) ../`cat ../.fname`/src/OPERATORS + ln $(addprefix $(srcdir)/,$(TI_SRC)) ../`cat ../.fname`/src/TEMPLATE-INST rm -f parse.cc lex.cc y.tab.h y.output yy.lex.c rm -f oct-gperf.h defaults.h oct-conf.h *.d *.df builtins.cc .PHONY: dist conf-dist: - ln octave.cc Makefile.in ../`cat ../.fname`/src + ln $(addprefix $(srcdir)/,octave.cc Makefile.in) ../`cat ../.fname`/src .PHONY: conf-dist # Special rules -- these files need special things to be defined.
--- a/test/Makefile.in +++ b/test/Makefile.in @@ -16,7 +16,8 @@ SOURCES = $(wildcard $(srcdir)/test_*.m) -DISTFILES = ChangeLog Makefile.in build_sparse_tests.sh fntests.m $(SOURCES) +DISTFILES = $(addprefix $(srcdir)/,ChangeLog Makefile.in \ + build_sparse_tests.sh fntests.m) $(SOURCES) OCTAVE_BINARY = ../src/octave