[shotwell/wip/autotools: 13/27] build: Add publishing-extras

[Jens Georg <jensgeorg src gnome org>]

commit 087e777031bf78e14f89aa3db8255fc55df0b66f
Author: Jens Georg <mail jensge org>
Date:   Tue Jun 28 20:38:26 2016 +0200

    build: Add publishing-extras
    
    Signed-off-by: Jens Georg <mail jensge org>

 Makefile.am      |    9 ++++++---
 publish-extra.am |   34 ++++++++++++++++++++++++++++++++++
 publish.am       |    9 ++++++---
 3 files changed, 46 insertions(+), 6 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 83fc389..63ebe70 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,6 +40,8 @@ plugins_common_libshotwell_plugin_common_la_SOURCES = \
        plugins/common/Resources.vala \
        plugins/shotwell-plugin-dev-1.0.vapi
 
+$(top_srcdir)/plugins/shotwell-plugin-common.vapi: \
+       plugins_common_libshotwell_plugin_common_la_vala.stamp
 
 plugins_common_libshotwell_plugin_common_la_VALAFLAGS = \
        --library publishing-support \
@@ -49,8 +51,8 @@ plugins_common_libshotwell_plugin_common_la_VALAFLAGS = \
        --pkg libxml-2.0 \
        --pkg webkit2gtk-4.0 \
        --pkg gee-0.8 \
-       --vapi=plugins/shotwell-publishing-support.vapi \
-       --header=plugins/shotwell-publishing-support.h
+       --vapi=plugins/shotwell-plugin-common.vapi \
+       --header=plugins/shotwell-plugin-common.h
 
 plugins_common_libshotwell_plugin_common_la_CFLAGS = \
        $(PLUGIN_CFLAGS) \
@@ -86,4 +88,5 @@ include $(top_srcdir)/shotwell.am
 include $(top_srcdir)/thumbnailer.am
 
 # Plugins
-include $(top_srcdir)/publish.am
\ No newline at end of file
+include $(top_srcdir)/publish.am
+include $(top_srcdir)/publish-extra.am
\ No newline at end of file
diff --git a/publish-extra.am b/publish-extra.am
new file mode 100644
index 0000000..d80972a
--- /dev/null
+++ b/publish-extra.am
@@ -0,0 +1,34 @@
+pkglib_LTLIBRARIES += plugins/shotwell-publishing-extras/libshotwell-publishing-extras.la
+
+
+plugins_shotwell_publishing_extras_libshotwell_publishing_extras_la_SOURCES = \
+       plugins/shotwell-publishing-extras/GalleryConnector.vala \
+       plugins/shotwell-publishing-extras/RajcePublishing.vala \
+       plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala \
+       plugins/shotwell-publishing-extras/TumblrPublishing.vala \
+       plugins/shotwell-publishing-extras/YandexPublishing.vala \
+       plugins/shotwell-plugin-common.vapi
+
+plugins_shotwell_publishing_extras_libshotwell_publishing_extras_la_VALAFLAGS = \
+       $(COMMON_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 \
+       --pkg libxml-2.0 \
+       --pkg webkit2gtk-4.0 \
+       --vapidir $(top_srcdir)/plugins
+
+plugins_shotwell_publishing_extras_libshotwell_publishing_extras_la_CFLAGS = \
+       $(PLUGIN_CFLAGS) \
+       $(COMMON_CFLAGS) \
+       -I $(top_srcdir)/plugins
+
+plugins_shotwell_publishing_extras_libshotwell_publishing_extras_la_LDFLAGS = \
+       -Wno-undefined
+
+plugins_shotwell_publishing_extras_libshotwell_publishing_extras_la_LIBADD = \
+       $(top_builddir)/plugins/common/libshotwell-plugin-common.la
diff --git a/publish.am b/publish.am
index 1ea921f..07ecf8f 100644
--- a/publish.am
+++ b/publish.am
@@ -7,8 +7,7 @@ plugins_shotwell_publishing_libshotwell_publishing_la_SOURCES = \
        plugins/shotwell-publishing/FlickrPublishing.vala \
        plugins/shotwell-publishing/YouTubePublishing.vala \
        plugins/shotwell-publishing/PiwigoPublishing.vala \
-       src/util/string.vala \
-       plugins/shotwell-publishing-support.vapi
+       plugins/shotwell-plugin-common.vapi
 
 plugins_shotwell_publishing_libshotwell_publishing_la_VALAFLAGS = \
        $(COMMON_VALAFLAGS) \
@@ -25,5 +24,9 @@ plugins_shotwell_publishing_libshotwell_publishing_la_VALAFLAGS = \
 
 plugins_shotwell_publishing_libshotwell_publishing_la_CFLAGS = \
        $(PLUGIN_CFLAGS) \
-       $(COMMON_CFLAGS)
+       $(COMMON_CFLAGS) \
+       -I $(top_srcdir)/plugins
 plugins_shotwell_publishing_libshotwell_publishing_la_LDFLAGS = -Wno-undefined
+
+plugins_shotwell_publishing_libshotwell_publishing_la_LIBADD = \
+       $(top_builddir)/plugins/common/libshotwell-plugin-common.la