Mercurial > octave-nkf
changeset 10560:ea79ebe99051
Clarify compilation note about defaults.h
| author | Rik <octave@nomad.inbox5.com> |
|---|---|
| date | Fri, 23 Apr 2010 22:20:12 -0700 |
| parents | 0ecbb17d130a |
| children | 5f46cc552ce5 |
| files | src/ChangeLog src/Makefile.am |
| diffstat | 2 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Apr 23 22:07:39 2010 -0700 +++ b/src/ChangeLog Fri Apr 23 22:20:12 2010 -0700 @@ -1,3 +1,7 @@ +2010-04-23 Rik <octave@nomad.inbox5.com> + + * Makefile.am: Clarify compilation note about defaults.h + 2010-04-23 Rik <octave@nomad.inbox5.com> * symtab.h: Clear global variables when 'clear -all' called
--- a/src/Makefile.am Fri Apr 23 22:07:39 2010 -0700 +++ b/src/Makefile.am Fri Apr 23 22:20:12 2010 -0700 @@ -737,11 +737,9 @@ $(OPT_INC) : %.h : %.in $(MAKE) -C $(@D) $@ -## We want to force an update of defaults.h and oct-conf.h every -## time make is run because some values may come from the command -## line or the environment. The substitution rules use move-if-change, -## so this should not cause trouble if the file already exists and the -## newly generated file is not different. +## defaults.h and oct-conf.h must depend on Makefile. Calling configure +## may change default/config values. However, calling configure will also +## regenerate the Makefiles from Makefile.am and trigger the rules below. defaults.h: defaults.h.in Makefile $(do_subst_default_vals)