GNOME.org
 

[gnome-keyring/trust-store] Add missing files to distribution.

commit 61b18c409fe27a173b301e1ef1c1392573a31db8
Author: Stef Walter <stefw collabora co uk>
Date:   Wed Dec 22 15:17:58 2010 +0000

    Add missing files to distribution.

 egg/tests/Makefile.am                 |    8 ++++----
 gck/tests/Makefile.am                 |    6 +++---
 gcr/tests/Makefile.am                 |    2 +-
 pkcs11/gkm/Makefile.am                |    1 +
 pkcs11/gkm/tests/Makefile.am          |    6 +++---
 pkcs11/gnome2-store/tests/Makefile.am |    2 +-
 pkcs11/roots-store/tests/Makefile.am  |    2 +-
 pkcs11/secret-store/tests/Makefile.am |    6 +++---
 pkcs11/ssh-store/tests/Makefile.am    |    2 +-
 pkcs11/xdg-store/Makefile.am          |    3 +++
 pkcs11/xdg-store/tests/Makefile.am    |    6 +++---
 testing/testing.make                  |    3 +++
 ui/tests/Makefile.am                  |    6 +++---
 13 files changed, 30 insertions(+), 23 deletions(-)
---
diff --git a/egg/tests/Makefile.am b/egg/tests/Makefile.am
index 013f0ef..a408ad2 100644
--- a/egg/tests/Makefile.am
+++ b/egg/tests/Makefile.am
@@ -24,15 +24,15 @@ UNIT_PROMPT =
 TESTING_LIBS =  \
 	$(top_builddir)/egg/libegg.la
 
-EXTRA_DIST = \
-	test.asn \
-	test-data
-
 include $(top_srcdir)/testing/testing.make
 
 BUILT_SOURCES += \
 	asn1-def-test.c
 
+EXTRA_DIST += \
+	test.asn \
+	test-data
+
 # ------------------------------------------------------------------------------
 
 noinst_PROGRAMS += \
diff --git a/gck/tests/Makefile.am b/gck/tests/Makefile.am
index 81632e7..eb3c243 100644
--- a/gck/tests/Makefile.am
+++ b/gck/tests/Makefile.am
@@ -21,11 +21,11 @@ TESTING_LIBS = \
 	$(top_builddir)/gck/libgck.la \
 	libmock-test-module.la
 
-EXTRA_DIST = \
-	gck-test.h
-
 include $(top_srcdir)/testing/testing.make
 
+EXTRA_DIST += \
+	gck-test.h
+
 # ------------------------------------------------------------------------
 
 lib_LTLIBRARIES = libmock-test-module.la
diff --git a/gcr/tests/Makefile.am b/gcr/tests/Makefile.am
index 3454af5..fab95d8 100644
--- a/gcr/tests/Makefile.am
+++ b/gcr/tests/Makefile.am
@@ -20,7 +20,7 @@ TESTING_FLAGS = \
 
 include $(top_srcdir)/testing/testing.make
 
-EXTRA_DIST = \
+EXTRA_DIST += \
 	test-data
 
 # ------------------------------------------------------------------
diff --git a/pkcs11/gkm/Makefile.am b/pkcs11/gkm/Makefile.am
index c618480..1d4516c 100644
--- a/pkcs11/gkm/Makefile.am
+++ b/pkcs11/gkm/Makefile.am
@@ -42,6 +42,7 @@ libgkm_la_SOURCES = \
 	gkm-null-key.c gkm-null-key.h \
 	gkm-null-mechanism.c gkm-null-mechanism.h \
 	gkm-object.c gkm-object.h \
+	gkm-oids.h \
 	gkm-private-xsa-key.c gkm-private-xsa-key.h \
 	gkm-public-xsa-key.c gkm-public-xsa-key.h \
 	gkm-rsa-mechanism.c gkm-rsa-mechanism.h \
diff --git a/pkcs11/gkm/tests/Makefile.am b/pkcs11/gkm/tests/Makefile.am
index c51b600..662fad9 100644
--- a/pkcs11/gkm/tests/Makefile.am
+++ b/pkcs11/gkm/tests/Makefile.am
@@ -26,8 +26,8 @@ TESTING_LIBS =  \
 	$(top_builddir)/pkcs11/gkm/libgkm.la \
 	$(top_builddir)/egg/libegg.la
 
-EXTRA_DIST = \
+include $(top_srcdir)/testing/testing.make
+
+EXTRA_DIST += \
 	test.asn \
 	test-data
