[libpeas] Fix make distcheck

From: Garrett Regier <gregier src gnome org>
To: commits-list gnome org
Cc:
Subject: [libpeas] Fix make distcheck
Date: Fri, 18 Feb 2011 01:08:00 +0000 (UTC)
commit 45b1374e3893fedb3750c3f9d441e71d2898130b
Author: Garrett Regier <alias301 gmail com>
Date:   Tue Feb 15 03:37:35 2011 -0800

    Fix make distcheck

 tests/Makefile.plugin                              |   11 +++++++++++
 tests/libpeas-gtk/plugins/Makefile.am              |    7 +++++--
 .../plugins/builtin-configurable/Makefile.am       |    7 +++++--
 tests/libpeas-gtk/plugins/configurable/Makefile.am |    7 +++++--
 .../plugins/valid-custom-icon/Makefile.am          |    8 ++++++--
 tests/libpeas-gtk/testing/Makefile.am              |    3 ++-
 tests/libpeas-gtk/testing/testing.c                |    6 ++++--
 tests/libpeas/plugins/Makefile.am                  |    7 +++++--
 tests/libpeas/plugins/extension-c/Makefile.am      |    7 +++++--
 tests/libpeas/plugins/extension-python/Makefile.am |   10 ++++++++--
 tests/libpeas/plugins/extension-seed/Makefile.am   |    7 +++++--
 tests/libpeas/testing/Makefile.am                  |    3 ++-
 tests/libpeas/testing/testing.c                    |    6 ++++--
 tests/plugins/Makefile.am                          |    7 +++++--
 tests/plugins/builtin/Makefile.am                  |    7 +++++--
 tests/plugins/has-dep/Makefile.am                  |    7 +++++--
 tests/plugins/loadable/Makefile.am                 |    7 +++++--
 tests/plugins/self-dep/Makefile.am                 |    7 +++++--
 18 files changed, 92 insertions(+), 32 deletions(-)
---
diff --git a/tests/Makefile.plugin b/tests/Makefile.plugin
new file mode 100644
index 0000000..640c4ef
--- /dev/null
+++ b/tests/Makefile.plugin
@@ -0,0 +1,11 @@
+# Because some files are needed by plugins
+# in the buildir like .plugin files this
+# copies them to the builddir if they don't
+# exist so that make distcheck works.
+all-local:
+	@test -z "$(noinst_PLUGIN)" || \
+	 for plugin in $(noinst_PLUGIN) ; do \
+	   if ! test -e $(builddir)/$$plugin ; then \
+	     cp -p $(srcdir)/$$plugin $(builddir)/ ; \
+	   fi ; \
+	 done
diff --git a/tests/libpeas-gtk/plugins/Makefile.am b/tests/libpeas-gtk/plugins/Makefile.am
index 9137b9f..c9756a8 100644
--- a/tests/libpeas-gtk/plugins/Makefile.am
+++ b/tests/libpeas-gtk/plugins/Makefile.am
@@ -1,8 +1,11 @@
+include $(top_srcdir)/tests/Makefile.plugin
+
 SUBDIRS = builtin-configurable configurable valid-custom-icon
 
-noinst_DATA = \
+noinst_PLUGIN = \
 	invalid-custom-icon.plugin	\
 	invalid-stock-icon.plugin	\
 	valid-stock-icon.plugin
 
-EXTRA_DIST = $(noinst_DATA)
+EXTRA_DIST = $(noinst_PLUGIN)
+DISTCLEANFILES = $(noinst_PLUGIN)
diff --git a/tests/libpeas-gtk/plugins/builtin-configurable/Makefile.am b/tests/libpeas-gtk/plugins/builtin-configurable/Makefile.am
index 453e37d..a7ef96c 100644
--- a/tests/libpeas-gtk/plugins/builtin-configurable/Makefile.am
+++ b/tests/libpeas-gtk/plugins/builtin-configurable/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/tests/Makefile.plugin
+
 INCLUDES = \
 	-I$(top_srcdir)		\
 	$(PEAS_CFLAGS)		\
@@ -16,6 +18,7 @@ libbuiltin_configurable_la_SOURCES = \
 libbuiltin_configurable_la_LDFLAGS = $(TEST_PLUGIN_LIBTOOL_FLAGS)
 libbuiltin_configurable_la_LIBADD  = $(PEAS_LIBS) $(PEAS_GTK_LIBS)
 
-noinst_DATA = builtin-configurable.plugin
+noinst_PLUGIN = builtin-configurable.plugin
 
