Module: xenomai-forge Branch: next Commit: 6189e3afb1e8749366e3e152cf418e272da1a83f URL: http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=6189e3afb1e8749366e3e152cf418e272da1a83f
Author: Philippe Gerum <r...@xenomai.org> Date: Sun Jun 22 10:57:20 2014 +0200 doc/doxygen: reorganize output dirs hierarchy --- configure | 4 +-- configure.ac | 2 +- doc/asciidoc/Makefile.am | 30 ++++++++++---------- doc/asciidoc/Makefile.in | 30 ++++++++++---------- doc/doxygen/Makefile.am | 20 ++++++------- doc/doxygen/Makefile.in | 29 ++++++++++--------- doc/doxygen/xeno3prm-html.conf.in | 2 +- ...xeno3prm-pdf.conf.in => xeno3prm-latex.conf.in} | 2 +- doc/install-dist.rules | 2 +- 9 files changed, 61 insertions(+), 60 deletions(-) diff --git a/configure b/configure index 26b8e50..3884dbe 100755 --- a/configure +++ b/configure @@ -14112,7 +14112,7 @@ ac_config_files="$ac_config_files Makefile config/Makefile scripts/Makefile scri if test \! x$XENO_RUN_DOC = x ; then - ac_config_files="$ac_config_files doc/Makefile doc/doxygen/Makefile doc/doxygen/xeno3prm-common.conf doc/doxygen/xeno3prm-html.conf doc/doxygen/xeno3prm-pdf.conf doc/asciidoc/Makefile" + ac_config_files="$ac_config_files doc/Makefile doc/doxygen/Makefile doc/doxygen/xeno3prm-common.conf doc/doxygen/xeno3prm-html.conf doc/doxygen/xeno3prm-latex.conf doc/asciidoc/Makefile" fi @@ -15259,7 +15259,7 @@ do "doc/doxygen/Makefile") CONFIG_FILES="$CONFIG_FILES doc/doxygen/Makefile" ;; "doc/doxygen/xeno3prm-common.conf") CONFIG_FILES="$CONFIG_FILES doc/doxygen/xeno3prm-common.conf" ;; "doc/doxygen/xeno3prm-html.conf") CONFIG_FILES="$CONFIG_FILES doc/doxygen/xeno3prm-html.conf" ;; - "doc/doxygen/xeno3prm-pdf.conf") CONFIG_FILES="$CONFIG_FILES doc/doxygen/xeno3prm-pdf.conf" ;; + "doc/doxygen/xeno3prm-latex.conf") CONFIG_FILES="$CONFIG_FILES doc/doxygen/xeno3prm-latex.conf" ;; "doc/asciidoc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/asciidoc/Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; diff --git a/configure.ac b/configure.ac index eb24a3c..5d907b6 100644 --- a/configure.ac +++ b/configure.ac @@ -881,7 +881,7 @@ if test \! x$XENO_RUN_DOC = x ; then doc/doxygen/Makefile \ doc/doxygen/xeno3prm-common.conf \ doc/doxygen/xeno3prm-html.conf \ - doc/doxygen/xeno3prm-pdf.conf \ + doc/doxygen/xeno3prm-latex.conf \ doc/asciidoc/Makefile \ ]) fi diff --git a/doc/asciidoc/Makefile.am b/doc/asciidoc/Makefile.am index 9a801e7..eb9abbc 100644 --- a/doc/asciidoc/Makefile.am +++ b/doc/asciidoc/Makefile.am @@ -1,12 +1,12 @@ -HTML_DOCS = \ - README.INSTALL \ - README.APPLICATIONS \ - TROUBLESHOOTING \ - MIGRATION \ - asciidoc-icons \ - asciidoc-icons/callouts \ - asciidoc-css \ - asciidoc-js +HTML_DOCS = \ + html/README.INSTALL \ + html/README.APPLICATIONS \ + html/TROUBLESHOOTING \ + html/MIGRATION \ + html/asciidoc-icons \ + html/asciidoc-icons/callouts \ + html/asciidoc-css \ + html/asciidoc-js PDF_DOCS = \ README.INSTALL.pdf \ @@ -66,7 +66,7 @@ tmpdir=adoc_plaintext all-local: $(HTML_DOCS) $(PDF_DOCS) $(TXT_DOCS) $(MAN_DOCS) -%: %.adoc Makefile +html/%: %.adoc Makefile @$(mkdir_p) $@ $(ASCIIDOC) -n -b xhtml11 $(ASCIIDOC_HTML_OPTS) -o $@/index.html $< @@ -89,20 +89,20 @@ $(tmpdir)/%.txt: %.adoc Makefile plaintext.conf plaintext.xsl %.txt: $(tmpdir)/%.txt Makefile plaintext_postproc.awk awk -f $(srcdir)/plaintext_postproc.awk $(tmpdir)/$*.txt > $@ -asciidoc-icons asciidoc-icons/callouts: +html/asciidoc-icons html/asciidoc-icons/callouts: @$(RM) -R asciidoc-icons @test -d /usr/share/asciidoc/images && \ - cp -a /usr/share/asciidoc/images/icons asciidoc-icons || \ - cp -a /usr/share/asciidoc/icons asciidoc-icons + cp -a /usr/share/asciidoc/images/icons html/asciidoc-icons || \ + cp -a /usr/share/asciidoc/icons html/asciidoc-icons -asciidoc-css: +html/asciidoc-css: @$(mkdir_p) $@ @test -d /usr/share/asciidoc/stylesheets/xhtml11.css && \ @cp -a /usr/share/asciidoc/stylesheets/xhtml11.css $@ || \ true @cp -a /usr/share/asciidoc/stylesheets/xhtml11-quirks.css $@ -asciidoc-js: +html/asciidoc-js: @$(mkdir_p) $@ @cp -a /usr/share/asciidoc/javascripts/asciidoc*.js $@ @cp -a /usr/share/asciidoc/javascripts/toc.js $@ diff --git a/doc/asciidoc/Makefile.in b/doc/asciidoc/Makefile.in index 5afb8ac..1338a94 100644 --- a/doc/asciidoc/Makefile.in +++ b/doc/asciidoc/Makefile.in @@ -293,14 +293,14 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ HTML_DOCS = \ - README.INSTALL \ - README.APPLICATIONS \ - TROUBLESHOOTING \ - MIGRATION \ - asciidoc-icons \ - asciidoc-icons/callouts \ - asciidoc-css \ - asciidoc-js + html/README.INSTALL \ + html/README.APPLICATIONS \ + html/TROUBLESHOOTING \ + html/MIGRATION \ + html/asciidoc-icons \ + html/asciidoc-icons/callouts \ + html/asciidoc-css \ + html/asciidoc-js PDF_DOCS = \ README.INSTALL.pdf \ @@ -552,7 +552,7 @@ uninstall-am: uninstall-local @XENO_BUILD_DOC_TRUE@all-local: $(HTML_DOCS) $(PDF_DOCS) $(TXT_DOCS) $(MAN_DOCS) -@XENO_BUILD_DOC_TRUE@%: %.adoc Makefile +@XENO_BUILD_DOC_TRUE@html/%: %.adoc Makefile @XENO_BUILD_DOC_TRUE@ @$(mkdir_p) $@ @XENO_BUILD_DOC_TRUE@ $(ASCIIDOC) -n -b xhtml11 $(ASCIIDOC_HTML_OPTS) -o $@/index.html $< @@ -575,20 +575,20 @@ uninstall-am: uninstall-local @XENO_BUILD_DOC_TRUE@%.txt: $(tmpdir)/%.txt Makefile plaintext_postproc.awk @XENO_BUILD_DOC_TRUE@ awk -f $(srcdir)/plaintext_postproc.awk $(tmpdir)/$*.txt > $@ -@XENO_BUILD_DOC_TRUE@asciidoc-icons asciidoc-icons/callouts: +@XENO_BUILD_DOC_TRUE@html/asciidoc-icons html/asciidoc-icons/callouts: @XENO_BUILD_DOC_TRUE@ @$(RM) -R asciidoc-icons @XENO_BUILD_DOC_TRUE@ @test -d /usr/share/asciidoc/images && \ -@XENO_BUILD_DOC_TRUE@ cp -a /usr/share/asciidoc/images/icons asciidoc-icons || \ -@XENO_BUILD_DOC_TRUE@ cp -a /usr/share/asciidoc/icons asciidoc-icons +@XENO_BUILD_DOC_TRUE@ cp -a /usr/share/asciidoc/images/icons html/asciidoc-icons || \ +@XENO_BUILD_DOC_TRUE@ cp -a /usr/share/asciidoc/icons html/asciidoc-icons -@XENO_BUILD_DOC_TRUE@asciidoc-css: +@XENO_BUILD_DOC_TRUE@html/asciidoc-css: @XENO_BUILD_DOC_TRUE@ @$(mkdir_p) $@ @XENO_BUILD_DOC_TRUE@ @test -d /usr/share/asciidoc/stylesheets/xhtml11.css && \ @XENO_BUILD_DOC_TRUE@ @cp -a /usr/share/asciidoc/stylesheets/xhtml11.css $@ || \ @XENO_BUILD_DOC_TRUE@ true @XENO_BUILD_DOC_TRUE@ @cp -a /usr/share/asciidoc/stylesheets/xhtml11-quirks.css $@ -@XENO_BUILD_DOC_TRUE@asciidoc-js: +@XENO_BUILD_DOC_TRUE@html/asciidoc-js: @XENO_BUILD_DOC_TRUE@ @$(mkdir_p) $@ @XENO_BUILD_DOC_TRUE@ @cp -a /usr/share/asciidoc/javascripts/asciidoc*.js $@ @XENO_BUILD_DOC_TRUE@ @cp -a /usr/share/asciidoc/javascripts/toc.js $@ @@ -627,7 +627,7 @@ install-docs-local: install-htmldocs install-pdfdocs install-mandocs dist-htmldocs: $(HTML_DOCS:%=$(HTML_DOCSDIR)%) docs="$(HTML_DOCS)"; abs_builddir=$$PWD; \ for dir in $$docs; do \ - dest=$(GEN_DOC_DIST_ROOT)/html/$$dir; \ + dest=$(GEN_DOC_DIST_ROOT)/$$dir; \ $(mkinstalldirs) $$dest && abs_dest=`cd $$dest && pwd` && \ cd $(HTML_DOCSDIR)$$dir || exit 1; \ for f in * ; do \ diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am index c29e586..066821d 100644 --- a/doc/doxygen/Makefile.am +++ b/doc/doxygen/Makefile.am @@ -1,6 +1,6 @@ -HTML_DOCS = xeno3prm-html xeno3prm-html/search +HTML_DOCS = html/xeno3prm html/xeno3prm/search PDF_DOCS = xeno3prm.pdf -EXTRA_DIST = xeno3prm-common.conf.in xeno3prm-html.conf.in xeno3prm-pdf.conf.in +EXTRA_DIST = xeno3prm-common.conf.in xeno3prm-html.conf.in xeno3prm-latex.conf.in if !XENO_BUILD_DOC HTML_DOCSDIR = $(srcdir)/../prebuilt/html/ @@ -20,20 +20,20 @@ html: $(HTML_DOCS) pdf: $(PDF_DOCS) -xeno3prm-html: - $(DOXYGEN) $@.conf +html/xeno3prm latex/xeno3prm: FORCE + @mkdir -p $@ + $(DOXYGEN) $(@F)-$(@D).conf -%.pdf: FORCE - $(DOXYGEN) $*-pdf.conf - $(MAKE) -C $*-latex refman.pdf - mv $*-latex/refman.pdf $@ +%.pdf: latex/% + $(MAKE) -C $< refman.pdf > /dev/null + mv $</refman.pdf $@ distclean-local: - for dir in $(HTML_DOCS) *-latex; do \ + for dir in *-html *-latex; do \ if test -d $$dir ; then $(RM) -R $$dir ; fi ; \ done -.PHONY: xeno3prm-html FORCE +.PHONY: FORCE .DELETE_ON_ERROR: diff --git a/doc/doxygen/Makefile.in b/doc/doxygen/Makefile.in index 4b811ab..b6ff984 100644 --- a/doc/doxygen/Makefile.in +++ b/doc/doxygen/Makefile.in @@ -81,7 +81,8 @@ target_triplet = @target@ DIST_COMMON = $(top_srcdir)/doc/install-dist.rules \ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(srcdir)/xeno3prm-common.conf.in \ - $(srcdir)/xeno3prm-html.conf.in $(srcdir)/xeno3prm-pdf.conf.in + $(srcdir)/xeno3prm-html.conf.in \ + $(srcdir)/xeno3prm-latex.conf.in subdir = doc/doxygen ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/ac_prog_cc_for_build.m4 \ @@ -96,7 +97,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/xeno_config.h CONFIG_CLEAN_FILES = xeno3prm-common.conf xeno3prm-html.conf \ - xeno3prm-pdf.conf + xeno3prm-latex.conf CONFIG_CLEAN_VPATH_FILES = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -295,9 +296,9 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -HTML_DOCS = xeno3prm-html xeno3prm-html/search +HTML_DOCS = html/xeno3prm html/xeno3prm/search PDF_DOCS = xeno3prm.pdf -EXTRA_DIST = xeno3prm-common.conf.in xeno3prm-html.conf.in xeno3prm-pdf.conf.in +EXTRA_DIST = xeno3prm-common.conf.in xeno3prm-html.conf.in xeno3prm-latex.conf.in @XENO_BUILD_DOC_FALSE@HTML_DOCSDIR = $(srcdir)/../prebuilt/html/ @XENO_BUILD_DOC_TRUE@HTML_DOCSDIR = ./ @XENO_BUILD_DOC_FALSE@PDF_DOCSDIR = $(srcdir)/../prebuilt/pdf/ @@ -342,7 +343,7 @@ xeno3prm-common.conf: $(top_builddir)/config.status $(srcdir)/xeno3prm-common.co cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ xeno3prm-html.conf: $(top_builddir)/config.status $(srcdir)/xeno3prm-html.conf.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -xeno3prm-pdf.conf: $(top_builddir)/config.status $(srcdir)/xeno3prm-pdf.conf.in +xeno3prm-latex.conf: $(top_builddir)/config.status $(srcdir)/xeno3prm-latex.conf.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: @@ -519,20 +520,20 @@ uninstall-am: uninstall-local @XENO_BUILD_DOC_TRUE@pdf: $(PDF_DOCS) -@XENO_BUILD_DOC_TRUE@xeno3prm-html: -@XENO_BUILD_DOC_TRUE@ $(DOXYGEN) $@.conf +@XENO_BUILD_DOC_TRUE@html/xeno3prm latex/xeno3prm: FORCE +@XENO_BUILD_DOC_TRUE@ @mkdir -p $@ +@XENO_BUILD_DOC_TRUE@ $(DOXYGEN) $(@F)-$(@D).conf -@XENO_BUILD_DOC_TRUE@%.pdf: FORCE -@XENO_BUILD_DOC_TRUE@ $(DOXYGEN) $*-pdf.conf -@XENO_BUILD_DOC_TRUE@ $(MAKE) -C $*-latex refman.pdf -@XENO_BUILD_DOC_TRUE@ mv $*-latex/refman.pdf $@ +@XENO_BUILD_DOC_TRUE@%.pdf: latex/% +@XENO_BUILD_DOC_TRUE@ $(MAKE) -C $< refman.pdf > /dev/null +@XENO_BUILD_DOC_TRUE@ mv $</refman.pdf $@ @XENO_BUILD_DOC_TRUE@distclean-local: -@XENO_BUILD_DOC_TRUE@ for dir in $(HTML_DOCS) *-latex; do \ +@XENO_BUILD_DOC_TRUE@ for dir in *-html *-latex; do \ @XENO_BUILD_DOC_TRUE@ if test -d $$dir ; then $(RM) -R $$dir ; fi ; \ @XENO_BUILD_DOC_TRUE@ done -@XENO_BUILD_DOC_TRUE@.PHONY: xeno3prm-html FORCE +@XENO_BUILD_DOC_TRUE@.PHONY: FORCE @XENO_BUILD_DOC_TRUE@.DELETE_ON_ERROR: @@ -570,7 +571,7 @@ install-docs-local: install-htmldocs install-pdfdocs install-mandocs dist-htmldocs: $(HTML_DOCS:%=$(HTML_DOCSDIR)%) docs="$(HTML_DOCS)"; abs_builddir=$$PWD; \ for dir in $$docs; do \ - dest=$(GEN_DOC_DIST_ROOT)/html/$$dir; \ + dest=$(GEN_DOC_DIST_ROOT)/$$dir; \ $(mkinstalldirs) $$dest && abs_dest=`cd $$dest && pwd` && \ cd $(HTML_DOCSDIR)$$dir || exit 1; \ for f in * ; do \ diff --git a/doc/doxygen/xeno3prm-html.conf.in b/doc/doxygen/xeno3prm-html.conf.in index 4c561e1..3936a13 100644 --- a/doc/doxygen/xeno3prm-html.conf.in +++ b/doc/doxygen/xeno3prm-html.conf.in @@ -9,7 +9,7 @@ GENERATE_HTML = YES # If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `html' will be used as the default path. -HTML_OUTPUT = xeno3prm-html +HTML_OUTPUT = html/xeno3prm # The HTML_FILE_EXTENSION tag can be used to specify the file extension for # each generated HTML page (for example: .htm,.php,.asp). If it is left blank diff --git a/doc/doxygen/xeno3prm-pdf.conf.in b/doc/doxygen/xeno3prm-latex.conf.in similarity index 99% rename from doc/doxygen/xeno3prm-pdf.conf.in rename to doc/doxygen/xeno3prm-latex.conf.in index 82174cb..6a25bf7 100644 --- a/doc/doxygen/xeno3prm-pdf.conf.in +++ b/doc/doxygen/xeno3prm-latex.conf.in @@ -122,7 +122,7 @@ GENERATE_LATEX = YES # If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `latex' will be used as the default path. -LATEX_OUTPUT = xeno3prm-latex +LATEX_OUTPUT = latex/xeno3prm # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be # invoked. If left blank `latex' will be used as the default command name. diff --git a/doc/install-dist.rules b/doc/install-dist.rules index b41cea9..423b44a 100644 --- a/doc/install-dist.rules +++ b/doc/install-dist.rules @@ -49,7 +49,7 @@ install-docs-local: install-htmldocs install-pdfdocs install-mandocs dist-htmldocs: $(HTML_DOCS:%=$(HTML_DOCSDIR)%) docs="$(HTML_DOCS)"; abs_builddir=$$PWD; \ for dir in $$docs; do \ - dest=$(GEN_DOC_DIST_ROOT)/html/$$dir; \ + dest=$(GEN_DOC_DIST_ROOT)/$$dir; \ $(mkinstalldirs) $$dest && abs_dest=`cd $$dest && pwd` && \ cd $(HTML_DOCSDIR)$$dir || exit 1; \ for f in * ; do \ _______________________________________________ Xenomai-git mailing list Xenomai-git@xenomai.org http://www.xenomai.org/mailman/listinfo/xenomai-git