7 files changed, 17 insertions, 14 deletions
diff --git a/sendto/plugins/Makefile.am b/sendto/plugins/Makefile.am
index 10097e8..6d17c98 100644
--- a/sendto/plugins/Makefile.am
+++ b/sendto/plugins/Makefile.am
@@ -1,16 +1,13 @@
-SUBDIRS = . \
- caja-burn \
- emailclient \
- gajim \
- pidgin \
- removable-devices \
- upnp
+SUBDIRS = . $(SENDTO_PLUGINS)
+DIST_SUBDIRS = $(ALL_SENDTO_PLUGINS)
 
 NST_COMMON_SOURCES = nst-common.c nst-common.h
 
+if HAVE_GIO
 noinst_LTLIBRARIES = libnstcommon.la
 libnstcommon_la_SOURCES = $(NST_COMMON_SOURCES)
 libnstcommon_la_CFLAGS = $(SENDTO_CFLAGS)
 libnstcommon_la_LIBADD = $(SENDTO_LIBS)
+endif
 
 EXTRA_DIST = $(NST_COMMON_SOURCES)
diff --git a/sendto/plugins/caja-burn/Makefile.am b/sendto/plugins/caja-burn/Makefile.am
index 50c309b..00f95c2 100644
--- a/sendto/plugins/caja-burn/Makefile.am
+++ b/sendto/plugins/caja-burn/Makefile.am
@@ -9,11 +9,12 @@ AM_CPPFLAGS = \
 -I$(srcdir)/../ \
 $(SENDTO_CFLAGS) \
 $(WARN_CFLAGS) \
- $(DISABLE_DEPRECATED)
+ $(DISABLE_DEPRECATED) \
+ $(GIO_CFLAGS)
 
 plugin_LTLIBRARIES = libnstburn.la
 
 libnstburn_la_SOURCES = caja-burn.c
 libnstburn_la_LDFLAGS = -module -avoid-version
-libnstburn_la_LIBADD = $(SENDTO_LIBS) $(builddir)/../libnstcommon.la
+libnstburn_la_LIBADD = $(GIO_LIBS) $(SENDTO_LIBS) $(builddir)/../libnstcommon.la
 
diff --git a/sendto/plugins/emailclient/Makefile.am b/sendto/plugins/emailclient/Makefile.am
index 31ba40e..c4af752 100644
--- a/sendto/plugins/emailclient/Makefile.am
+++ b/sendto/plugins/emailclient/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/sendto \
 -I$(top_builddir) \
 $(SENDTO_CFLAGS) \
+ $(EMAILCLIENT_CFLAGS) \
 $(DISABLE_DEPRECATED) \
 $(WARN_CFLAGS)
 
@@ -14,4 +15,4 @@ plugin_LTLIBRARIES = libnstemailclient.la
 
 libnstemailclient_la_SOURCES = emailclient.c
 libnstemailclient_la_LDFLAGS = -module -avoid-version
-libnstemailclient_la_LIBADD = $(SENDTO_LIBS)
+libnstemailclient_la_LIBADD = $(SENDTO_LIBS) $(EMAILCLIENT_LIBS)
diff --git a/sendto/plugins/gajim/Makefile.am b/sendto/plugins/gajim/Makefile.am
index 5acd5b0..c39a3c0 100644
--- a/sendto/plugins/gajim/Makefile.am
+++ b/sendto/plugins/gajim/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/sendto \
 -I$(top_builddir) \
 $(SENDTO_CFLAGS) \
+ $(DBUS_CFLAGS) \
 $(DISABLE_DEPRECATED) \
 $(WARN_CFLAGS)
 
@@ -14,5 +15,5 @@ plugin_LTLIBRARIES = libnstgajim.la
 
 libnstgajim_la_SOURCES = gajim.c
 libnstgajim_la_LDFLAGS = -module -avoid-version
-libnstgajim_la_LIBADD = $(SENDTO_LIBS)
+libnstgajim_la_LIBADD = $(DBUS_LIBS) $(SENDTO_LIBS)
 
diff --git a/sendto/plugins/pidgin/Makefile.am b/sendto/plugins/pidgin/Makefile.am
index b7f650a..bcfe1d3 100644
--- a/sendto/plugins/pidgin/Makefile.am
+++ b/sendto/plugins/pidgin/Makefile.am
@@ -7,6 +7,8 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/sendto \
 -I$(top_builddir) \
 $(SENDTO_CFLAGS) \
+ $(NST_EBOOK_CFLAGS) \
+ $(PIDGIN_CFLAGS) \
 $(DISABLE_DEPRECATED) \
 $(WARN_CFLAGS)
 
@@ -14,5 +16,5 @@ plugin_LTLIBRARIES = libnstpidgin.la
 
 libnstpidgin_la_SOURCES = pidgin.c
 libnstpidgin_la_LDFLAGS = -module -avoid-version
-libnstpidgin_la_LIBADD = $(SENDTO_LIBS)
+libnstpidgin_la_LIBADD = $(PIDGIN_LIBS) $(SENDTO_LIBS)
 
diff --git a/sendto/plugins/removable-devices/Makefile.am b/sendto/plugins/removable-devices/Makefile.am
index 294ca90..797353b 100644
--- a/sendto/plugins/removable-devices/Makefile.am
+++ b/sendto/plugins/removable-devices/Makefile.am
@@ -15,5 +15,5 @@ plugin_LTLIBRARIES = libnstremovable_devices.la
 
 libnstremovable_devices_la_SOURCES = removable-devices.c
 libnstremovable_devices_la_LDFLAGS = -module -avoid-version
-libnstremovable_devices_la_LIBADD = $(SENDTO_LIBS) $(builddir)/../libnstcommon.la
+libnstremovable_devices_la_LIBADD = $(GIO_LIBS) $(SENDTO_LIBS) $(builddir)/../libnstcommon.la
 
diff --git a/sendto/plugins/upnp/Makefile.am b/sendto/plugins/upnp/Makefile.am
index 4127abd..31a8bd6 100644
--- a/sendto/plugins/upnp/Makefile.am
+++ b/sendto/plugins/upnp/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/sendto \
 -I$(top_builddir) \
 $(SENDTO_CFLAGS) \
+ $(UPNP_CFLAGS) \
 $(DISABLE_DEPRECATED) \
 $(WARN_CFLAGS)
 
@@ -14,5 +15,5 @@ plugin_LTLIBRARIES = libnstupnp.la
 
 libnstupnp_la_SOURCES = upnp.c
 libnstupnp_la_LDFLAGS = -module -avoid-version
-libnstupnp_la_LIBADD = $(SENDTO_LIBS)
+libnstupnp_la_LIBADD = $(UPNP_LIBS) $(SENDTO_LIBS)