-EXTRA_DIST = $(noinst_DATA)
+EXTRA_DIST = $(noinst_PLUGIN)
+DISTCLEANFILES = $(noinst_PLUGIN)
diff --git a/tests/libpeas-gtk/plugins/configurable/Makefile.am b/tests/libpeas-gtk/plugins/configurable/Makefile.am
index f7daac5..55cf7d9 100644
--- a/tests/libpeas-gtk/plugins/configurable/Makefile.am
+++ b/tests/libpeas-gtk/plugins/configurable/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/tests/Makefile.plugin
+
 INCLUDES = \
 	-I$(top_srcdir)		\
 	$(PEAS_CFLAGS)		\
@@ -14,6 +16,7 @@ libconfigurable_la_SOURCES = \
 libconfigurable_la_LDFLAGS = $(TEST_PLUGIN_LIBTOOL_FLAGS)
 libconfigurable_la_LIBADD  = $(PEAS_LIBS) $(PEAS_GTK_LIBS)
 
-noinst_DATA = configurable.plugin
+noinst_PLUGIN = configurable.plugin
 
-EXTRA_DIST = $(noinst_DATA)
+EXTRA_DIST = $(noinst_PLUGIN)
+DISTCLEANFILES = $(noinst_PLUGIN)
diff --git a/tests/libpeas-gtk/plugins/valid-custom-icon/Makefile.am b/tests/libpeas-gtk/plugins/valid-custom-icon/Makefile.am
index dd94ec5..48b6a7d 100644
--- a/tests/libpeas-gtk/plugins/valid-custom-icon/Makefile.am
+++ b/tests/libpeas-gtk/plugins/valid-custom-icon/Makefile.am
@@ -1,3 +1,7 @@
-noinst_DATA = valid-custom-icon.plugin
+include $(top_srcdir)/tests/Makefile.plugin
 
-EXTRA_DIST = $(noinst_DATA)
+noinst_DATA = exists.png
+noinst_PLUGIN = valid-custom-icon.plugin
+
+EXTRA_DIST = $(noinst_DATA) $(noinst_PLUGIN)
+DISTCLEANFILES = $(noinst_PLUGIN)
diff --git a/tests/libpeas-gtk/testing/Makefile.am b/tests/libpeas-gtk/testing/Makefile.am
index 117a1ac..d7a3a63 100644
--- a/tests/libpeas-gtk/testing/Makefile.am
+++ b/tests/libpeas-gtk/testing/Makefile.am
@@ -7,7 +7,8 @@ INCLUDES = \
 	$(PEAS_GTK_CFLAGS)			\
 	$(WARN_CFLAGS)				\
 	$(DISABLE_DEPRECATED)			\
-	-DBUILDDIR="\"$(abs_top_builddir)\""
+	-DBUILDDIR="\"$(abs_top_builddir)\""	\
+	-DSRCDIR="\"$(abs_top_srcdir)\""
 
 libtesting_la_LDFLAGS = \
 	-export-dynamic -no-undefined -export-symbols-regex "^[^_].*"
diff --git a/tests/libpeas-gtk/testing/testing.c b/tests/libpeas-gtk/testing/testing.c
index 34a5390..718988c 100644
--- a/tests/libpeas-gtk/testing/testing.c
+++ b/tests/libpeas-gtk/testing/testing.c
@@ -118,8 +118,10 @@ testing_engine_new (void)
 
   g_object_add_weak_pointer (G_OBJECT (engine), (gpointer *) &engine);
 
-  peas_engine_add_search_path (engine, BUILDDIR "/tests/plugins", NULL);
-  peas_engine_add_search_path (engine, BUILDDIR "/tests/libpeas-gtk/plugins", NULL);
+  peas_engine_add_search_path (engine, BUILDDIR "/tests/plugins",
+                                       SRCDIR   "/tests/plugins");
+  peas_engine_add_search_path (engine, BUILDDIR "/tests/libpeas-gtk/plugins",
+                                       SRCDIR   "/tests/libpeas-gtk/plugins");
 
   return engine;
 }
diff --git a/tests/libpeas/plugins/Makefile.am b/tests/libpeas/plugins/Makefile.am
index 8252c99..19df536 100644
--- a/tests/libpeas/plugins/Makefile.am
+++ b/tests/libpeas/plugins/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/tests/Makefile.plugin
+
 SUBDIRS = extension-c
 
 if ENABLE_PYTHON
@@ -8,7 +10,7 @@ if ENABLE_SEED
 SUBDIRS += extension-seed
 endif
 
-noinst_DATA = \
+noinst_PLUGIN = \
 	info-missing-iage.plugin	\
 	info-missing-module.plugin	\
 	info-missing-name.plugin	\
