Mercurial > hg > octave-lyh
changeset 9943:4c681ff57bc3
Modifications to makefiles to pass distcheck test
All generated documentation, as well as sources for it, are now distributed.
This eliminates the need for a user to have Texinfo merely to compile Octave.
| author | Rik <rdrider0-list@yahoo.com> |
|---|---|
| date | Tue, 08 Dec 2009 15:25:05 -0800 |
| parents | 314d2234b660 |
| children | fea3d4868692 |
| files | ChangeLog Makefile.am doc/ChangeLog doc/interpreter/Makefile.am scripts/ChangeLog scripts/Makefile.am scripts/mkdoc src/ChangeLog src/Makefile.am |
| diffstat | 9 files changed, 32 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-12-08 Rik <octave@nomad.inbox5.com> + + * Makefile.am: add BUGS and OCTAVE.INSTALL to DISTCLEANFILES + 2009-12-08 John W. Eaton <jwe@octave.org> * configure.ac: Update gnuplot status message.
--- a/Makefile.am +++ b/Makefile.am @@ -80,12 +80,14 @@ octave-config$(SCRIPTS_EXE_SUFFIX) \ octave-bug$(SCRIPTS_EXE_SUFFIX) -CLEANFILES = $(BUILT_SHELL_FILES) - INFO_FILES = \ INSTALL.OCTAVE \ BUGS +CLEANFILES = $(BUILT_SHELL_FILES) + +DISTCLEANFILES = $(INFO_FILES) + CONFIG_FILES = @ac_config_headers@ @ac_config_files@ BUILT_SOURCES = run-octave
--- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,8 @@ +2009-12-08 Rik <octave@nomad.inbox5.com> + + * interpreter/Makefile.am: Distribute all generated documentation (.pdf, + .ps, .html, .dvi) to remove build requirement for TexInfo + 2009-12-07 Rik <octave@nomad.inbox5.com> * interpreter/Makefile.am, faq/Makefile.am, liboctave/Makefile.am: Document
--- a/doc/interpreter/Makefile.am +++ b/doc/interpreter/Makefile.am @@ -204,6 +204,10 @@ mk_doc_cache.m \ mkcontrib.awk \ munge-texi.cc \ + octave.dvi \ + octave.html \ + octave.pdf \ + octave.ps \ $(IMAGES) \ $(IMAGES_SRC) \ $(TXI_SRC)
--- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,8 @@ +2009-12-09 Rik <octave@nomad.inbox5.com> + + * Makefile.am: Distribute DOCSTRINGS in tar.gz file + * mkdoc: pass current directory, "./", when running mkdoc on local files + 2009-12-07 Jaroslav Hajek <highegg@gmail.com> * general/interp1q.m: Use more optimal code.
--- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -74,6 +74,7 @@ include time/module.mk DISTCLEANFILES = \ + DOCSTRINGS \ gethelp$(BUILD_EXEEXT) \ $(PKG_ADD_FILES) \ $(DIRSTAMP_FILES) \ @@ -329,7 +330,7 @@ DOCSTRINGS: mkdoc $(FCN_FILES) $(GEN_FCN_FILES) gethelp$(BUILD_EXEEXT) $(srcdir)/mkdoc "$(srcdir)" $(FCN_FILES) -- $(GEN_FCN_FILES) > $@-t - mv $@-t $@ + $(simple_move_if_change_rule) gethelp$(BUILD_EXEEXT): gethelp.cc $(BUILD_CXX) $(BUILD_CXXFLAGS) -o $@ $^ $(BUILD_LDFLAGS)
--- a/scripts/mkdoc +++ b/scripts/mkdoc @@ -40,7 +40,7 @@ for arg do if [ "$arg" = "--" ]; then - prefix="" + prefix="./" else $PERL -w -e ' unless (@ARGV == 2) { die "Usage: $0 srcdir m_filename" ; }