GNOME.org
 

[gnome-builder] build: fix `make distcheck` to work with plugins

commit 6d8ff1c594c62338f01796cd48827bda6736c2d5
Author: Christian Hergert <christian hergert me>
Date:   Sun Sep 6 17:35:44 2015 -0700

    build: fix `make distcheck` to work with plugins

 plugins/Makefile.am                              |    2 +
 plugins/Makefile.plugin                          |   23 ++++++++++++++++++++++
 plugins/autotools/Makefile.am                    |    2 +
 plugins/c-pack/Makefile.am                       |    2 +
 plugins/clang/Makefile.am                        |    2 +
 plugins/command-bar/Makefile.am                  |    2 +
 plugins/ctags/Makefile.am                        |    2 +
 plugins/devhelp/Makefile.am                      |    2 +
 plugins/device-manager/Makefile.am               |    2 +
 plugins/fallback/Makefile.am                     |    2 +
 plugins/file-search/Makefile.am                  |    2 +
 plugins/gnome-code-assistance/Makefile.am        |    2 +
 plugins/html-completion/Makefile.am              |    2 +
 plugins/html-preview/Makefile.am                 |    2 +
 plugins/jedi/Makefile.am                         |    2 +
 plugins/mingw/Makefile.am                        |    2 +
 plugins/python-gi-imports-completion/Makefile.am |    2 +
 plugins/python-pack/Makefile.am                  |    2 +
 plugins/symbol-tree/Makefile.am                  |    2 +
 plugins/sysmon/Makefile.am                       |    2 +
 plugins/terminal/Makefile.am                     |    2 +
 plugins/xml-pack/Makefile.am                     |    2 +
 22 files changed, 65 insertions(+), 0 deletions(-)
---
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index e643a2c..46e85a7 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -21,4 +21,6 @@ SUBDIRS = \
        xml-pack \
        $(NULL)
 
+EXTRA_DIST = Makefile.plugin
+
 -include $(top_srcdir)/git.mk
diff --git a/plugins/Makefile.plugin b/plugins/Makefile.plugin
new file mode 100644
index 0000000..cfe50fd
--- /dev/null
+++ b/plugins/Makefile.plugin
@@ -0,0 +1,23 @@
+# 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 "$(dist_plugin_DATA)" || \
+        for plugin in $(dist_plugin_DATA) ; do \
+          if test -e $(srcdir)/$$plugin ; then \
+            if ! test -e $(builddir)/$$plugin ; then \
+              cp -p $(srcdir)/$$plugin $(builddir)/ ; \
+            fi ; \
+          fi ; \
+        done
+
+clean-local:
+       @rm -f gschemas.compiled ; \
+        test -z "$(dist_plugin_DATA)" || \
+        test $(srcdir) = $(builddir) || \
+        for plugin in $(dist_plugin_DATA) ; do \
+          if test -e $(builddir)/$$plugin ; then \
+            rm -f $(builddir)/$$plugin ; \
+          fi ; \
+        done
diff --git a/plugins/autotools/Makefile.am b/plugins/autotools/Makefile.am
index 7ce8ca8..d601243 100644
--- a/plugins/autotools/Makefile.am
+++ b/plugins/autotools/Makefile.am
@@ -30,3 +30,5 @@ libautotools_plugin_la_LDFLAGS = \
        $(NULL)
 
 -include $(top_srcdir)/git.mk
+
+include $(top_srcdir)/plugins/Makefile.plugin
diff --git a/plugins/c-pack/Makefile.am b/plugins/c-pack/Makefile.am
index 3f27114..1d3b387 100644
--- a/plugins/c-pack/Makefile.am
+++ b/plugins/c-pack/Makefile.am
@@ -26,3 +26,5 @@ libc_pack_plugin_la_LDFLAGS = \
        $(NULL)
 
 -include $(top_srcdir)/git.mk
+
+include $(top_srcdir)/plugins/Makefile.plugin
diff --git a/plugins/clang/Makefile.am b/plugins/clang/Makefile.am
index 52f1969..e7718f8 100644
--- a/plugins/clang/Makefile.am
+++ b/plugins/clang/Makefile.am
@@ -50,3 +50,5 @@ libclang_plugin_la_LDFLAGS = \
 endif
 
 -include $(top_srcdir)/git.mk