@@ -17,4 +19,5 @@ noinst_DATA = \
 	nonexistent-loader.plugin	\
 	os-dependant-help.plugin
 
-EXTRA_DIST = $(noinst_DATA)
+EXTRA_DIST = $(noinst_PLUGIN)
+DISTCLEANFILES = $(noinst_PLUGIN)
diff --git a/tests/libpeas/plugins/extension-c/Makefile.am b/tests/libpeas/plugins/extension-c/Makefile.am
index 700deb9..694d9db 100644
--- a/tests/libpeas/plugins/extension-c/Makefile.am
+++ b/tests/libpeas/plugins/extension-c/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/tests/Makefile.plugin
+
 INCLUDES = \
 	-I$(top_srcdir)		\
 	-I$(srcdir)/../../introspection	\
@@ -18,6 +20,7 @@ libextension_c_la_SOURCES = \
 libextension_c_la_LDFLAGS = $(TEST_PLUGIN_LIBTOOL_FLAGS)
 libextension_c_la_LIBADD  = $(PEAS_LIBS)
 
-noinst_DATA = extension-c.plugin
+noinst_PLUGIN = extension-c.plugin
 
-EXTRA_DIST = $(noinst_DATA)
+EXTRA_DIST = $(noinst_PLUGIN)
+DISTCLEANFILES = $(noinst_PLUGIN)
diff --git a/tests/libpeas/plugins/extension-python/Makefile.am b/tests/libpeas/plugins/extension-python/Makefile.am
index 1ccd058..4424628 100644
--- a/tests/libpeas/plugins/extension-python/Makefile.am
+++ b/tests/libpeas/plugins/extension-python/Makefile.am
@@ -1,5 +1,11 @@
+include $(top_srcdir)/tests/Makefile.plugin
+
 noinst_PYTHON = extension-python.py
 
-noinst_DATA = extension-python.plugin
+noinst_PLUGIN = \
+	extension-python.plugin	\
+	extension-python.py	\
+	extension-python.pyc
 
-EXTRA_DIST = $(noinst_DATA)
+EXTRA_DIST = $(noinst_PLUGIN)
+DISTCLEANFILES = $(noinst_PLUGIN)
diff --git a/tests/libpeas/plugins/extension-seed/Makefile.am b/tests/libpeas/plugins/extension-seed/Makefile.am
index cf3849e..98d67cf 100644
--- a/tests/libpeas/plugins/extension-seed/Makefile.am
+++ b/tests/libpeas/plugins/extension-seed/Makefile.am
@@ -1,5 +1,8 @@
-noinst_DATA = \
+include $(top_srcdir)/tests/Makefile.plugin
+
+noinst_PLUGIN =	\
 	extension-seed.js	\
 	extension-seed.plugin
 
-EXTRA_DIST = $(noinst_DATA)
+EXTRA_DIST = $(noinst_PLUGIN)
+DISTCLEANFILES = $(noinst_PLUGIN)
diff --git a/tests/libpeas/testing/Makefile.am b/tests/libpeas/testing/Makefile.am
index 58e730e..c8b8388 100644
--- a/tests/libpeas/testing/Makefile.am
+++ b/tests/libpeas/testing/Makefile.am
@@ -5,7 +5,8 @@ INCLUDES = \
 	$(PEAS_CFLAGS)				\
 	$(WARN_CFLAGS)				\
 	$(DISABLE_DEPRECATED)			\
-	-DBUILDDIR="\"$(abs_top_builddir)\""
+	-DBUILDDIR="\"$(abs_top_builddir)\""	\
+	-DSRCDIR="\"$(abs_top_srcdir)\""
 
 noinst_LTLIBRARIES = libtesting.la
 
diff --git a/tests/libpeas/testing/testing.c b/tests/libpeas/testing/testing.c
index 15554af..9f58c09 100644
--- a/tests/libpeas/testing/testing.c
+++ b/tests/libpeas/testing/testing.c
@@ -132,8 +132,10 @@ testing_engine_new (void)
 
   g_object_add_weak_pointer (G_OBJECT (engine), (gpointer *) &engine);
 
-  peas_engine_add_search_path (engine, BUILDDIR "/tests/plugins", NULL);
-  peas_engine_add_search_path (engine, BUILDDIR "/tests/libpeas/plugins", NULL);
+  peas_engine_add_search_path (engine, BUILDDIR "/tests/plugins",
+                                       SRCDIR   "/tests/plugins");
+  peas_engine_add_search_path (engine, BUILDDIR "/tests/libpeas/plugins",
+                                       SRCDIR   "/tests/libpeas/plugins");
 
   return engine;
 }
