[PATCH] fix "make dist" with gtk-doc enabled

[Stepan Kasal]

The gtkdoc-scan command needs libpackagekit.la; add rules to ensure that.
(Thanks to Robin Norwood for reporting the bug and to Thomas Wood for
analysing it.)
---
 docs/api/Makefile.am      |   10 +++++++++-
 libpackagekit/Makefile.am |    9 +++++++++
 2 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am
index f0048c0..9cb243e 100644
--- a/docs/api/Makefile.am
+++ b/docs/api/Makefile.am
@@ -32,8 +32,10 @@ MKTMPL_OPTIONS=
 FIXXREF_OPTIONS=
 
 # Used for dependencies. The docs will be rebuilt if any of these change.
+# Actually, these are the only hooks into pre-requisities, so we are forced to
+# abuse them...
 HFILE_GLOB=$(top_srcdir)/libpackagekit/*.h
-CFILE_GLOB=$(top_srcdir)/libpackagekit/*.c
+CFILE_GLOB=$(top_srcdir)/libpackagekit/*.c $(PK_LIBS)
 
 # Header files to ignore when scanning.
 IGNORE_HFILES =						\
@@ -64,8 +66,14 @@ INCLUDES =						\
 	-I$(top_srcdir)/libgbus				\
 	$(NULL)
 
+# Hooked to pre-requisites (see above).
+# But do not forget the rule.
 PK_LIBS = $(top_builddir)/libpackagekit/libpackagekit.la
 
+$(top_builddir)/libpackagekit/libpackagekit.la:
+	cd $(top_builddir)/libpackagekit; \
+		$(MAKE) $(AM_MAKEFLAGS) pk-marshal.h libpackagekit.la
+
 GTKDOC_LIBS =						\
 	$(GLIB_LIBS)					\
 	$(DBUS_LIBS)					\
diff --git a/libpackagekit/Makefile.am b/libpackagekit/Makefile.am
index 86ccc5b..992d740 100644
--- a/libpackagekit/Makefile.am
+++ b/libpackagekit/Makefile.am
@@ -21,6 +21,15 @@ SELFTEST_LIBS =							\
 	$(top_builddir)/libselftest/libselftest.la		\
 	$(NULL)
 
+## Ensure the above exist (and hope they are up-to date)--that's the
+## price for recursive make.
+$(top_builddir)/libgbus/libgbus.la:
+	cd $(top_builddir)/libgbus; \
+		$(MAKE) $(AM_MAKEFLAGS) libgbus-marshal.h libgbus.la
+$(top_builddir)/libgbus/libselftest.la:
+	cd $(top_builddir)/libselftest; \
+		$(MAKE) $(AM_MAKEFLAGS) libselftest.la
+
 PK_LIBS =							\
 	$(top_builddir)/libpackagekit/libpackagekit.la		\
 	$(NULL)
-- 
1.5.4.1


--ibTvN161/egqYuK8
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="0002-do-not-build-pk-marshal-in-src.patch"