Module: xenomai-2.6
Branch: master
Commit: a96c0bed5092638cf6a5e8e3e835434b91100473
URL:
http://git.xenomai.org/?p=xenomai-2.6.git;a=commit;h=a96c0bed5092638cf6a5e8e3e835434b91100473
Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>
Date: Thu Jul 7 12:35:03 2016 +0200
doc: adapt to different installations of asciidoc and doxygen
---
doc/asciidoc/Makefile.am | 11 +++++------
doc/asciidoc/Makefile.in | 11 +++++------
doc/asciidoc/plaintext_postproc.awk | 7 +++++++
doc/doxygen/Doxyfile-common.in | 33 ---------------------------------
doc/doxygen/Doxyfile-native.in | 6 ------
doc/doxygen/Doxyfile-nucleus.in | 6 ------
doc/doxygen/Doxyfile-posix.in | 6 ------
doc/doxygen/Doxyfile-rtdm.in | 6 ------
doc/doxygen/Doxyfile.in | 6 ------
doc/doxygen/Makefile.am | 2 ++
10 files changed, 19 insertions(+), 75 deletions(-)
diff --git a/doc/asciidoc/Makefile.am b/doc/asciidoc/Makefile.am
index 9c160e4..3da0ac7 100644
--- a/doc/asciidoc/Makefile.am
+++ b/doc/asciidoc/Makefile.am
@@ -33,18 +33,17 @@ all-local: $(HTML_DOCS) $(PDF_DOCS) $(TXT_DOCS)
asciidoc-icons asciidoc-icons/callouts: FORCE
@$(RM) -R asciidoc-icons
- @cp -a /usr/share/asciidoc/icons asciidoc-icons
+ @cp -a /etc/asciidoc/images/icons asciidoc-icons
asciidoc-css: FORCE
@$(mkdir_p) $@
- @cp -a /usr/share/asciidoc/stylesheets/asciidoc.css $@
- @cp -a /usr/share/asciidoc/stylesheets/xhtml11.css $@
- @cp -a /usr/share/asciidoc/stylesheets/xhtml11-quirks.css $@
+ @cp -a /usr/doc/asciidoc-8.6.8/stylesheets/asciidoc.css $@
+ @cp -a /usr/doc/asciidoc-8.6.8/stylesheets/xhtml11-quirks.css $@
asciidoc-js: FORCE
@$(mkdir_p) $@
- @cp -a /usr/share/asciidoc/javascripts/asciidoc.js $@
- @cp -a /usr/share/asciidoc/javascripts/toc.js $@
+ @cp -a /etc/asciidoc/javascripts/asciidoc.js $@
+ @cp -a /etc/asciidoc/javascripts/toc.js $@
.PHONY: FORCE
diff --git a/doc/asciidoc/Makefile.in b/doc/asciidoc/Makefile.in
index f263fab..35f2dc0 100644
--- a/doc/asciidoc/Makefile.in
+++ b/doc/asciidoc/Makefile.in
@@ -485,18 +485,17 @@ uninstall-am: uninstall-local
@CONFIG_XENO_ASCIIDOC_TRUE@asciidoc-icons asciidoc-icons/callouts: FORCE
@CONFIG_XENO_ASCIIDOC_TRUE@ @$(RM) -R asciidoc-icons
-@CONFIG_XENO_ASCIIDOC_TRUE@ @cp -a /usr/share/asciidoc/icons asciidoc-icons
+@CONFIG_XENO_ASCIIDOC_TRUE@ @cp -a /etc/asciidoc/images/icons asciidoc-icons
@CONFIG_XENO_ASCIIDOC_TRUE@asciidoc-css: FORCE
@CONFIG_XENO_ASCIIDOC_TRUE@ @$(mkdir_p) $@
-@CONFIG_XENO_ASCIIDOC_TRUE@ @cp -a
/usr/share/asciidoc/stylesheets/asciidoc.css $@
-@CONFIG_XENO_ASCIIDOC_TRUE@ @cp -a
/usr/share/asciidoc/stylesheets/xhtml11.css $@
-@CONFIG_XENO_ASCIIDOC_TRUE@ @cp -a
/usr/share/asciidoc/stylesheets/xhtml11-quirks.css $@
+@CONFIG_XENO_ASCIIDOC_TRUE@ @cp -a
/usr/doc/asciidoc-8.6.8/stylesheets/asciidoc.css $@
+@CONFIG_XENO_ASCIIDOC_TRUE@ @cp -a
/usr/doc/asciidoc-8.6.8/stylesheets/xhtml11-quirks.css $@
@CONFIG_XENO_ASCIIDOC_TRUE@asciidoc-js: FORCE
@CONFIG_XENO_ASCIIDOC_TRUE@ @$(mkdir_p) $@
-@CONFIG_XENO_ASCIIDOC_TRUE@ @cp -a
/usr/share/asciidoc/javascripts/asciidoc.js $@
-@CONFIG_XENO_ASCIIDOC_TRUE@ @cp -a /usr/share/asciidoc/javascripts/toc.js $@
+@CONFIG_XENO_ASCIIDOC_TRUE@ @cp -a /etc/asciidoc/javascripts/asciidoc.js $@
+@CONFIG_XENO_ASCIIDOC_TRUE@ @cp -a /etc/asciidoc/javascripts/toc.js $@
@CONFIG_XENO_ASCIIDOC_TRUE@.PHONY: FORCE
@CONFIG_XENO_ASCIIDOC_FALSE@$(man1_MANS): %.1: $(MAN_DOCSDIR)/%.1
diff --git a/doc/asciidoc/plaintext_postproc.awk
b/doc/asciidoc/plaintext_postproc.awk
index cf7e3b7..d492d57 100644
--- a/doc/asciidoc/plaintext_postproc.awk
+++ b/doc/asciidoc/plaintext_postproc.awk
@@ -14,6 +14,13 @@ BEGIN {
next
}
+/^This file/ && in_toc {
+ in_toc=0
+ printf
"-------------------------------------------------------------------------------\n\n"
+ print $0
+ next
+}
+
(in_toc || in_lot) && /^([ \t]*[0-9]\.|$)/ {
if (in_toc)
print $0
diff --git a/doc/doxygen/Doxyfile-common.in b/doc/doxygen/Doxyfile-common.in
index 6137c6d..187dd2c 100644
--- a/doc/doxygen/Doxyfile-common.in
+++ b/doc/doxygen/Doxyfile-common.in
@@ -38,16 +38,6 @@ OUTPUT_DIRECTORY = .
OUTPUT_LANGUAGE = English
-# This tag can be used to specify the encoding used in the generated output.
-# The encoding is not always determined by the language that is chosen,
-# but also whether or not the output is meant for Windows or non-Windows
users.
-# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES
-# forces the Windows encoding (this is the default for the Windows binary),
-# whereas setting the tag to NO uses a Unix-style encoding (the default for
-# all platforms other than Windows).
-
-USE_WINDOWS_ENCODING = NO
-
# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
# include brief member descriptions after the members that are listed in
# the file and class documentation (similar to JavaDoc).
@@ -110,13 +100,6 @@ JAVADOC_AUTOBRIEF = YES
MULTILINE_CPP_IS_BRIEF = NO
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen
-# will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member
-# documentation.
-
-DETAILS_AT_TOP = YES
-
# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
# member inherits the documentation from any documented member that it
# reimplements.
@@ -846,22 +829,6 @@ DOT_PATH =
DOTFILE_DIRS =
-# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than
-# this value, doxygen will try to truncate the graph, so that it fits within
-# the specified constraint. Beware that most browsers cannot cope with very
-# large images.
-
-MAX_DOT_GRAPH_WIDTH = 1024
-
-# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than
-# this value, doxygen will try to truncate the graph, so that it fits within
-# the specified constraint. Beware that most browsers cannot cope with very
-# large images.
-
-MAX_DOT_GRAPH_HEIGHT = 1024
-
# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
# graphs generated by dot. A depth value of 3 means that only nodes reachable
# from the root by following a path via at most 3 edges will be shown. Nodes
diff --git a/doc/doxygen/Doxyfile-native.in b/doc/doxygen/Doxyfile-native.in
index 16552ef..4bf5b3e 100644
--- a/doc/doxygen/Doxyfile-native.in
+++ b/doc/doxygen/Doxyfile-native.in
@@ -70,12 +70,6 @@ HTML_FOOTER =
HTML_STYLESHEET =
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS = YES
-
# If the GENERATE_HTMLHELP tag is set to YES, additional index files
# will be generated that can be used as input for tools like the
# Microsoft HTML help workshop to generate a compressed HTML help file (.chm)
diff --git a/doc/doxygen/Doxyfile-nucleus.in b/doc/doxygen/Doxyfile-nucleus.in
index a350745..64be44f 100644
--- a/doc/doxygen/Doxyfile-nucleus.in
+++ b/doc/doxygen/Doxyfile-nucleus.in
@@ -58,12 +58,6 @@ HTML_FOOTER =
HTML_STYLESHEET =
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS = YES
-
# If the GENERATE_HTMLHELP tag is set to YES, additional index files
# will be generated that can be used as input for tools like the
# Microsoft HTML help workshop to generate a compressed HTML help file (.chm)
diff --git a/doc/doxygen/Doxyfile-posix.in b/doc/doxygen/Doxyfile-posix.in
index d70473e..60bc249 100644
--- a/doc/doxygen/Doxyfile-posix.in
+++ b/doc/doxygen/Doxyfile-posix.in
@@ -63,12 +63,6 @@ HTML_FOOTER =
HTML_STYLESHEET =
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS = YES
-
# If the GENERATE_HTMLHELP tag is set to YES, additional index files
# will be generated that can be used as input for tools like the
# Microsoft HTML help workshop to generate a compressed HTML help file (.chm)
diff --git a/doc/doxygen/Doxyfile-rtdm.in b/doc/doxygen/Doxyfile-rtdm.in
index 96ad640..fa6c253 100644
--- a/doc/doxygen/Doxyfile-rtdm.in
+++ b/doc/doxygen/Doxyfile-rtdm.in
@@ -65,12 +65,6 @@ HTML_FOOTER =
HTML_STYLESHEET =
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS = YES
-
# If the GENERATE_HTMLHELP tag is set to YES, additional index files
# will be generated that can be used as input for tools like the
# Microsoft HTML help workshop to generate a compressed HTML help file (.chm)
diff --git a/doc/doxygen/Doxyfile.in b/doc/doxygen/Doxyfile.in
index 0d2c448..b54f7f9 100644
--- a/doc/doxygen/Doxyfile.in
+++ b/doc/doxygen/Doxyfile.in
@@ -87,12 +87,6 @@ HTML_FOOTER =
HTML_STYLESHEET =
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS = YES
-
# If the GENERATE_HTMLHELP tag is set to YES, additional index files
# will be generated that can be used as input for tools like the
# Microsoft HTML help workshop to generate a compressed HTML help file (.chm)
diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
index a5c515f..4265d29 100644
--- a/doc/doxygen/Makefile.am
+++ b/doc/doxygen/Makefile.am
@@ -15,6 +15,8 @@ PDF_DOCSDIR = ./
# Doxygen documentation
api: doxygen-api
+api/search: api
+
all-local: $(HTML_DOCS) $(PDF_DOCS)
doxygen-api: Doxyfile
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
https://xenomai.org/mailman/listinfo/xenomai-git