diff --git a/tests/plugins/Makefile.am b/tests/plugins/Makefile.am
index 7aa557e..b368dfa 100644
--- a/tests/plugins/Makefile.am
+++ b/tests/plugins/Makefile.am
@@ -1,12 +1,15 @@
+include $(top_srcdir)/tests/Makefile.plugin
+
 SUBDIRS = \
 	builtin			\
 	has-dep			\
 	loadable		\
 	self-dep
 
-noinst_DATA = \
+noinst_PLUGIN = \
 	full-info.plugin		\
 	min-info.plugin			\
 	unavailable.plugin
 
-EXTRA_DIST = $(noinst_DATA)
+EXTRA_DIST = $(noinst_PLUGIN)
+DISTCLEANFILES = $(noinst_PLUGIN)
diff --git a/tests/plugins/builtin/Makefile.am b/tests/plugins/builtin/Makefile.am
index ba295e4..342f126 100644
--- a/tests/plugins/builtin/Makefile.am
+++ b/tests/plugins/builtin/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/tests/Makefile.plugin
+
 INCLUDES = \
 	-I$(top_srcdir)		\
 	$(PEAS_CFLAGS)		\
@@ -13,6 +15,7 @@ libbuiltin_la_SOURCES = \
 libbuiltin_la_LDFLAGS = $(TEST_PLUGIN_LIBTOOL_FLAGS)
 libbuiltin_la_LIBADD  = $(PEAS_LIBS)
 
-noinst_DATA = builtin.plugin
+noinst_PLUGIN = builtin.plugin
 
-EXTRA_DIST = $(noinst_DATA)
+EXTRA_DIST = $(noinst_PLUGIN)
+DISTCLEANFILES = $(noinst_PLUGIN)
diff --git a/tests/plugins/has-dep/Makefile.am b/tests/plugins/has-dep/Makefile.am
index eb66377..9b33816 100644
--- a/tests/plugins/has-dep/Makefile.am
+++ b/tests/plugins/has-dep/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/tests/Makefile.plugin
+
 INCLUDES = \
 	-I$(top_srcdir)		\
 	$(PEAS_CFLAGS)		\
@@ -13,6 +15,7 @@ libhas_dep_la_SOURCES = \
 libhas_dep_la_LDFLAGS = $(TEST_PLUGIN_LIBTOOL_FLAGS)
 libhas_dep_la_LIBADD  = $(PEAS_LIBS)
 
-noinst_DATA = has-dep.plugin
+noinst_PLUGIN = has-dep.plugin
 
-EXTRA_DIST = $(noinst_DATA)
+EXTRA_DIST = $(noinst_PLUGIN)
+DISTCLEANFILES = $(noinst_PLUGIN)
diff --git a/tests/plugins/loadable/Makefile.am b/tests/plugins/loadable/Makefile.am
index 1d9f5af..24d102a 100644
--- a/tests/plugins/loadable/Makefile.am
+++ b/tests/plugins/loadable/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/tests/Makefile.plugin
+
 INCLUDES = \
 	-I$(top_srcdir)		\
 	$(PEAS_CFLAGS)		\
@@ -13,6 +15,7 @@ libloadable_la_SOURCES = \
 libloadable_la_LDFLAGS = $(TEST_PLUGIN_LIBTOOL_FLAGS)
 libloadable_la_LIBADD  = $(PEAS_LIBS)
 
-noinst_DATA = loadable.plugin
+noinst_PLUGIN = loadable.plugin
 
-EXTRA_DIST = $(noinst_DATA)
+EXTRA_DIST = $(noinst_PLUGIN)
+DISTCLEANFILES = $(noinst_PLUGIN)
diff --git a/tests/plugins/self-dep/Makefile.am b/tests/plugins/self-dep/Makefile.am
index 24e1240..e4ac046 100644
--- a/tests/plugins/self-dep/Makefile.am
+++ b/tests/plugins/self-dep/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/tests/Makefile.plugin
+
 INCLUDES = \
 	-I$(top_srcdir)		\
 	$(PEAS_CFLAGS)		\
@@ -13,6 +15,7 @@ libself_dep_la_SOURCES = \
 libself_dep_la_LDFLAGS = $(TEST_PLUGIN_LIBTOOL_FLAGS)
 libself_dep_la_LIBADD  = $(PEAS_LIBS)
 
-noinst_DATA = self-dep.plugin
+noinst_PLUGIN = self-dep.plugin
 
-EXTRA_DIST = $(noinst_DATA)
+EXTRA_DIST = $(noinst_PLUGIN)
+DISTCLEANFILES = $(noinst_PLUGIN)
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]