[Xfce4-commits] <xfconf:xfce-4.6> Fix make distcheck.

[Nick Schermer]

Updating branch refs/heads/xfce-4.6
         to 0f944b74df085cf801ab00ce2beb452828d19792 (commit)
       from d3db0951fde4706e40df80a207f8d8a07cf752c9 (commit)

commit 0f944b74df085cf801ab00ce2beb452828d19792
Author: Nick Schermer <nick at xfce.org>
Date:   Tue May 18 22:21:42 2010 +0200

    Fix make distcheck.

 Makefile.am                |   16 +++++++++-------
 common/Makefile.am         |    3 +++
 configure.ac.in            |    1 +
 docs/reference/Makefile.am |    3 +++
 po/POTFILES.in             |    1 +
 xfconf/Makefile.am         |   12 +++++++-----
 xfconfd/Makefile.am        |    3 +++
 7 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6773f06..24bbd6b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,13 +17,15 @@ ChangeLog: Makefile
 
 dist-hook: ChangeLog
 
-EXTRA_DIST = \
-	AUTHORS \
-	COPYING \
-	ChangeLog \
-	INSTALL \
-	NEWS \
-	README
+EXTRA_DIST =								\
+	intltool-extract.in						\
+	intltool-merge.in						\
+	intltool-update.in
+
+DISTCLEANFILES =							\
+	intltool-extract						\
+	intltool-merge							\
+	intltool-update
 
 DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-gtk-doc
diff --git a/common/Makefile.am b/common/Makefile.am
index 8e00d10..d4f47cd 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -73,3 +73,6 @@ EXTRA_DIST = \
 	xfconf-dbus.xml \
 	xfconf-marshal.list \
 	xfconf-types.c
+
+# required for gtk-doc
+dist-hook: all
diff --git a/configure.ac.in b/configure.ac.in
index a51a72b..32c718f 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -34,6 +34,7 @@ dnl check for basic programs
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_INSTALL
+AC_PROG_INTLTOOL
 AC_PROG_LIBTOOL
 AC_PROG_MAKE_SET
 AC_PROG_LN_S
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 1b22f66..eee63d0 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -78,4 +78,7 @@ if MAINTAINER_MODE
 	xsltproc -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 endif
 
+# required for gtk-doc
+dist-hook: all
+
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a5ab6e3..aead830 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,3 +5,4 @@ xfconfd/xfconf-backend.c
 xfconfd/main.c
 xfconfd/xfconf-daemon.c
 xfconf-query/main.c
+xfconf/xfconf-channel.c
diff --git a/xfconf/Makefile.am b/xfconf/Makefile.am
index bfd85eb..8a72e7b 100644
--- a/xfconf/Makefile.am
+++ b/xfconf/Makefile.am
@@ -53,13 +53,15 @@ BUILT_SOURCES = \
 xfconf-dbus-bindings.h: $(top_srcdir)/common/xfconf-dbus.xml Makefile
 	dbus-binding-tool --mode=glib-client $< > $@
 
-if HAVE_GNUC_VISIBILITY
-TESTS = abicheck.sh
 endif
 
-endif
-
-
 EXTRA_DIST = \
 	abicheck.sh \
 	xfconf.symbols
+
+if HAVE_GNUC_VISIBILITY
+TESTS = abicheck.sh
+endif
+
+# required for gtk-doc
+dist-hook: all
diff --git a/xfconfd/Makefile.am b/xfconfd/Makefile.am
index 611f401..28062ff 100644
--- a/xfconfd/Makefile.am
+++ b/xfconfd/Makefile.am
@@ -81,3 +81,6 @@ xfconf-dbus-server.h: $(top_srcdir)/common/xfconf-dbus.xml
 	dbus-binding-tool --mode=glib-server --prefix=xfconf $< > $@
 
 endif
+
+# required for gtk-doc
+dist-hook: all