Mercurial > octave
changeset 25648:178f6d18c9a8
maint: reorganize rules for creating images.mk
* doc/interpreter/module.mk: Include images.mk here instead of in
Makefile.am.
* doc/interpreter/module.mk: Move rule for generating images.mk here
from doc/refcard/module.mk. Use %reldir% in more places.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 20 Jul 2018 08:25:47 -0400 |
| parents | 06a3eaf60b23 |
| children | 85c3e315bd43 |
| files | Makefile.am doc/interpreter/module.mk doc/refcard/module.mk |
| diffstat | 3 files changed, 11 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.am Fri Jul 20 08:23:04 2018 -0400 +++ b/Makefile.am Fri Jul 20 08:25:47 2018 -0400 @@ -211,7 +211,6 @@ include src/module.mk include scripts/module.mk include doc/module.mk -include doc/interpreter/images.mk include etc/module.mk include examples/module.mk include m4/module.mk
--- a/doc/interpreter/module.mk Fri Jul 20 08:23:04 2018 -0400 +++ b/doc/interpreter/module.mk Fri Jul 20 08:25:47 2018 -0400 @@ -325,6 +325,7 @@ if AMCOND_BUILD_QT_DOCS DOC_TARGETS += \ $(OCTAVE_QTHELP_FILES) + endif ## Distribute both OCTAVE_CSS and HTMLDIR_CSS so that the rules for @@ -424,6 +425,13 @@ endif +## These actions should happen even if we are not building docs + +include doc/interpreter/images.mk + +$(srcdir)/%reldir%/images.mk: $(srcdir)/%reldir%/config-images.sh $(srcdir)/%reldir%/images.awk $(srcdir)/%reldir%/images + $(AM_V_GEN)$(SHELL) $(srcdir)/%reldir%/config-images.sh $(top_srcdir) + DIRSTAMP_FILES += %reldir%/$(octave_dirstamp) ## The doc-cache file can be built without TeX but it does require @@ -445,19 +453,19 @@ %reldir%/undocumented_list: rm -f $@-t $@ - -cd $(srcdir)/doc/interpreter; $(PERL) ./doccheck/mk_undocumented_list > $(@F)-t + -cd $(srcdir)/%reldir%; $(PERL) ./doccheck/mk_undocumented_list > $(@F)-t mv $@-t $@ .PHONY: %reldir%/undocumented_list SPELLCHECK_FILES = $(MUNGED_TEXI_SRC:.texi=.scheck) %.scheck: %.texi | %reldir%/$(octave_dirstamp) - cd $(srcdir)/doc/interpreter; ./doccheck/spellcheck $(<F) > $(@F)-t + cd $(srcdir)/%reldir%; ./doccheck/spellcheck $(<F) > $(@F)-t mv $@-t $@ [ -s $@ ] || rm -f $@ spellcheck: $(SPELLCHECK_FILES) - @cd $(srcdir)/doc/interpreter ; \ + @cd $(srcdir)/%reldir% ; \ if ls *.scheck >/dev/null 2>&1 ; then \ echo "Spellcheck failed"; \ echo "Review the following files:"; \
--- a/doc/refcard/module.mk Fri Jul 20 08:23:04 2018 -0400 +++ b/doc/refcard/module.mk Fri Jul 20 08:25:47 2018 -0400 @@ -44,9 +44,6 @@ %reldir%/refcard-letter.ps: %reldir%/refcard-letter.dvi -$(AM_V_DVIPS)$(DVIPS) $(AM_V_texinfo) -T 11in,8.5in -o $@ $< -$(srcdir)/doc/interpreter/images.mk: $(srcdir)/doc/interpreter/config-images.sh $(srcdir)/doc/interpreter/images.awk $(srcdir)/doc/interpreter/images - $(AM_V_GEN)$(SHELL) $(srcdir)/doc/interpreter/config-images.sh $(top_srcdir) - $(refcard_DVI) : %.dvi : %.tex | %reldir%/$(octave_dirstamp) -$(AM_V_TEX)cd $(@D) && \ TEXINPUTS="$(abs_top_srcdir)/doc/refcard:$(TEXINPUTS):" \