Mercurial > octave-nkf
changeset 11016:0c752b657217
src/Makefile.am: don't include dynamically linked files in DEF_FILES
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 23 Sep 2010 14:55:53 -0400 |
| parents | b4ed4fe70c2c |
| children | 60141d49a38d |
| files | src/ChangeLog src/Makefile.am |
| diffstat | 2 files changed, 17 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Sep 23 03:15:33 2010 -0400 +++ b/src/ChangeLog Thu Sep 23 14:55:53 2010 -0400 @@ -1,3 +1,10 @@ +2010-09-23 John W. Eaton <jwe@octave.org> + + * Makefile.am (ALL_DEF_FILES): New variable. + (DEF_FILES): Don't include $(DLD_DYNAMIC_DEF_FILES) in the list. + (DEF_FILES DLD_DYNAMIC_DEF_FILES): Fix dependency info. + (doc-files): Depend on $(ALL_DEF_FILES), not $(DEF_FILES). + 2010-09-22 Jaroslav Hajek <highegg@gmail.com> * xpow.cc (elem_xpow (float, const NDArray&),
--- a/src/Makefile.am Thu Sep 23 03:15:33 2010 -0400 +++ b/src/Makefile.am Thu Sep 23 14:55:53 2010 -0400 @@ -483,9 +483,15 @@ SRC_DEF_FILES := $(shell $(srcdir)/find-defun-files.sh "$(srcdir)" $(DIST_SRC)) -DEF_FILES = $(SRC_DEF_FILES) $(DLD_DYNAMIC_DEF_FILES) $(DLD_STATIC_DEF_FILES) +## builtins.cc depends on $(DEF_FILES), so DEF_FILES should only include +## .df files that correspond to sources included in liboctave. +DEF_FILES = $(SRC_DEF_FILES) $(DLD_STATIC_DEF_FILES) -$(DEF_FILES): mkdefs Makefile $(OPT_HANDLERS) +ALL_DEF_FILES = $(DEF_FILES) $(DLD_DYNAMIC_DEF_FILES) + +$(DEF_FILES) $(DYNAMIC_DLD_DEF_FILES): mkdefs Makefile + +$(DEF_FILES): $(OPT_HANDLERS) $(OPT_INC) if AMCOND_ENABLE_DYNAMIC_LINKING OCTAVE_LIBS = \ @@ -657,8 +663,8 @@ $(top_srcdir)/move-if-change $@ DOCSTRINGS touch $@ -doc-files: $(DEF_FILES) - echo $(DEF_FILES) > $@-t +doc-files: $(ALL_DEF_FILES) + echo $(ALL_DEF_FILES) > $@-t mv $@-t $@ gendoc.cc: doc-files mkgendoc @@ -672,8 +678,6 @@ $(srcdir)/mkops $(OPERATORS_SRC) > $@-t mv $@-t $@ -$(DEF_FILES): $(OPT_INC) mkdefs - install-exec-hook: make-version-links install-data-hook: install-oct