[gnome-todo/tingping/fixups] Misc plugin installation cleanup

[Patrick Griffis <pgriffis src gnome org>]

commit a7557ec66517f951e246672a3e2a0c379102b3f8
Author: Patrick Griffis <tingping tingping se>
Date:   Mon Jan 18 20:55:28 2016 -0500

    Misc plugin installation cleanup
    
    - Don't version so's
    - Install into subdir
    - Use shared plugindir in am
    - Share ldflags

 common.am               |    6 +++++-
 configure.ac            |    2 --
 plugins/eds/Makefile.am |    9 ++++-----
 3 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/common.am b/common.am
index 74cc998..aeb9a76 100644
--- a/common.am
+++ b/common.am
@@ -1,4 +1,4 @@
-plugindir = @GNOME_TODO_PLUGIN_DIR@
+plugindir = ${pkgdatadir}/plugins
 
 GNOME_TODO_PLUGIN_CFLAGS = \
        $(GNOME_TODO_CFLAGS) \
@@ -6,3 +6,7 @@ GNOME_TODO_PLUGIN_CFLAGS = \
 
 GNOME_TODO_PLUGIN_WARN_CFLAGS = \
        $(GNOME_TODO_WARN_CFLAGS)
+
+GNOME_TODO_PLUGIN_LDFLAGS = \
+        -avoid-version \
+        -module
diff --git a/configure.ac b/configure.ac
index 864478e..79b7741 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,8 +86,6 @@ dnl Plugins
 dnl ================================================================
 GNOME_TODO_ADD_PLUGIN([eds], [Evolution-Data-Server], [yes])
 
-AC_SUBST([GNOME_TODO_PLUGIN_DIR], [${libdir}])
-
 AC_CONFIG_FILES([
       Makefile
       src/Makefile
diff --git a/plugins/eds/Makefile.am b/plugins/eds/Makefile.am
index c707ade..2119a0e 100644
--- a/plugins/eds/Makefile.am
+++ b/plugins/eds/Makefile.am
@@ -1,9 +1,8 @@
 include $(top_srcdir)/common.am
 
-plugindir = $(datadir)/gnome-todo/plugins
-
-plugin_LTLIBRARIES = libeds.la
-plugin_DATA = eds.plugin
+edsplugindir = $(plugindir)/eds
+edsplugin_LTLIBRARIES = libeds.la
+edsplugin_DATA = eds.plugin
 
 BUILT_SOURCES = \
        gtd-plugin-eds-resources.c
@@ -35,7 +34,7 @@ libeds_la_LIBADD = \
        $(GNOME_TODO_LIBS)
 
 libeds_la_LDFLAGS = \
-       -Wl -module \
+       $(GNOME_TODO_PLUGIN_LDFLAGS) \
        $(GNOME_TODO_WARN_LDFLAGS)
 
 # generate binary-bundle resources