[mm-common] Distribute doctools if non-empty parameter is passed to MM_CONFIG_DOCTOOL_DIR.



commit 7cc24030b988f503512d3177d5203b88a4abaa9f
Author: Krzesimir Nowak <qdlacz gmail com>
Date:   Sun Mar 27 18:20:12 2011 +0200

    Distribute doctools if non-empty parameter is passed to MM_CONFIG_DOCTOOL_DIR.
    
    * macros/mm-doc.m4:
    * build/doc-reference.am: If non-empty parameter is passed to
    MM_CONFIG_DOCTOOL_DIR then mm-common-prepare will copy doctools
    to given directory. These files are needed during install stage,
    so they need to be distributed. This way we don't need to add
    some lines to Makefile.am in every project using mm-common. Which
    we did, anyway.

 build/doc-reference.am |    6 +++++-
 macros/mm-doc.m4       |   11 +++++------
 2 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/build/doc-reference.am b/build/doc-reference.am
index db8f98b..c99ccc7 100644
--- a/build/doc-reference.am
+++ b/build/doc-reference.am
@@ -1,4 +1,4 @@
-## Copyright (c) 2009  Openismus GmbH  <http://www.openismus.com/>
+## Copyright (c) 2009, 2011  Openismus GmbH  <http://www.openismus.com/>
 ##
 ## This file is part of mm-common.
 ##
@@ -77,6 +77,10 @@ doc_inst_files   =
 doc_dist_files   =
 endif
 
+if DIST_DOCTOOLS
+doc_dist_files   += $(MMDOCTOOLDIR)/doc-postprocess.pl $(MMDOCTOOLDIR)/doc-install.pl $(MMDOCTOOLDIR)/tagfile-to-devhelp2.xsl $(MMDOCTOOLDIR)/doxygen.css
+endif
+
 dist_reference_DATA = $(strip $(doc_inst_files))
 dist_noinst_DATA    = $(strip $(doc_dist_files))
 
diff --git a/macros/mm-doc.m4 b/macros/mm-doc.m4
index 5c105f3..1e89f7d 100644
--- a/macros/mm-doc.m4
+++ b/macros/mm-doc.m4
@@ -1,4 +1,4 @@
-## Copyright (c) 2009-2010  Openismus GmbH  <http://www.openismus.com/>
+## Copyright (c) 2009, 2010, 2011  Openismus GmbH  <http://www.openismus.com/>
 ##
 ## This file is part of mm-common.
 ##
@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with mm-common.  If not, see <http://www.gnu.org/licenses/>.
 
-#serial 20100107
+#serial 20110327
 
 ## _MM_CONFIG_DOCTOOL_DIR
 ##
@@ -52,16 +52,15 @@ AC_MSG_RESULT([$MMDOCTOOLDIR])[]dnl
 ## the source tree.
 ##
 ## The directory name is used by mm-common-prepare as the destination
-## for copying the required files into the source tree.  If you make
-## use of this feature in order to avoid a dependency on mm-common, make
-## sure to include the installed files in the distribution tarball of
-## your package.
+## for copying the required files into the source tree.  The files are not
+## distributed if first parameter is empty.
 ##
 AC_DEFUN([MM_CONFIG_DOCTOOL_DIR],
 [dnl
 AC_REQUIRE([_MM_PRE_INIT])[]dnl
 AC_REQUIRE([MM_CHECK_GNU_MAKE])[]dnl
 m4_ifval([$1], [MMDOCTOOLDIR='[$]{top_srcdir}/$1'], [AC_REQUIRE([_MM_CONFIG_DOCTOOL_DIR])])
+AM_CONDITIONAL([DIST_DOCTOOLS], [test 'x$1' != 'x'])dnl
 AC_SUBST([MMDOCTOOLDIR])[]dnl
 ])
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]