[vinagre/no-separate-plugins: 8/11] Do not install plugin desktop files

[David King <davidk src gnome org>]

commit 1901c87bde5fddfc0fb81393f4fe1e252ba962cf
Author: David King <amigadave amigadave com>
Date:   Fri Jun 10 23:14:10 2011 +0200

    Do not install plugin desktop files

 .gitignore                                        |    6 ------
 Makefile.am                                       |   19 +------------------
 plugins/im-status/im-status.plugin.desktop.in     |   10 ----------
 plugins/rdp/rdp.plugin.desktop.in                 |    9 ---------
 plugins/reverse-vnc/reverse-vnc.plugin.desktop.in |   10 ----------
 plugins/spice/spice.plugin.desktop.in             |    9 ---------
 plugins/ssh/ssh.plugin.desktop.in                 |    9 ---------
 plugins/vnc/vnc.plugin.desktop.in                 |    9 ---------
 po/POTFILES.in                                    |    6 ------
 9 files changed, 1 insertions(+), 86 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 59248f3..59984a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,12 +35,10 @@ Makefile.in
 /libtool
 /m4/
 /omf.make
-/plugins/im-status/im-status.plugin
 /plugins/rdp/*.lo
 /plugins/rdp/.deps
 /plugins/rdp/.dirstamp
 /plugins/rdp/.libs
-/plugins/rdp/rdp.plugin
 /plugins/reverse-vnc/*.lo
 /plugins/reverse-vnc/.deps
 /plugins/reverse-vnc/.dirstamp
@@ -49,22 +47,18 @@ Makefile.in
 /plugins/reverse-vnc/if/.deps
 /plugins/reverse-vnc/if/.dirstamp
 /plugins/reverse-vnc/if/.libs
-/plugins/reverse-vnc/reverse-vnc.plugin
 /plugins/spice/*.lo
 /plugins/spice/.deps
 /plugins/spice/.dirstamp
 /plugins/spice/.libs
-/plugins/spice/spice.plugin
 /plugins/ssh/*.lo
 /plugins/ssh/.deps
 /plugins/ssh/.dirstamp
 /plugins/ssh/.libs
-/plugins/ssh/ssh.plugin
 /plugins/vnc/*.lo
 /plugins/vnc/.deps
 /plugins/vnc/.dirstamp
 /plugins/vnc/.libs
-/plugins/vnc/vnc.plugin
 /po/.intltool-merge-cache
 /po/Makefile.in.in
 /po/Makevars.template
diff --git a/Makefile.am b/Makefile.am
index 8a1f856..947275f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -151,7 +151,6 @@ noinst_plugin_headers = \
 
 if VINAGRE_ENABLE_RDP
 rdp_plugin = librdp.la
-rdp_plugin_in = plugins/rdp/rdp.plugin.desktop.in
 
 librdp_la_SOURCES = \
 	plugins/rdp/vinagre-rdp-plugin.c \
@@ -164,7 +163,6 @@ endif
 
 if VINAGRE_ENABLE_SPICE
 spice_plugin = libspice.la
-spice_plugin_in = plugins/spice/spice.plugin.desktop.in
 
 libspice_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
@@ -183,7 +181,6 @@ endif
 
 if VINAGRE_ENABLE_SSH
 ssh_plugin = libssh.la
-ssh_plugin_in = plugins/ssh/ssh.plugin.desktop.in
 
 libssh_la_SOURCES = \
 	plugins/ssh/vinagre-ssh-plugin.c \
@@ -237,18 +234,6 @@ libvnc_la_SOURCES = \
 libvnc_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libvnc_la_LIBADD = $(VNC_LIBS)
 
-plugin_in_files = \
-	$(rdp_plugin_in) \
-	$(spice_plugin_in) \
-	$(ssh_plugin_in) \
-	plugins/reverse-vnc/reverse-vnc.plugin.desktop.in \
-	plugins/vnc/vnc.plugin.desktop.in
-
-%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po)
-	$(AM_V_GEN)$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-nodist_plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
-
 iconthemedir = $(datadir)/icons/hicolor
 mimeicon16dir = $(iconthemedir)/16x16/mimetypes
 mimeicon22dir = $(iconthemedir)/22x22/mimetypes
@@ -362,7 +347,6 @@ dist_noinst_DATA = \
 	intltool-extract.in \
 	intltool-merge.in \
 	intltool-update.in \
-	$(plugin_in_files) \
 	vinagre.doap
 
 CLEANFILES = \
@@ -370,8 +354,7 @@ CLEANFILES = \
 	$(nodist_mime_DATA) \
 	$(gsettings_SCHEMAS) \
 	$(nodist_pkgconfig_DATA) \
-	$(nodist_service_DATA) \
-	$(nodist_plugin_DATA)
+	$(nodist_service_DATA)
 
 DISTCLEANFILES = \
 	intltool-extract \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c4d3df4..586a3f5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,28 +6,22 @@ data/vinagre-file.desktop.in.in
 [type: gettext/glade]data/vinagre.ui
 data/vinagre-mime.xml.in
 data/vinagre-ui.xml
-plugins/rdp/rdp.plugin.desktop.in
 plugins/rdp/vinagre-rdp-plugin.c
 plugins/rdp/vinagre-rdp-tab.c
 plugins/ssh/vinagre-ssh-connection.c
 plugins/ssh/vinagre-ssh-plugin.c
 plugins/ssh/vinagre-ssh-tab.c
-plugins/ssh/ssh.plugin.desktop.in
 plugins/vnc/vinagre-vnc-connection.c
 plugins/vnc/vinagre-vnc-plugin.c
 plugins/vnc/vinagre-vnc-tab.c
 plugins/vnc/vinagre-vnc-tunnel.c
-plugins/vnc/vnc.plugin.desktop.in
-plugins/reverse-vnc/reverse-vnc.plugin.desktop.in
 plugins/reverse-vnc/vinagre-reverse-vnc-listener-dialog.c
 plugins/reverse-vnc/vinagre-reverse-vnc-listener.c
 plugins/reverse-vnc/vinagre-reverse-vnc-plugin.c
-plugins/spice/spice.plugin.desktop.in
 plugins/spice/vinagre-spice-plugin.c
 plugins/spice/vinagre-spice-tab.c
 plugins/spice/vinagre-spice-tunnel.c
 [type: gettext/glade]plugins/reverse-vnc/reverse-vnc.ui
-plugins/im-status/im-status.plugin.desktop.in
 plugins/im-status/im-status.js
 vinagre/vinagre-bookmarks.c
 vinagre/vinagre-bookmarks-migration.c