Mercurial > octave-libgccjit
changeset 9939:f0f7c2477cdb
more makefile tweaks
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 08 Dec 2009 02:57:58 -0500 |
| parents | 997cbe63fc60 |
| children | 1707df259536 |
| files | ChangeLog acinclude.m4 configure.ac scripts/ChangeLog scripts/Makefile.am src/ChangeLog src/Makefile.am |
| diffstat | 7 files changed, 30 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Dec 08 01:53:23 2009 -0500 +++ b/ChangeLog Tue Dec 08 02:57:58 2009 -0500 @@ -1,3 +1,8 @@ +2009-12-08 John W. Eaton <jwe@octave.org> + + * configure.ac: Update gnuplot status message. + * acinclude.m4 (OCTAVE_PROG_GNUPLOT): Likewise. + 2009-12-07 John W. Eaton <jwe@octave.org> * examples/make_int.cc: Delete Emacs local variables.
--- a/acinclude.m4 Tue Dec 08 01:53:23 2009 -0500 +++ b/acinclude.m4 Tue Dec 08 02:57:58 2009 -0500 @@ -643,9 +643,10 @@ AC_MSG_WARN([plotting commands without it.]) AC_MSG_WARN([]) AC_MSG_WARN([If gnuplot is installed but it isn't in your path, you can]) - AC_MSG_WARN([tell Octave where to find it by typing the command]) + AC_MSG_WARN([tell Octave where to find it using the gnuplot_binary]) + AC_MSG_WARN([function. For example,]) AC_MSG_WARN([]) - AC_MSG_WARN([gnuplot_binary = "/full/path/to/gnuplot/binary"]) + AC_MSG_WARN([gnuplot_binary ("/full/name/of/gnuplot/binary")]) AC_MSG_WARN([]) AC_MSG_WARN([at the Octave prompt.]) AC_MSG_WARN([])
--- a/configure.ac Tue Dec 08 01:53:23 2009 -0500 +++ b/configure.ac Tue Dec 08 02:57:58 2009 -0500 @@ -2419,12 +2419,15 @@ AC_MSG_WARN([plotting commands without it.]) AC_MSG_WARN([]) AC_MSG_WARN([If gnuplot is installed but it isn't in your path, you can]) - AC_MSG_WARN([tell Octave where to find it by typing the command]) + AC_MSG_WARN([tell Octave where to find it using the gnuplot_binary]) + AC_MSG_WARN([function. For example,]) AC_MSG_WARN([]) - AC_MSG_WARN([gnuplot_binary = "/full/path/to/gnuplot/binary"]) + AC_MSG_WARN([gnuplot_binary ("/full/name/of/gnuplot/binary")]) AC_MSG_WARN([]) AC_MSG_WARN([at the Octave prompt.]) AC_MSG_WARN([]) + AC_MSG_WARN([Setting default value to $GNUPLOT]) + AC_MSG_WARN([]) warn_msg_printed=true fi
--- a/scripts/ChangeLog Tue Dec 08 01:53:23 2009 -0500 +++ b/scripts/ChangeLog Tue Dec 08 02:57:58 2009 -0500 @@ -1,3 +1,10 @@ +2009-12-08 John W. Eaton <jwe@octave.org> + + * Makefile.am (DOCSTRINGS): Depend on $(GEN_FCN_FILES) instead + of $(FCN_FILES_IN). Pass $(GEN_FCN_FILES) to mkdoc instead of + $(FCN_FILES_IN). Use mv instead of $(simple_move_if_change_rule). + (EXTRA_DIST): Include $(GEN_FCN_FILES) in the list. + 2009-12-07 Jaroslav Hajek <highegg@gmail.com> * general/interp1.m: Allow discontinuities (jumps) for the "nearest" and
--- a/scripts/Makefile.am Tue Dec 08 01:53:23 2009 -0500 +++ b/scripts/Makefile.am Tue Dec 08 02:57:58 2009 -0500 @@ -322,13 +322,14 @@ EXTRA_DIST += \ $(IMAGES) \ $(FCN_FILES) \ - $(FCN_FILES_IN) + $(FCN_FILES_IN) \ + $(GEN_FCN_FILES) all-local: $(GEN_FCN_FILES) $(PKG_ADD_FILES) DOCSTRINGS -DOCSTRINGS: mkdoc $(FCN_FILES) $(FCN_FILES_IN) gethelp$(BUILD_EXEEXT) - $(srcdir)/mkdoc "$(srcdir)" $(FCN_FILES) $(FCN_FILES_IN) > $@-t - $(simple_move_if_change_rule) +DOCSTRINGS: mkdoc $(FCN_FILES) $(GEN_FCN_FILES) gethelp$(BUILD_EXEEXT) + $(srcdir)/mkdoc "$(srcdir)" $(FCN_FILES) -- $(GEN_FCN_FILES) > $@-t + mv $@-t $@ gethelp$(BUILD_EXEEXT): gethelp.cc $(BUILD_CXX) $(BUILD_CXXFLAGS) -o $@ $^ $(BUILD_LDFLAGS)
--- a/src/ChangeLog Tue Dec 08 01:53:23 2009 -0500 +++ b/src/ChangeLog Tue Dec 08 02:57:58 2009 -0500 @@ -1,3 +1,7 @@ +2009-12-08 John W. Eaton <jwe@octave.org> + + * Makefile.am (gendoc.cc): Don't pass $(srcdidr) to mkgendoc. + 2009-12-07 John W. Eaton <jwe@octave.org> * OPERATORS/op-b-b.cc, OPERATORS/op-b-bm.cc,