-
-include $(top_srcdir)/testing/testing.make
diff --git a/pkcs11/gnome2-store/tests/Makefile.am b/pkcs11/gnome2-store/tests/Makefile.am
index 8c4fc02..458ee25 100644
--- a/pkcs11/gnome2-store/tests/Makefile.am
+++ b/pkcs11/gnome2-store/tests/Makefile.am
@@ -10,7 +10,7 @@ TESTING_LIBS = \
 
 include $(top_srcdir)/testing/testing.make
 
-EXTRA_DIST = \
+EXTRA_DIST += \
 	test-data \
 	p11-tests.conf
 
diff --git a/pkcs11/roots-store/tests/Makefile.am b/pkcs11/roots-store/tests/Makefile.am
index 8d102b4..e80f1cd 100644
--- a/pkcs11/roots-store/tests/Makefile.am
+++ b/pkcs11/roots-store/tests/Makefile.am
@@ -9,6 +9,6 @@ TESTING_LIBS = \
 
 include $(top_srcdir)/testing/testing.make
 
-EXTRA_DIST = \
+EXTRA_DIST += \
 	test-data \
 	p11-tests.conf
diff --git a/pkcs11/secret-store/tests/Makefile.am b/pkcs11/secret-store/tests/Makefile.am
index 3a4393a..ff14313 100644
--- a/pkcs11/secret-store/tests/Makefile.am
+++ b/pkcs11/secret-store/tests/Makefile.am
@@ -19,7 +19,7 @@ TESTING_LIBS =  \
 	$(top_builddir)/pkcs11/gkm/libgkm.la \
 	$(top_builddir)/egg/libegg.la
 
-EXTRA_DIST = \
-	test-data
-
 include $(top_srcdir)/testing/testing.make
+
+EXTRA_DIST += \
+	test-data
diff --git a/pkcs11/ssh-store/tests/Makefile.am b/pkcs11/ssh-store/tests/Makefile.am
index 382be4c..8f962d2 100644
--- a/pkcs11/ssh-store/tests/Makefile.am
+++ b/pkcs11/ssh-store/tests/Makefile.am
@@ -15,5 +15,5 @@ TESTING_LIBS =  \
 
 include $(top_srcdir)/testing/testing.make
 
-EXTRA_DIST = \
+EXTRA_DIST += \
 	test-data
diff --git a/pkcs11/xdg-store/Makefile.am b/pkcs11/xdg-store/Makefile.am
index 824c46b..25c092a 100644
--- a/pkcs11/xdg-store/Makefile.am
+++ b/pkcs11/xdg-store/Makefile.am
@@ -26,6 +26,9 @@ libgkm_xdg_store_la_SOURCES = \
 asn1-def-xdg.c: xdg.asn
 	$(ASN1PARSER) -o asn1-def-xdg.c $(srcdir)/xdg.asn
 
+EXTRA_DIST = \
+	xdg.asn
+
 # ------------------------------------------------------------------------------
 # The standalone module
 
diff --git a/pkcs11/xdg-store/tests/Makefile.am b/pkcs11/xdg-store/tests/Makefile.am
index a2864c3..51ef887 100644
--- a/pkcs11/xdg-store/tests/Makefile.am
+++ b/pkcs11/xdg-store/tests/Makefile.am
@@ -12,12 +12,12 @@ TESTING_LIBS =  \
 	$(top_builddir)/pkcs11/gkm/libgkm.la \
 	$(top_builddir)/egg/libegg.la
 
-EXTRA_DIST = \
+include $(top_srcdir)/testing/testing.make
+
+EXTRA_DIST += \
 	p11-tests.conf \
 	test-data
 
-include $(top_srcdir)/testing/testing.make
-
 # ------------------------------------------------------------------------------
 
 noinst_PROGRAMS += \
diff --git a/testing/testing.make b/testing/testing.make
index 0b0ec2b..cfc9c0e 100644
--- a/testing/testing.make
+++ b/testing/testing.make
@@ -65,6 +65,9 @@ CLEANFILES = \
 	$(PREPROCESSED) \
 	$(BUILT_SOURCES)
 
+EXTRA_DIST = \
+	$(TESTING_FILES)
+
 # ------------------------------------------------------------------------------
 # Run the tests
 
diff --git a/ui/tests/Makefile.am b/ui/tests/Makefile.am
index 60b7662..cf2c530 100644
--- a/ui/tests/Makefile.am
+++ b/ui/tests/Makefile.am
@@ -8,7 +8,7 @@ TESTING_LIBS =  \
 	$(top_builddir)/ui/libgku-prompt.la \
 	$(top_builddir)/egg/libegg-prompt.la
 
-EXTRA_DIST = \
-	test-data
-
 include $(top_srcdir)/testing/testing.make
+
+EXTRA_DIST += \
+	test-data
\ No newline at end of file
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]