/pidgin/main: b6d82f891592: Fix make dist dependency tree

[Tomasz Wasilczyk]

Changeset: b6d82f891592d5e4b34bd676d47111030b3b0bf8
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-02-25 10:08 +0100
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/b6d82f891592

Description:

Fix make dist dependency tree

diffstat:

 Makefile.am                         |  25 +++++++++++++++++++++++++
 doc/reference/finch/Makefile.am     |   2 ++
 doc/reference/libpurple/Makefile.am |   2 ++
 doc/reference/pidgin/Makefile.am    |   2 ++
 pidgin/Makefile.am                  |   2 ++
 5 files changed, 33 insertions(+), 0 deletions(-)

diffs (83 lines):

diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,6 +20,31 @@ EXTRA_DIST = \
 
 noinst_HEADERS = config.h package_revision.h
 
+dist-pre-hook: package_revision.h
+if !ENABLE_GTK_DOC
+	$(AM_V_at)echo "error: gtk-doc must be installed and enabled in order to make dist"
+	$(AM_V_at)echo "re-run ./configure with --enable-gtk-doc switch and try again"
+	$(AM_V_at)false
+endif
+	$(AM_V_at)if [ ! -f "$(top_builddir)libpurple/libpurple.la" ]; then \
+		$(MAKE) -C libpurple libpurple.la; \
+	fi
+if ENABLE_GNT
+	$(AM_V_at)if [ ! -f "$(top_builddir)finch/libgnt/libgnt.la" ]; then \
+		$(MAKE) -C finch/libgnt libgnt.la; \
+	fi
+	$(AM_V_at)if [ ! -f "$(top_builddir)finch/libfinch.la" ]; then \
+		$(MAKE) -C finch libfinch.la; \
+	fi
+endif
+if ENABLE_GTK
+	$(AM_V_at)if [ ! -f "$(top_builddir)pidgin/libpidgin.la" ]; then \
+		$(MAKE) -C pidgin libpidgin.la; \
+	fi
+endif
+
+dist: dist-pre-hook
+
 dist-hook:
 	rm $(distdir)/config.h
 
diff --git a/doc/reference/finch/Makefile.am b/doc/reference/finch/Makefile.am
--- a/doc/reference/finch/Makefile.am
+++ b/doc/reference/finch/Makefile.am
@@ -120,6 +120,8 @@ EXTRA_DIST += version.xml.in
 # for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
 DISTCLEANFILES = $(DOC_MODULE).types $(DOC_MODULE)-sections.txt
 
+dist-hook: html-build.stamp
+
 # Comment this out if you want 'make check' to test you doc status
 # and run some sanity checks
 if ENABLE_GTK_DOC
diff --git a/doc/reference/libpurple/Makefile.am b/doc/reference/libpurple/Makefile.am
--- a/doc/reference/libpurple/Makefile.am
+++ b/doc/reference/libpurple/Makefile.am
@@ -163,6 +163,8 @@ EXTRA_DIST += version.xml.in
 # for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
 DISTCLEANFILES = $(DOC_MODULE).types $(DOC_MODULE)-sections.txt
 
+dist-hook: html-build.stamp
+
 # Comment this out if you want 'make check' to test you doc status
 # and run some sanity checks
 if ENABLE_GTK_DOC
diff --git a/doc/reference/pidgin/Makefile.am b/doc/reference/pidgin/Makefile.am
--- a/doc/reference/pidgin/Makefile.am
+++ b/doc/reference/pidgin/Makefile.am
@@ -137,6 +137,8 @@ EXTRA_DIST += version.xml.in
 # for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
 DISTCLEANFILES = $(DOC_MODULE).types $(DOC_MODULE)-sections.txt
 
+dist-hook: html-build.stamp
+
 # Comment this out if you want 'make check' to test you doc status
 # and run some sanity checks
 if ENABLE_GTK_DOC
diff --git a/pidgin/Makefile.am b/pidgin/Makefile.am
--- a/pidgin/Makefile.am
+++ b/pidgin/Makefile.am
@@ -161,6 +161,8 @@ CLEANFILES = gtkdebug.html.h
 	$(AM_V_at)$(sedpath) -e 's/^[ 	]\+//g' -e 's/[ 	]\+/ /g' $< | $(xxdpath) -i | sed -e 's/\(0x[0-9a-f][0-9a-f]\)$$/\1, 0x00/' >> $@
 	$(AM_V_at)echo "};" >> $@
 
+gtkdebug.c: gtkdebug.html.h
+
 libpidgin_la_DEPENDENCIES = @LIBOBJS@
 libpidgin_la_LDFLAGS = -export-dynamic
 libpidgin_la_LIBADD = \