+
+include $(top_srcdir)/plugins/Makefile.plugin
diff --git a/plugins/command-bar/Makefile.am b/plugins/command-bar/Makefile.am
index b9a5b1e..df94ced 100644
--- a/plugins/command-bar/Makefile.am
+++ b/plugins/command-bar/Makefile.am
@@ -65,3 +65,5 @@ glib_resources_namespace = gb_command_bar
 include $(top_srcdir)/build/autotools/Makefile.am.gresources
 
 -include $(top_srcdir)/git.mk
+
+include $(top_srcdir)/plugins/Makefile.plugin
diff --git a/plugins/ctags/Makefile.am b/plugins/ctags/Makefile.am
index 3f777af..bd07ba6 100644
--- a/plugins/ctags/Makefile.am
+++ b/plugins/ctags/Makefile.am
@@ -35,3 +35,5 @@ libctags_plugin_la_LDFLAGS = \
        $(NULL)
 
 -include $(top_srcdir)/git.mk
+
+include $(top_srcdir)/plugins/Makefile.plugin
diff --git a/plugins/devhelp/Makefile.am b/plugins/devhelp/Makefile.am
index 446ad33..57bfd15 100644
--- a/plugins/devhelp/Makefile.am
+++ b/plugins/devhelp/Makefile.am
@@ -61,3 +61,5 @@ endif
 
 
 -include $(top_srcdir)/git.mk
+
+include $(top_srcdir)/plugins/Makefile.plugin
diff --git a/plugins/device-manager/Makefile.am b/plugins/device-manager/Makefile.am
index b613973..c764217 100644
--- a/plugins/device-manager/Makefile.am
+++ b/plugins/device-manager/Makefile.am
@@ -46,3 +46,5 @@ include $(top_srcdir)/build/autotools/Makefile.am.gresources
 
 
 -include $(top_srcdir)/git.mk
+
+include $(top_srcdir)/plugins/Makefile.plugin
diff --git a/plugins/fallback/Makefile.am b/plugins/fallback/Makefile.am
index f1142c5..f0fa93d 100644
--- a/plugins/fallback/Makefile.am
+++ b/plugins/fallback/Makefile.am
@@ -19,3 +19,5 @@ libfallback_plugin_la_LDFLAGS = \
        $(NULL)
 
 -include $(top_srcdir)/git.mk
+
+include $(top_srcdir)/plugins/Makefile.plugin
diff --git a/plugins/file-search/Makefile.am b/plugins/file-search/Makefile.am
index 9a3800d..1726265 100644
--- a/plugins/file-search/Makefile.am
+++ b/plugins/file-search/Makefile.am
@@ -33,3 +33,5 @@ libfile_search_la_LDFLAGS = \
        $(NULL)
 
 -include $(top_srcdir)/git.mk
+
+include $(top_srcdir)/plugins/Makefile.plugin
diff --git a/plugins/gnome-code-assistance/Makefile.am b/plugins/gnome-code-assistance/Makefile.am
index 683dbdc..9f56261 100644
--- a/plugins/gnome-code-assistance/Makefile.am
+++ b/plugins/gnome-code-assistance/Makefile.am
@@ -30,3 +30,5 @@ libgnome_code_assistance_plugin_la_LDFLAGS = \
        $(NULL)
 
 -include $(top_srcdir)/git.mk
+
+include $(top_srcdir)/plugins/Makefile.plugin
diff --git a/plugins/html-completion/Makefile.am b/plugins/html-completion/Makefile.am
index 1d5bde3..c66d2b4 100644
--- a/plugins/html-completion/Makefile.am
+++ b/plugins/html-completion/Makefile.am
@@ -22,3 +22,5 @@ libhtml_completion_plugin_la_LDFLAGS = \
        $(NULL)
 
 -include $(top_srcdir)/git.mk
