[atkmm] Avoid a tarball dependency on mm-common.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [atkmm] Avoid a tarball dependency on mm-common.
- Date: Fri, 25 Mar 2011 12:53:03 +0000 (UTC)
commit 11577aa3ae831dde4ca5ad70253f983fbedc0efc
Author: Murray Cumming <murrayc murrayc com>
Date: Fri Mar 25 13:52:58 2011 +0100
Avoid a tarball dependency on mm-common.
* configure.ac: Add a call to MM_CONFIG_DOCTOOL_DIR() telling it to
copy the files locally and use them from there.
* doc/Makefile.am: Dist the copied files, so that the build does not
try to use the versions installed by mm-common.
ChangeLog | 9 +++++++++
configure.ac | 5 +++++
doc/Makefile.am | 7 +++++++
3 files changed, 21 insertions(+), 0 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 7e740a9..0c4fe4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-03-25 Murray Cumming <murrayc murrayc com>
+
+ Avoid a tarball dependency on mm-common.
+
+ * configure.ac: Add a call to MM_CONFIG_DOCTOOL_DIR() telling it to
+ copy the files locally and use them from there.
+ * doc/Makefile.am: Dist the copied files, so that the build does not
+ try to use the versions installed by mm-common.
+
2.22.3:
Just a tarball regeneration due to a changed m4 macro in mm-common.
diff --git a/configure.ac b/configure.ac
index 1ba1168..7f26233 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,6 +36,11 @@ AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
MM_PREREQ([0.9])
MM_INIT_MODULE([atkmm-1.6])
+# Copy the mm-common .pl scripts into docs/,
+# and use them from there,
+# so we can dist them to avoid a tarball-build dependency.
+MM_CONFIG_DOCTOOL_DIR([doc])
+
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
AC_SUBST([ATKMM_SO_VERSION], [2:0:1])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a800a4d..f3110eb 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -24,3 +24,10 @@ book_name = $(ATKMM_MODULE_NAME)
doc_input = $(top_srcdir)/atk/atkmm.h $(addprefix $(top_srcdir)/atk/atkmm/,$(atkmm_files_h))
include $(top_srcdir)/build/doc-reference.am
+
+# These are copied here by mm-common:
+dist_noinst_DATA += \
+ doc-install.pl \
+ doc-postprocess.pl \
+ tagfile-to-devhelp2.xsl \
+ doxygen.css
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]