Module: xenomai-forge Branch: next Commit: 1a23e839aa4fc2f50119869ea40fcbc672a137d5 URL: http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=1a23e839aa4fc2f50119869ea40fcbc672a137d5
Author: Philippe Gerum <r...@xenomai.org> Date: Fri Jun 20 11:16:02 2014 +0200 doc/doxygen: rename programmer's reference manual --- configure | 8 +++---- configure.ac | 6 ++--- doc/doxygen/Makefile.am | 10 ++++---- doc/doxygen/Makefile.in | 24 ++++++++++---------- ...nual-common.conf.in => xeno3prm-common.conf.in} | 0 .../{manual-html.conf.in => xeno3prm-html.conf.in} | 4 ++-- .../{manual-pdf.conf.in => xeno3prm-pdf.conf.in} | 4 ++-- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/configure b/configure index 04cdc47..26b8e50 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/manual-common.conf doc/doxygen/manual-html.conf doc/doxygen/manual-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-pdf.conf doc/asciidoc/Makefile" fi @@ -15257,9 +15257,9 @@ do "include/psos/Makefile") CONFIG_FILES="$CONFIG_FILES include/psos/Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "doc/doxygen/Makefile") CONFIG_FILES="$CONFIG_FILES doc/doxygen/Makefile" ;; - "doc/doxygen/manual-common.conf") CONFIG_FILES="$CONFIG_FILES doc/doxygen/manual-common.conf" ;; - "doc/doxygen/manual-html.conf") CONFIG_FILES="$CONFIG_FILES doc/doxygen/manual-html.conf" ;; - "doc/doxygen/manual-pdf.conf") CONFIG_FILES="$CONFIG_FILES doc/doxygen/manual-pdf.conf" ;; + "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/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 a6273f6..eb24a3c 100644 --- a/configure.ac +++ b/configure.ac @@ -879,9 +879,9 @@ if test \! x$XENO_RUN_DOC = x ; then AC_CONFIG_FILES([ \ doc/Makefile \ doc/doxygen/Makefile \ - doc/doxygen/manual-common.conf \ - doc/doxygen/manual-html.conf \ - doc/doxygen/manual-pdf.conf \ + doc/doxygen/xeno3prm-common.conf \ + doc/doxygen/xeno3prm-html.conf \ + doc/doxygen/xeno3prm-pdf.conf \ doc/asciidoc/Makefile \ ]) fi diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am index a40188b..c29e586 100644 --- a/doc/doxygen/Makefile.am +++ b/doc/doxygen/Makefile.am @@ -1,6 +1,6 @@ -HTML_DOCS = manual-html manual-html/search -PDF_DOCS = manual.pdf -EXTRA_DIST = manual-common.conf.in manual-html.conf.in manual-pdf.conf.in +HTML_DOCS = xeno3prm-html xeno3prm-html/search +PDF_DOCS = xeno3prm.pdf +EXTRA_DIST = xeno3prm-common.conf.in xeno3prm-html.conf.in xeno3prm-pdf.conf.in if !XENO_BUILD_DOC HTML_DOCSDIR = $(srcdir)/../prebuilt/html/ @@ -20,7 +20,7 @@ html: $(HTML_DOCS) pdf: $(PDF_DOCS) -manual-html: +xeno3prm-html: $(DOXYGEN) $@.conf %.pdf: FORCE @@ -33,7 +33,7 @@ distclean-local: if test -d $$dir ; then $(RM) -R $$dir ; fi ; \ done -.PHONY: manual-html FORCE +.PHONY: xeno3prm-html FORCE .DELETE_ON_ERROR: diff --git a/doc/doxygen/Makefile.in b/doc/doxygen/Makefile.in index 44a1300..4b811ab 100644 --- a/doc/doxygen/Makefile.in +++ b/doc/doxygen/Makefile.in @@ -80,8 +80,8 @@ host_triplet = @host@ target_triplet = @target@ DIST_COMMON = $(top_srcdir)/doc/install-dist.rules \ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(srcdir)/manual-common.conf.in $(srcdir)/manual-html.conf.in \ - $(srcdir)/manual-pdf.conf.in + $(srcdir)/xeno3prm-common.conf.in \ + $(srcdir)/xeno3prm-html.conf.in $(srcdir)/xeno3prm-pdf.conf.in subdir = doc/doxygen ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/ac_prog_cc_for_build.m4 \ @@ -95,8 +95,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/xeno_config.h -CONFIG_CLEAN_FILES = manual-common.conf manual-html.conf \ - manual-pdf.conf +CONFIG_CLEAN_FILES = xeno3prm-common.conf xeno3prm-html.conf \ + xeno3prm-pdf.conf CONFIG_CLEAN_VPATH_FILES = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -295,9 +295,9 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -HTML_DOCS = manual-html manual-html/search -PDF_DOCS = manual.pdf -EXTRA_DIST = manual-common.conf.in manual-html.conf.in manual-pdf.conf.in +HTML_DOCS = xeno3prm-html xeno3prm-html/search +PDF_DOCS = xeno3prm.pdf +EXTRA_DIST = xeno3prm-common.conf.in xeno3prm-html.conf.in xeno3prm-pdf.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/ @@ -338,11 +338,11 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -manual-common.conf: $(top_builddir)/config.status $(srcdir)/manual-common.conf.in +xeno3prm-common.conf: $(top_builddir)/config.status $(srcdir)/xeno3prm-common.conf.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -manual-html.conf: $(top_builddir)/config.status $(srcdir)/manual-html.conf.in +xeno3prm-html.conf: $(top_builddir)/config.status $(srcdir)/xeno3prm-html.conf.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -manual-pdf.conf: $(top_builddir)/config.status $(srcdir)/manual-pdf.conf.in +xeno3prm-pdf.conf: $(top_builddir)/config.status $(srcdir)/xeno3prm-pdf.conf.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: @@ -519,7 +519,7 @@ uninstall-am: uninstall-local @XENO_BUILD_DOC_TRUE@pdf: $(PDF_DOCS) -@XENO_BUILD_DOC_TRUE@manual-html: +@XENO_BUILD_DOC_TRUE@xeno3prm-html: @XENO_BUILD_DOC_TRUE@ $(DOXYGEN) $@.conf @XENO_BUILD_DOC_TRUE@%.pdf: FORCE @@ -532,7 +532,7 @@ uninstall-am: uninstall-local @XENO_BUILD_DOC_TRUE@ if test -d $$dir ; then $(RM) -R $$dir ; fi ; \ @XENO_BUILD_DOC_TRUE@ done -@XENO_BUILD_DOC_TRUE@.PHONY: manual-html FORCE +@XENO_BUILD_DOC_TRUE@.PHONY: xeno3prm-html FORCE @XENO_BUILD_DOC_TRUE@.DELETE_ON_ERROR: diff --git a/doc/doxygen/manual-common.conf.in b/doc/doxygen/xeno3prm-common.conf.in similarity index 100% rename from doc/doxygen/manual-common.conf.in rename to doc/doxygen/xeno3prm-common.conf.in diff --git a/doc/doxygen/manual-html.conf.in b/doc/doxygen/xeno3prm-html.conf.in similarity index 99% rename from doc/doxygen/manual-html.conf.in rename to doc/doxygen/xeno3prm-html.conf.in index e9372f5..4c561e1 100644 --- a/doc/doxygen/manual-html.conf.in +++ b/doc/doxygen/xeno3prm-html.conf.in @@ -1,4 +1,4 @@ -@INCLUDE = manual-common.conf +@INCLUDE = xeno3prm-common.conf # If the GENERATE_HTML tag is set to YES (the default) Doxygen will # generate HTML output. @@ -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 = manual-html +HTML_OUTPUT = xeno3prm-html # 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/manual-pdf.conf.in b/doc/doxygen/xeno3prm-pdf.conf.in similarity index 98% rename from doc/doxygen/manual-pdf.conf.in rename to doc/doxygen/xeno3prm-pdf.conf.in index fc3de56..82174cb 100644 --- a/doc/doxygen/manual-pdf.conf.in +++ b/doc/doxygen/xeno3prm-pdf.conf.in @@ -1,4 +1,4 @@ -@INCLUDE = manual-common.conf +@INCLUDE = xeno3prm-common.conf # If the GENERATE_HTML tag is set to YES (the default) Doxygen will # generate HTML output. @@ -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 = manual-latex +LATEX_OUTPUT = xeno3prm-latex # 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. _______________________________________________ Xenomai-git mailing list Xenomai-git@xenomai.org http://www.xenomai.org/mailman/listinfo/xenomai-git