+
+include $(top_srcdir)/plugins/Makefile.plugin
diff --git a/plugins/html-preview/Makefile.am b/plugins/html-preview/Makefile.am
index e0e41bd..73b16ee 100644
--- a/plugins/html-preview/Makefile.am
+++ b/plugins/html-preview/Makefile.am
@@ -22,3 +22,5 @@ endif
 GITIGNOREFILES = html_preview_plugin/__pycache__
 
 -include $(top_srcdir)/git.mk
+
+include $(top_srcdir)/plugins/Makefile.plugin
diff --git a/plugins/jedi/Makefile.am b/plugins/jedi/Makefile.am
index 6fde596..996a068 100644
--- a/plugins/jedi/Makefile.am
+++ b/plugins/jedi/Makefile.am
@@ -8,3 +8,5 @@ dist_plugin_DATA = \
 GITIGNOREFILES = __pycache__
 
 -include $(top_srcdir)/git.mk
+
+include $(top_srcdir)/plugins/Makefile.plugin
diff --git a/plugins/mingw/Makefile.am b/plugins/mingw/Makefile.am
index e261513..3b13abd 100644
--- a/plugins/mingw/Makefile.am
+++ b/plugins/mingw/Makefile.am
@@ -24,3 +24,5 @@ libmingw_plugin_la_LDFLAGS = \
        $(NULL)
 
 -include $(top_srcdir)/git.mk
+
+include $(top_srcdir)/plugins/Makefile.plugin
diff --git a/plugins/python-gi-imports-completion/Makefile.am 
b/plugins/python-gi-imports-completion/Makefile.am
index 5d5136e..2889308 100644
--- a/plugins/python-gi-imports-completion/Makefile.am
+++ b/plugins/python-gi-imports-completion/Makefile.am
@@ -8,3 +8,5 @@ dist_plugin_DATA = \
 GITIGNOREFILES = __pycache__
 
 -include $(top_srcdir)/git.mk
+
+include $(top_srcdir)/plugins/Makefile.plugin
diff --git a/plugins/python-pack/Makefile.am b/plugins/python-pack/Makefile.am
index b2ec47a..09cd43e 100644
--- a/plugins/python-pack/Makefile.am
+++ b/plugins/python-pack/Makefile.am
@@ -24,3 +24,5 @@ libpython_pack_plugin_la_LDFLAGS = \
        $(NULL)
 
 -include $(top_srcdir)/git.mk
+
+include $(top_srcdir)/plugins/Makefile.plugin
diff --git a/plugins/symbol-tree/Makefile.am b/plugins/symbol-tree/Makefile.am
index 0edbacd..9dce289 100644
--- a/plugins/symbol-tree/Makefile.am
+++ b/plugins/symbol-tree/Makefile.am
@@ -49,3 +49,5 @@ include $(top_srcdir)/build/autotools/Makefile.am.gresources
 
 
 -include $(top_srcdir)/git.mk
+
+include $(top_srcdir)/plugins/Makefile.plugin
diff --git a/plugins/sysmon/Makefile.am b/plugins/sysmon/Makefile.am
index 2536626..b91a5e6 100644
--- a/plugins/sysmon/Makefile.am
+++ b/plugins/sysmon/Makefile.am
@@ -47,3 +47,5 @@ include $(top_srcdir)/build/autotools/Makefile.am.gresources
 
 
 -include $(top_srcdir)/git.mk
+
+include $(top_srcdir)/plugins/Makefile.plugin
diff --git a/plugins/terminal/Makefile.am b/plugins/terminal/Makefile.am
index 35658ad..1eb17c2 100644
--- a/plugins/terminal/Makefile.am
+++ b/plugins/terminal/Makefile.am
@@ -64,3 +64,5 @@ endif
 
 
 -include $(top_srcdir)/git.mk
+
+include $(top_srcdir)/plugins/Makefile.plugin
diff --git a/plugins/xml-pack/Makefile.am b/plugins/xml-pack/Makefile.am
index 9430086..e033180 100644
--- a/plugins/xml-pack/Makefile.am
+++ b/plugins/xml-pack/Makefile.am
@@ -28,3 +28,5 @@ libxml_pack_plugin_la_LDFLAGS = \
        $(NULL)
 
 -include $(top_srcdir)/git.mk
+
+include $(top_srcdir)/plugins/Makefile.plugin
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]