Module: xenomai-forge
Branch: master
Commit: 38f7cc44752851203e4c3523d2eb2fb840280e6a
URL:
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=38f7cc44752851203e4c3523d2eb2fb840280e6a
Author: Philippe Gerum <r...@xenomai.org>
Date: Tue Dec 20 09:47:13 2011 +0100
doc: enable back generation
---
configure | 4 +-
configure.in | 2 +-
doc/Makefile.am | 2 +-
doc/Makefile.in | 279 +++++++++++++++++---
.../{Doxyfile-posix.in => Doxyfile-cobalt.in} | 11 +-
doc/doxygen/Doxyfile-common.in | 33 ---
doc/doxygen/Doxyfile-nucleus.in | 6 +-
doc/doxygen/Doxyfile-rtdm.in | 4 +-
doc/doxygen/Doxyfile.in | 23 +-
doc/doxygen/Makefile.am | 4 +-
doc/doxygen/Makefile.in | 12 +-
doc/man/Makefile.am | 1 -
doc/man/Makefile.in | 1 -
doc/txt/Makefile.am | 2 +-
doc/txt/Makefile.in | 2 +-
15 files changed, 278 insertions(+), 108 deletions(-)
diff --git a/configure b/configure
index 9869004..aa82747 100755
--- a/configure
+++ b/configure
@@ -13745,7 +13745,7 @@ ac_config_files="$ac_config_files Makefile
config/Makefile scripts/Makefile scri
if test \! x$XENO_MAYBE_DOCDIR = x ; then
- ac_config_files="$ac_config_files doc/Makefile doc/txt/Makefile
doc/man/Makefile doc/man/clocktest.man doc/man/cyclictest.man
doc/man/latency.man doc/man/rtcanconfig.man doc/man/rtcanrecv.man
doc/man/rtcansend.man doc/man/switchbench.man doc/man/switchtest.man
doc/man/xeno.man doc/man/xeno-config.man doc/doxygen/Makefile
doc/doxygen/Doxyfile-common doc/doxygen/Doxyfile doc/doxygen/Doxyfile-nucleus
doc/doxygen/Doxyfile-posix doc/doxygen/Doxyfile-rtdm doc/docbook/Makefile
doc/docbook/catalog doc/docbook/custom-stylesheets/Makefile
doc/docbook/custom-stylesheets/xsl/Makefile
doc/docbook/custom-stylesheets/xsl/common/Makefile
doc/docbook/custom-stylesheets/xsl/fo/Makefile
doc/docbook/custom-stylesheets/xsl/html/Makefile
doc/docbook/custom-stylesheets/xsl/html/chunk.xsl
doc/docbook/custom-stylesheets/xsl/html/onechunk.xsl
doc/docbook/xenomai/Makefile"
+ ac_config_files="$ac_config_files doc/Makefile doc/txt/Makefile
doc/man/Makefile doc/man/clocktest.man doc/man/cyclictest.man
doc/man/latency.man doc/man/rtcanconfig.man doc/man/rtcanrecv.man
doc/man/rtcansend.man doc/man/switchbench.man doc/man/switchtest.man
doc/man/xeno.man doc/man/xeno-config.man doc/doxygen/Makefile
doc/doxygen/Doxyfile-common doc/doxygen/Doxyfile doc/doxygen/Doxyfile-nucleus
doc/doxygen/Doxyfile-cobalt doc/doxygen/Doxyfile-rtdm doc/docbook/Makefile
doc/docbook/catalog doc/docbook/custom-stylesheets/Makefile
doc/docbook/custom-stylesheets/xsl/Makefile
doc/docbook/custom-stylesheets/xsl/common/Makefile
doc/docbook/custom-stylesheets/xsl/fo/Makefile
doc/docbook/custom-stylesheets/xsl/html/Makefile
doc/docbook/custom-stylesheets/xsl/html/chunk.xsl
doc/docbook/custom-stylesheets/xsl/html/onechunk.xsl
doc/docbook/xenomai/Makefile"
fi
@@ -14879,7 +14879,7 @@ do
"doc/doxygen/Doxyfile-common") CONFIG_FILES="$CONFIG_FILES
doc/doxygen/Doxyfile-common" ;;
"doc/doxygen/Doxyfile") CONFIG_FILES="$CONFIG_FILES doc/doxygen/Doxyfile"
;;
"doc/doxygen/Doxyfile-nucleus") CONFIG_FILES="$CONFIG_FILES
doc/doxygen/Doxyfile-nucleus" ;;
- "doc/doxygen/Doxyfile-posix") CONFIG_FILES="$CONFIG_FILES
doc/doxygen/Doxyfile-posix" ;;
+ "doc/doxygen/Doxyfile-cobalt") CONFIG_FILES="$CONFIG_FILES
doc/doxygen/Doxyfile-cobalt" ;;
"doc/doxygen/Doxyfile-rtdm") CONFIG_FILES="$CONFIG_FILES
doc/doxygen/Doxyfile-rtdm" ;;
"doc/docbook/Makefile") CONFIG_FILES="$CONFIG_FILES doc/docbook/Makefile"
;;
"doc/docbook/catalog") CONFIG_FILES="$CONFIG_FILES doc/docbook/catalog" ;;
diff --git a/configure.in b/configure.in
index 4890d03..6926ed4 100644
--- a/configure.in
+++ b/configure.in
@@ -722,7 +722,7 @@ if test \! x$XENO_MAYBE_DOCDIR = x ; then
doc/doxygen/Doxyfile-common \
doc/doxygen/Doxyfile \
doc/doxygen/Doxyfile-nucleus \
- doc/doxygen/Doxyfile-posix \
+ doc/doxygen/Doxyfile-cobalt \
doc/doxygen/Doxyfile-rtdm \
doc/docbook/Makefile \
doc/docbook/catalog \
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 9948063..b9b9066 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-#SUBDIRS=docbook doxygen man txt
+SUBDIRS=docbook doxygen man txt
GENERATE_DOC=$(top_srcdir)/scripts/maint/generate-doc
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 23f2ca0..5c8bfc3 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -14,8 +14,6 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-
-#SUBDIRS=docbook doxygen man txt
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
@@ -55,7 +53,47 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AR = @AR@
@@ -215,8 +253,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+SUBDIRS = docbook doxygen man txt
GENERATE_DOC = $(top_srcdir)/scripts/maint/generate-doc
-all: all-am
+all: all-recursive
.SUFFIXES:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am
$(am__configure_deps)
@@ -255,12 +294,141 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+# (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ rev=''; for subdir in $$list; do \
+ if test "$$subdir" = "."; then :; else \
+ rev="$$subdir $$rev"; \
+ fi; \
+ done; \
+ rev="$$rev ."; \
+ target=`echo $@ | sed s/-recursive//`; \
+ for subdir in $$rev; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done && test -z "$$fail"
+tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS)
tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS)
ctags); \
+ done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
tags: TAGS
-TAGS:
+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ set x; \
+ here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
ctags: CTAGS
-CTAGS:
-
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -292,19 +460,48 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS)
top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=:
am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ am__skip_mode_fix=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
check-am: all-am
-check: check-am
+check: check-recursive
all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-installcheck: installcheck-am
+installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
@@ -321,84 +518,88 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
+clean: clean-recursive
clean-am: clean-generic clean-libtool mostlyclean-am
-distclean: distclean-am
+distclean: distclean-recursive
-rm -f Makefile
-distclean-am: clean-am distclean-generic
+distclean-am: clean-am distclean-generic distclean-tags
-dvi: dvi-am
+dvi: dvi-recursive
dvi-am:
-html: html-am
+html: html-recursive
html-am:
-info: info-am
+info: info-recursive
info-am:
install-data-am:
-install-dvi: install-dvi-am
+install-dvi: install-dvi-recursive
install-dvi-am:
install-exec-am:
-install-html: install-html-am
+install-html: install-html-recursive
install-html-am:
-install-info: install-info-am
+install-info: install-info-recursive
install-info-am:
install-man:
-install-pdf: install-pdf-am
+install-pdf: install-pdf-recursive
install-pdf-am:
-install-ps: install-ps-am
+install-ps: install-ps-recursive
install-ps-am:
installcheck-am:
-maintainer-clean: maintainer-clean-am
+maintainer-clean: maintainer-clean-recursive
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
-mostlyclean: mostlyclean-am
+mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-pdf: pdf-am
+pdf: pdf-recursive
pdf-am:
-ps: ps-am
+ps: ps-recursive
ps-am:
uninstall-am:
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+ install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic clean-libtool \
+ ctags ctags-recursive distclean distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+ uninstall uninstall-am
generate-doc:
diff --git a/doc/doxygen/Doxyfile-posix.in b/doc/doxygen/Doxyfile-cobalt.in
similarity index 97%
rename from doc/doxygen/Doxyfile-posix.in
rename to doc/doxygen/Doxyfile-cobalt.in
index da77a70..498b8a9 100644
--- a/doc/doxygen/Doxyfile-posix.in
+++ b/doc/doxygen/Doxyfile-cobalt.in
@@ -5,7 +5,7 @@
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project.
-PROJECT_NAME = "Xenomai POSIX skin API"
+PROJECT_NAME = "Xenomai Cobalt API"
# The INPUT tag can be used to specify the files and/or directories that
contain
# documented source files. You may enter file names like "myfile.cpp" or
@@ -13,14 +13,15 @@ PROJECT_NAME = "Xenomai POSIX skin API"
# with spaces.
INPUT = \
- @top_srcdir@/kernel/cobalt/posix \
+ @top_srcdir@/include/cobalt \
+ @top_srcdir@/kernel/cobalt \
@top_srcdir@/doc/doxygen
# The EXAMPLE_PATH tag can be used to specify one or more files or
# directories that contain example code fragments that are included (see
# the \include command).
-EXAMPLE_PATH = @top_srcdir@/examples/posix
+EXAMPLE_PATH =
#---------------------------------------------------------------------------
# configuration options related to the HTML output
@@ -154,7 +155,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 = latex-posix
+LATEX_OUTPUT = latex-cobalt
# 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.
@@ -230,5 +231,5 @@ LATEX_HIDE_INDICES = NO
INCLUDE_PATH = \
@top_builddir@/include \
@top_srcdir@/include \
-@top_srcdir@/include/posix \
+@top_srcdir@/include/cobalt \
diff --git a/doc/doxygen/Doxyfile-common.in b/doc/doxygen/Doxyfile-common.in
index 86b2468..1b6518f 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.
@@ -844,22 +827,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-nucleus.in b/doc/doxygen/Doxyfile-nucleus.in
index 4b9a53c..6c377a8 100644
--- a/doc/doxygen/Doxyfile-nucleus.in
+++ b/doc/doxygen/Doxyfile-nucleus.in
@@ -5,7 +5,7 @@
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project.
-PROJECT_NAME = "Xenomai nanokernel API"
+PROJECT_NAME = "Xenomai core"
# The INPUT tag can be used to specify the files and/or directories that
contain
# documented source files. You may enter file names like "myfile.cpp" or
@@ -13,8 +13,8 @@ PROJECT_NAME = "Xenomai nanokernel API"
# with spaces.
INPUT = \
- @top_srcdir@/include/nucleus \
- @top_srcdir@/kernel/cobalt \
+ @top_srcdir@/include/cobalt/nucleus \
+ @top_srcdir@/kernel/cobalt/nucleus \
@top_srcdir@/doc/doxygen
#---------------------------------------------------------------------------
diff --git a/doc/doxygen/Doxyfile-rtdm.in b/doc/doxygen/Doxyfile-rtdm.in
index 3cd9263..37c93c0 100644
--- a/doc/doxygen/Doxyfile-rtdm.in
+++ b/doc/doxygen/Doxyfile-rtdm.in
@@ -14,7 +14,6 @@ PROJECT_NAME = "Xenomai RTDM skin API"
INPUT = \
@top_srcdir@/include/rtdm \
- @top_srcdir@/lib/rtdm \
@top_srcdir@/kernel/cobalt/rtdm \
@top_srcdir@/doc/doxygen
@@ -22,8 +21,7 @@ INPUT = \
# directories that contain example code fragments that are included (see
# the \include command).
-EXAMPLE_PATH = @top_srcdir@/utils \
- @top_srcdir@/examples/rtdm
+EXAMPLE_PATH = @top_srcdir@/utils
#---------------------------------------------------------------------------
# configuration options related to the HTML output
diff --git a/doc/doxygen/Doxyfile.in b/doc/doxygen/Doxyfile.in
index 24501b0..347077a 100644
--- a/doc/doxygen/Doxyfile.in
+++ b/doc/doxygen/Doxyfile.in
@@ -5,7 +5,7 @@
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project.
-PROJECT_NAME = "Xenomai API"
+PROJECT_NAME = "Xenomai"
#---------------------------------------------------------------------------
@@ -18,13 +18,14 @@ PROJECT_NAME = "Xenomai API"
# with spaces.
INPUT = \
- @top_srcdir@/include/nucleus \
+ @top_srcdir@/include/cobalt/nucleus \
@top_srcdir@/kernel/cobalt \
- @top_srcdir@/include/native \
- @top_srcdir@/lib/native \
+ @top_srcdir@/include/copperplate \
+ @top_srcdir@/include/alchemy \
@top_srcdir@/include/rtdm \
- @top_srcdir@/lib/rtdm \
@top_srcdir@/include/analogy \
+ @top_srcdir@/lib/copperplate \
+ @top_srcdir@/lib/alchemy \
@top_srcdir@/lib/analogy \
@top_srcdir@/kernel/drivers/analogy \
@top_srcdir@/doc/doxygen
@@ -33,8 +34,7 @@ INPUT = \
# directories that contain example code fragments that are included (see
# the \include command).
-EXAMPLE_PATH = @top_srcdir@/utils \
- @top_srcdir@/examples
+EXAMPLE_PATH = @top_srcdir@/utils
#---------------------------------------------------------------------------
# configuration options related to the HTML output
@@ -246,5 +246,10 @@ INCLUDE_PATH = \
@top_srcdir@/kernel/drivers \
@top_builddir@/include \
@top_srcdir@/include \
-@top_srcdir@/include/posix \
-@top_srcdir@/include/analogy \
+@top_srcdir@/include/copperplate \
+@top_srcdir@/include/cobalt \
+@top_srcdir@/include/cobalt/nucleus \
+@top_srcdir@/include/alchemy \
+@top_srcdir@/include/psos \
+@top_srcdir@/include/vxworks \
+@top_srcdir@/include/analogy
diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
index 48ca321..0ff3e42 100644
--- a/doc/doxygen/Makefile.am
+++ b/doc/doxygen/Makefile.am
@@ -1,9 +1,9 @@
HTML_DOCS=api api/search
-PDF_DOCS= nucleus-api.pdf posix-api.pdf rtdm-api.pdf
+PDF_DOCS= nucleus-api.pdf cobalt-api.pdf rtdm-api.pdf
EXTRA_DIST = \
Doxyfile.in Doxyfile-common.in Doxyfile-nucleus.in \
- Doxyfile-posix.in Doxyfile-rtdm.in
+ Doxyfile-cobalt.in Doxyfile-rtdm.in
if !CONFIG_XENO_DOC_DOX
HTML_DOCSDIR = $(srcdir)/../generated/html/
diff --git a/doc/doxygen/Makefile.in b/doc/doxygen/Makefile.in
index b593a15..27db1a8 100644
--- a/doc/doxygen/Makefile.in
+++ b/doc/doxygen/Makefile.in
@@ -34,8 +34,8 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-DIST_COMMON = $(srcdir)/Doxyfile-common.in \
- $(srcdir)/Doxyfile-nucleus.in $(srcdir)/Doxyfile-posix.in \
+DIST_COMMON = $(srcdir)/Doxyfile-cobalt.in \
+ $(srcdir)/Doxyfile-common.in $(srcdir)/Doxyfile-nucleus.in \
$(srcdir)/Doxyfile-rtdm.in $(srcdir)/Doxyfile.in \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/doc/install-dist.rules
@@ -54,7 +54,7 @@ am__configure_deps = $(am__aclocal_m4_deps)
$(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/lib/include/xeno_config.h
CONFIG_CLEAN_FILES = Doxyfile-common Doxyfile Doxyfile-nucleus \
- Doxyfile-posix Doxyfile-rtdm
+ Doxyfile-cobalt Doxyfile-rtdm
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
@@ -232,10 +232,10 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
HTML_DOCS = api api/search
-PDF_DOCS = nucleus-api.pdf posix-api.pdf rtdm-api.pdf
+PDF_DOCS = nucleus-api.pdf cobalt-api.pdf rtdm-api.pdf
EXTRA_DIST = \
Doxyfile.in Doxyfile-common.in Doxyfile-nucleus.in \
- Doxyfile-posix.in Doxyfile-rtdm.in
+ Doxyfile-cobalt.in Doxyfile-rtdm.in
@CONFIG_XENO_DOC_DOX_FALSE@HTML_DOCSDIR = $(srcdir)/../generated/html/
@CONFIG_XENO_DOC_DOX_TRUE@HTML_DOCSDIR = ./
@@ -282,7 +282,7 @@ Doxyfile: $(top_builddir)/config.status
$(srcdir)/Doxyfile.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
Doxyfile-nucleus: $(top_builddir)/config.status $(srcdir)/Doxyfile-nucleus.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-Doxyfile-posix: $(top_builddir)/config.status $(srcdir)/Doxyfile-posix.in
+Doxyfile-cobalt: $(top_builddir)/config.status $(srcdir)/Doxyfile-cobalt.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
Doxyfile-rtdm: $(top_builddir)/config.status $(srcdir)/Doxyfile-rtdm.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index a2357a0..71cb1e8 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -2,7 +2,6 @@
man1_MANS = \
clocktest.man \
cyclictest.man \
- klatency.man \
latency.man \
rtcanconfig.man \
rtcanrecv.man \
diff --git a/doc/man/Makefile.in b/doc/man/Makefile.in
index ac9d885..39bd7e7 100644
--- a/doc/man/Makefile.in
+++ b/doc/man/Makefile.in
@@ -248,7 +248,6 @@ top_srcdir = @top_srcdir@
man1_MANS = \
clocktest.man \
cyclictest.man \
- klatency.man \
latency.man \
rtcanconfig.man \
rtcanrecv.man \
diff --git a/doc/txt/Makefile.am b/doc/txt/Makefile.am
index d822037..65cfbd3 100644
--- a/doc/txt/Makefile.am
+++ b/doc/txt/Makefile.am
@@ -2,4 +2,4 @@ txtdocdir = $(docdir)/txt
dist_txtdoc_DATA = \
16550A-driver.txt \
- pse51-skin.txt
+ cobalt-skin.txt
diff --git a/doc/txt/Makefile.in b/doc/txt/Makefile.in
index a0f0e37..1a2aca7 100644
--- a/doc/txt/Makefile.in
+++ b/doc/txt/Makefile.in
@@ -241,7 +241,7 @@ top_srcdir = @top_srcdir@
txtdocdir = $(docdir)/txt
dist_txtdoc_DATA = \
16550A-driver.txt \
- pse51-skin.txt
+ cobalt-skin.txt
all: all-am
_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git
