From dacb788a6db8dfc1824aecd1d8d5977348c74b22 Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz@redhat.com>
Date: Tue, 31 May 2011 15:14:16 -0400
Subject: Fix 'make distcheck'

For some values of 'fix', anyway

Signed-off-by: David Zeuthen <davidz@redhat.com>
---
 Makefile.am                |  5 ++++-
 doc/Makefile.am            |  8 ++++++++
 po/POTFILES.in             | 11 +++++++++++
 src/goa/Makefile.am        |  6 ++++++
 src/goabackend/Makefile.am |  3 +++
 5 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 5ad462e..396c111 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,8 @@
 
 NULL =
 
-SUBDIRS = data src doc
+SUBDIRS = data src doc po
+
+# introspection and docs doesn't work with src != build
+DISTCHECK_CONFIGURE_FLAGS=--disable-introspection --disable-gtk-doc
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index eae3bfe..43fb8d4 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -65,9 +65,16 @@ man_MANS = 			\
 .xml.8:
 	$(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
+if ENABLE_GTK_DOC
 include $(top_srcdir)/gtk-doc.make
+else
+EXTRA_DIST =
+CLEANFILES =
+endif
 
 EXTRA_DIST +=			\
+	goa-daemon.xml		\
+	goa-overview.xml	\
 	version.xml.in		\
 	$(NULL)
 
@@ -85,5 +92,6 @@ CLEANFILES +=   		\
 	$(DOC_MODULE).prerequisites	\
 	$(DOC_MODULE).signals		\
 	*.stamp				\
+	*.8				\
 	-rf xml html tmpl		\
 	$(NULL)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index efeb5b3..9a48cb8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,14 @@
 [encoding: UTF-8]
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
+data/goa-prefs.desktop.in
+data/goapanel.ui
+src/daemon/goadaemon.c
+src/goabackend/goafacebookprovider.c
+src/goabackend/goagoogleprovider.c
+src/goabackend/goaoauth2provider.c
+src/goabackend/goaoauthprovider.c
+src/goabackend/goaprovider.c
+src/goabackend/goatwitterprovider.c
+src/goabackend/goayahooprovider.c
+src/panel/goapanel.c
diff --git a/src/goa/Makefile.am b/src/goa/Makefile.am
index cc92b9b..8ab39eb 100644
--- a/src/goa/Makefile.am
+++ b/src/goa/Makefile.am
@@ -1,6 +1,7 @@
 
 NULL =
 CLEANFILES =
+EXTRA_DIST =
 
 INCLUDES = 							\
 	-I$(top_builddir)/src -I$(top_srcdir)/src		\
@@ -46,6 +47,8 @@ enum_built_sources =							\
 	goaenumtypes.h			goaenumtypes.c			\
 	$(NULL)
 
+EXTRA_DIST += goaenumtypes.h.template goaenumtypes.c.template
+
 # ----------------------------------------------------------------------------------------------------
 
 lib_LTLIBRARIES = libgoa-1.0.la
@@ -113,6 +116,9 @@ Goa-1.0.gir: libgoa-1.0.la $(INTROSPECTION_SCANNER) Makefile.am
 		--libtool=$(top_builddir)/libtool		\
 		--c-include='goa/goa.h'				\
                 -I$(top_srcdir)/src	 			\
+                -I$(top_srcdir)/src/goa	 			\
+                -I$(top_builddir)/src	 			\
+                -I$(top_builddir)/src/goa 			\
 	        -DGOA_COMPILATION                   		\
 		$(libgoa_1_0_la_SOURCES)			\
 		$(NULL)
diff --git a/src/goabackend/Makefile.am b/src/goabackend/Makefile.am
index e8b83aa..4af0a13 100644
--- a/src/goabackend/Makefile.am
+++ b/src/goabackend/Makefile.am
@@ -1,6 +1,7 @@
 
 NULL =
 CLEANFILES =
+EXTRA_DIST =
 
 INCLUDES = 							\
 	-I$(top_builddir)/src -I$(top_srcdir)/src		\
@@ -32,6 +33,8 @@ enum_built_sources =							\
 	goabackendenumtypes.h		goabackendenumtypes.c		\
 	$(NULL)
 
+EXTRA_DIST += goabackendenumtypes.h.template goabackendenumtypes.c.template
+
 # ----------------------------------------------------------------------------------------------------
 
 lib_LTLIBRARIES = libgoa-backend-1.0.la
-- 
cgit v1.2.3