From 5854d4968f6892bbf48109840500563e8b813866 Mon Sep 17 00:00:00 2001
From: Stef Walter <stefw@gnome.org>
Date: Tue, 3 Apr 2012 08:47:23 +0200
Subject: [PATCH] Don't distribute built sources

 * This caused problems with gdbus-codegen generated files

https://bugzilla.gnome.org/show_bug.cgi?id=673110
---
 gck/Makefile.am | 20 ++++++++++----------
 gcr/Makefile.am | 20 +++++++++-----------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/gck/Makefile.am b/gck/Makefile.am
index 95c39f7..fa2f04c 100644
--- a/gck/Makefile.am
+++ b/gck/Makefile.am
@@ -58,7 +58,9 @@ INTERNAL_FILES = \
 
 libgck_@GCK_MAJOR@_la_SOURCES = \
 	$(PUBLIC_FILES) \
-	$(INTERNAL_FILES) \
+	$(INTERNAL_FILES)
+
+nodist_libgck_@GCK_MAJOR@_la_SOURCES = \
 	$(BUILT_SOURCES)
 
 libgck_@GCK_MAJOR@_la_LDFLAGS = \
@@ -131,6 +133,9 @@ endif
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gck-$(GCK_MAJOR).pc
 
+gck-$(GCK_MAJOR).pc: gck.pc
+	cp gck.pc gck-$(GCK_MAJOR).pc
+
 gck-expected.abi: gck.symbols
 	$(AM_V_GEN) cpp -P $< | sort > $@
 
@@ -156,15 +161,10 @@ EXTRA_DIST = \
 	pkcs11-trust-assertions.h \
 	pkcs11i.h
 
-
 CLEANFILES = \
-	gck-actual.abi \
-	gck-expected.abi
-
-DISTCLEANFILES = \
 	gck-$(GCK_MAJOR).pc \
 	$(gir_DATA) \
-	$(typelibs_DATA)
-
-gck-$(GCK_MAJOR).pc: gck.pc
-	cp gck.pc gck-$(GCK_MAJOR).pc
+	$(typelibs_DATA) \
+	$(BUILT_SOURCES) \
+	gck-actual.abi \
+	gck-expected.abi
diff --git a/gcr/Makefile.am b/gcr/Makefile.am
index 82cbaf4..4671581 100644
--- a/gcr/Makefile.am
+++ b/gcr/Makefile.am
@@ -153,6 +153,9 @@ libgcr_base_@GCR_MAJOR@_la_SOURCES = \
 	gcr-types.h \
 	gcr-union-collection.c gcr-union-collection.h \
 	gcr-util.c gcr-util.h \
+	$(NULL)
+
+nodist_libgcr_base_@GCR_MAJOR@_la_SOURCES = \
 	$(BUILT_BASE_FILES)
 
 libgcr_@GCR_MAJOR@_la_SOURCES = \
@@ -193,6 +196,9 @@ libgcr_@GCR_MAJOR@_la_SOURCES = \
 	gcr-viewer.c gcr-viewer.h \
 	gcr-viewer-widget.c gcr-viewer-widget.h \
 	gcr-viewer-window.c gcr-viewer-window.h \
+	$(NULL)
+
+nodist_libgcr_@GCR_MAJOR@_la_SOURCES = \
 	$(BUILT_UI_FILES)
 
 libgcr_base_@GCR_MAJOR@_la_CFLAGS = \
@@ -414,15 +420,12 @@ EXTRA_DIST = \
 	gcr-oids.list \
 	gcr-mkoids \
 	$(ui_DATA) \
-	$(conf_DATA) \
-	org.gnome.keyring.Prompter.xml \
+	$(DBUS_XML_DEFINITIONS) \
 	gcr-enum-types.h.template \
 	gcr-enum-types.c.template \
 	gcr.symbols \
 	gcr-base.symbols \
 	$(desktop_in_in_files) \
-	$(desktop_in_files) \
-	$(desktop_DATA) \
 	$(service_in_files) \
 	$(mime_DATA)
 
@@ -432,14 +435,9 @@ CLEANFILES = \
 	$(service_DATA) \
 	$(desktop_in_files) \
 	$(desktop_DATA) \
+	$(gir_DATA) \
+	$(typelibs_DATA) \
 	gcr-actual.abi \
 	gcr-actual-base.abi \
 	gcr-expected.abi \
 	gcr-expected-base.abi
-
-DISTCLEANFILES = \
-	$(desktop_in_files) \
-	$(desktop_DATA) \
-	$(pkgconfig_DATA) \
-	$(gir_DATA) \
-	$(typelibs_DATA)
-- 
2.7.4