[shotwell] Explicitly link plugins

[Jens Georg <jensgeorg src gnome org>]

commit f779defe2b68396876c670dcb8735590a007c329
Author: Jens Georg <mail jensge org>
Date:   Fri Aug 12 19:01:47 2016 +0200

    Explicitly link plugins
    
    Also, drop dependency on librest. Apparently it was only used for hmac_sha1.
    
    Signed-off-by: Jens Georg <mail jensge org>

 configure.ac     |   17 ++++++++++++-----
 import.am        |    2 +-
 publish-extra.am |    2 +-
 publish.am       |    2 +-
 shotwell.am      |    5 ++++-
 transition.am    |    2 +-
 6 files changed, 20 insertions(+), 10 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c385e9b..91ec04c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,16 +100,23 @@ PKG_CHECK_MODULES(SHOTWELL, [
                              libraw >= 0.13.2
                              libsoup-2.4 >= 2.26.0
                              libxml-2.0 >= 2.6.32
-                             rest-0.7 >= 0.7
                              sqlite3 >= 3.5.9
                              webkit2gtk-4.0
                             ])
 PKG_CHECK_MODULES(THUMBNAILER, [gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.12.2
                                 gstreamer-base-1.0 >= 1.0.0])
-PKG_CHECK_MODULES(PLUGIN, [gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.12.2
-                           gio-2.0 >= 2.30.0 libsoup-2.4 json-glib-1.0
-                           webkit2gtk-4.0 rest-0.7
-                           ])
+
+PKG_CHECK_MODULES(PLUGIN, [gobject-2.0 glib-2.0 json-glib-1.0 libxml-2.0
+                           libsoup-2.4 webkit2gtk-4.0 gee-0.8])
+
+PKG_CHECK_MODULES(IMPORT, [gee-0.8 >= 0.8.5 glib-2.0 gio-2.0 sqlite3])
+
+PKG_CHECK_MODULES(PUBLISHING, [gobject-2.0 glib-2.0 gexiv2 json-glib-1.0
+                               gee-0.8 libsoup-2.4 libxml-2.0 gtk+-3.0
+                               webkit2gtk-4.0])
+
+PKG_CHECK_MODULES(TRANSITIONS, [gobject-2.0 cairo gio-2.0 gdk-pixbuf-2.0
+                                gdk-3.0])
 
 AC_ARG_ENABLE([unity-support],
               AS_HELP_STRING([--enable-unity-support],
diff --git a/import.am b/import.am
index 551de0a..af9a82a 100644
--- a/import.am
+++ b/import.am
@@ -29,7 +29,6 @@ plugins_shotwell_data_imports_shotwell_data_imports_la_VALAFLAGS = \
        --pkg gtk+-3.0 \
        --pkg libsoup-2.4 \
        --pkg gexiv2 \
-       --pkg rest-0.7 \
        --pkg gee-0.8 \
        --pkg json-glib-1.0 \
        --pkg shotwell-plugin-dev-1.0 \
@@ -48,4 +47,5 @@ plugins_shotwell_data_imports_shotwell_data_imports_la_LDFLAGS = \
        $(SHOTWELL_PLUGIN_LDFLAGS)
 
 plugins_shotwell_data_imports_shotwell_data_imports_la_LIBADD = \
+       $(IMPORT_LIBS) \
        $(top_builddir)/plugins/common/libshotwell-plugin-common.la
diff --git a/publish-extra.am b/publish-extra.am
index fbadf6c..89143b0 100644
--- a/publish-extra.am
+++ b/publish-extra.am
@@ -32,7 +32,6 @@ plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_VALAFLAGS = \
        --pkg gtk+-3.0 \
        --pkg libsoup-2.4 \
        --pkg gexiv2 \
-       --pkg rest-0.7 \
        --pkg gee-0.8 \
        --pkg json-glib-1.0 \
        --pkg shotwell-plugin-dev-1.0 \
@@ -50,4 +49,5 @@ plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_LDFLAGS = \
        $(SHOTWELL_PLUGIN_LDFLAGS)
 
 plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_LIBADD = \
+       $(PUBLISHING_LIBS) \
        $(top_builddir)/plugins/common/libshotwell-plugin-common.la
diff --git a/publish.am b/publish.am
index b00e50b..d06abcc 100644
--- a/publish.am
+++ b/publish.am
@@ -34,7 +34,6 @@ plugins_shotwell_publishing_shotwell_publishing_la_VALAFLAGS = \
        --pkg gtk+-3.0 \
        --pkg libsoup-2.4 \
        --pkg gexiv2 \
-       --pkg rest-0.7 \
        --pkg gee-0.8 \
        --pkg json-glib-1.0 \
        --pkg shotwell-plugin-dev-1.0 \
@@ -52,4 +51,5 @@ plugins_shotwell_publishing_shotwell_publishing_la_LDFLAGS = \
        $(SHOTWELL_PLUGIN_LDFLAGS)
 
 plugins_shotwell_publishing_shotwell_publishing_la_LIBADD = \
+       $(PUBLISHING_LIBS) \
        $(top_builddir)/plugins/common/libshotwell-plugin-common.la
diff --git a/shotwell.am b/shotwell.am
index 4fbf132..fa157d4 100644
--- a/shotwell.am
+++ b/shotwell.am
@@ -6,7 +6,10 @@ shotwell_CFLAGS = \
        -I$(top_builddir)/plugins \
        -I$(abs_top_srcdir)/plugins
 
-shotwell_LDADD = src/plugins/libplugin.la $(SHOTWELL_LIBS) $(UNITY_LIBS)
+shotwell_LDADD = \
+       src/plugins/libplugin.la \
+       $(SHOTWELL_LIBS) \
+       $(UNITY_LIBS)
 shotwell_VALAFLAGS = $(COMMON_VALAFLAGS) \
        --pkg gio-2.0 --pkg gtk+-3.0 --pkg gee-0.8 \
        --pkg gio-unix-2.0 --pkg sqlite3 --pkg gmodule-2.0 \
diff --git a/transition.am b/transition.am
index aa911ff..50a3aac 100644
--- a/transition.am
+++ b/transition.am
@@ -26,7 +26,6 @@ plugins_shotwell_transitions_shotwell_transitions_la_VALAFLAGS = \
        --pkg gtk+-3.0 \
        --pkg libsoup-2.4 \
        --pkg gexiv2 \
-       --pkg rest-0.7 \
        --pkg gee-0.8 \
        --pkg json-glib-1.0 \
        --pkg shotwell-plugin-dev-1.0 \
@@ -44,4 +43,5 @@ plugins_shotwell_transitions_shotwell_transitions_la_LDFLAGS = \
        $(SHOTWELL_PLUGIN_LDFLAGS)
 
 plugins_shotwell_transitions_shotwell_transitions_la_LIBADD = \
+       $(TRANSITIONS_LIBS) -lm \
        $(top_builddir)/plugins/common/libshotwell-plugin-common.la