[shotwell/wip/autotools: 24/27] build: Align plugin names with old makefile

[Jens Georg <jensgeorg src gnome org>]

commit 81d03f7e3f1855f772a540543a8f290baca38888
Author: Jens Georg <mail jensge org>
Date:   Tue Jun 28 23:11:25 2016 +0200

    build: Align plugin names with old makefile
    
    Signed-off-by: Jens Georg <mail jensge org>

 Makefile.am      |    4 ++++
 import.am        |   12 ++++++------
 publish-extra.am |   13 ++++++-------
 publish.am       |   13 +++++++------
 transition.am    |   12 ++++++------
 5 files changed, 29 insertions(+), 25 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index dadb045..506bc5c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -89,6 +89,10 @@ SHOTWELL_PLUGIN_LDFLAGS = \
 
 -include $(top_srcdir)/git.mk
 
+plugindir = $(pkglibdir)/plugins/builtin
+plugin_LTLIBRARIES =
+plugin_DATA =
+
 include $(top_srcdir)/common.am
 include $(top_srcdir)/shotwell.am
 include $(top_srcdir)/thumbnailer.am
diff --git a/import.am b/import.am
index 0d65521..c06fac6 100644
--- a/import.am
+++ b/import.am
@@ -1,6 +1,6 @@
-pkglib_LTLIBRARIES += plugins/shotwell-data-imports/libshotwell-data-imports.la
+plugin_LTLIBRARIES += plugins/shotwell-data-imports/shotwell-data-imports.la
 
-plugins_shotwell_data_imports_libshotwell_data_imports_la_SOURCES = \
+plugins_shotwell_data_imports_shotwell_data_imports_la_SOURCES = \
        plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala \
        plugins/shotwell-data-imports/FSpotDatabaseTable.vala \
        plugins/shotwell-data-imports/FSpotDatabase.vala \
@@ -17,7 +17,7 @@ plugins_shotwell_data_imports_libshotwell_data_imports_la_SOURCES = \
        plugins/shotwell-data-imports/VersionNumber.vala \
        plugins/shotwell-plugin-common.vapi
 
-plugins_shotwell_data_imports_libshotwell_data_imports_la_VALAFLAGS = \
+plugins_shotwell_data_imports_shotwell_data_imports_la_VALAFLAGS = \
        $(COMMON_VALAFLAGS) \
        --pkg gtk+-3.0 \
        --pkg libsoup-2.4 \
@@ -31,13 +31,13 @@ plugins_shotwell_data_imports_libshotwell_data_imports_la_VALAFLAGS = \
        --pkg sqlite3 \
        --vapidir $(top_srcdir)/plugins
 
-plugins_shotwell_data_imports_libshotwell_data_imports_la_CFLAGS = \
+plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS = \
        $(PLUGIN_CFLAGS) \
        $(COMMON_CFLAGS) \
        -I $(top_srcdir)/plugins
 
-plugins_shotwell_data_imports_libshotwell_data_imports_la_LDFLAGS = \
+plugins_shotwell_data_imports_shotwell_data_imports_la_LDFLAGS = \
        $(SHOTWELL_PLUGIN_LDFLAGS)
 
-plugins_shotwell_data_imports_libshotwell_data_imports_la_LIBADD = \
+plugins_shotwell_data_imports_shotwell_data_imports_la_LIBADD = \
        $(top_builddir)/plugins/common/libshotwell-plugin-common.la
diff --git a/publish-extra.am b/publish-extra.am
index b098eb9..f4e6f04 100644
--- a/publish-extra.am
+++ b/publish-extra.am
@@ -1,7 +1,6 @@
-pkglib_LTLIBRARIES += plugins/shotwell-publishing-extras/libshotwell-publishing-extras.la
+plugin_LTLIBRARIES += plugins/shotwell-publishing-extras/shotwell-publishing-extras.la
 
-
-plugins_shotwell_publishing_extras_libshotwell_publishing_extras_la_SOURCES = \
+plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_SOURCES = \
        plugins/shotwell-publishing-extras/GalleryConnector.vala \
        plugins/shotwell-publishing-extras/RajcePublishing.vala \
        plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala \
@@ -9,7 +8,7 @@ plugins_shotwell_publishing_extras_libshotwell_publishing_extras_la_SOURCES = \
        plugins/shotwell-publishing-extras/YandexPublishing.vala \
        plugins/shotwell-plugin-common.vapi
 
-plugins_shotwell_publishing_extras_libshotwell_publishing_extras_la_VALAFLAGS = \
+plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_VALAFLAGS = \
        $(COMMON_VALAFLAGS) \
        --pkg gtk+-3.0 \
        --pkg libsoup-2.4 \
@@ -22,13 +21,13 @@ plugins_shotwell_publishing_extras_libshotwell_publishing_extras_la_VALAFLAGS =
        --pkg webkit2gtk-4.0 \
        --vapidir $(top_srcdir)/plugins
 
-plugins_shotwell_publishing_extras_libshotwell_publishing_extras_la_CFLAGS = \
+plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_CFLAGS = \
        $(PLUGIN_CFLAGS) \
        $(COMMON_CFLAGS) \
        -I $(top_srcdir)/plugins
 
-plugins_shotwell_publishing_extras_libshotwell_publishing_extras_la_LDFLAGS = \
+plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_LDFLAGS = \
        $(SHOTWELL_PLUGIN_LDFLAGS)
 
-plugins_shotwell_publishing_extras_libshotwell_publishing_extras_la_LIBADD = \
+plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_LIBADD = \
        $(top_builddir)/plugins/common/libshotwell-plugin-common.la
diff --git a/publish.am b/publish.am
index 6bf705f..b120816 100644
--- a/publish.am
+++ b/publish.am
@@ -1,6 +1,7 @@
-pkglib_LTLIBRARIES = plugins/shotwell-publishing/libshotwell-publishing.la
+plugin_LTLIBRARIES += plugins/shotwell-publishing/shotwell-publishing.la
 
-plugins_shotwell_publishing_libshotwell_publishing_la_SOURCES = \
+
+plugins_shotwell_publishing_shotwell_publishing_la_SOURCES = \
        plugins/shotwell-publishing/shotwell-publishing.vala \
        plugins/shotwell-publishing/FacebookPublishing.vala \
        plugins/shotwell-publishing/PicasaPublishing.vala \
@@ -9,7 +10,7 @@ plugins_shotwell_publishing_libshotwell_publishing_la_SOURCES = \
        plugins/shotwell-publishing/PiwigoPublishing.vala \
        plugins/shotwell-plugin-common.vapi
 
-plugins_shotwell_publishing_libshotwell_publishing_la_VALAFLAGS = \
+plugins_shotwell_publishing_shotwell_publishing_la_VALAFLAGS = \
        $(COMMON_VALAFLAGS) \
        --pkg gtk+-3.0 \
        --pkg libsoup-2.4 \
@@ -22,13 +23,13 @@ plugins_shotwell_publishing_libshotwell_publishing_la_VALAFLAGS = \
        --pkg webkit2gtk-4.0 \
        --vapidir $(top_srcdir)/plugins
 
-plugins_shotwell_publishing_libshotwell_publishing_la_CFLAGS = \
+plugins_shotwell_publishing_shotwell_publishing_la_CFLAGS = \
        $(PLUGIN_CFLAGS) \
        $(COMMON_CFLAGS) \
        -I $(top_srcdir)/plugins
 
-plugins_shotwell_publishing_libshotwell_publishing_la_LDFLAGS = \
+plugins_shotwell_publishing_shotwell_publishing_la_LDFLAGS = \
        $(SHOTWELL_PLUGIN_LDFLAGS)
 
-plugins_shotwell_publishing_libshotwell_publishing_la_LIBADD = \
+plugins_shotwell_publishing_shotwell_publishing_la_LIBADD = \
        $(top_builddir)/plugins/common/libshotwell-plugin-common.la
diff --git a/transition.am b/transition.am
index 3326810..5e60944 100644
--- a/transition.am
+++ b/transition.am
@@ -1,6 +1,6 @@
-pkglib_LTLIBRARIES += plugins/shotwell-transitions/libshotwell-transitions.la
+plugin_LTLIBRARIES += plugins/shotwell-transitions/shotwell-transitions.la
 
-plugins_shotwell_transitions_libshotwell_transitions_la_SOURCES = \
+plugins_shotwell_transitions_shotwell_transitions_la_SOURCES = \
        plugins/shotwell-transitions/BlindsEffect.vala \
        plugins/shotwell-transitions/ChessEffect.vala \
        plugins/shotwell-transitions/CircleEffect.vala \
@@ -14,7 +14,7 @@ plugins_shotwell_transitions_libshotwell_transitions_la_SOURCES = \
        plugins/shotwell-transitions/StripesEffect.vala \
        plugins/shotwell-plugin-common.vapi
 
-plugins_shotwell_transitions_libshotwell_transitions_la_VALAFLAGS = \
+plugins_shotwell_transitions_shotwell_transitions_la_VALAFLAGS = \
        $(COMMON_VALAFLAGS) \
        --pkg gtk+-3.0 \
        --pkg libsoup-2.4 \
@@ -27,13 +27,13 @@ plugins_shotwell_transitions_libshotwell_transitions_la_VALAFLAGS = \
        --pkg webkit2gtk-4.0 \
        --vapidir $(top_srcdir)/plugins
 
-plugins_shotwell_transitions_libshotwell_transitions_la_CFLAGS = \
+plugins_shotwell_transitions_shotwell_transitions_la_CFLAGS = \
        $(PLUGIN_CFLAGS) \
        $(COMMON_CFLAGS) \
        -I $(top_srcdir)/plugins
 
-plugins_shotwell_transitions_libshotwell_transitions_la_LDFLAGS = \
+plugins_shotwell_transitions_shotwell_transitions_la_LDFLAGS = \
        $(SHOTWELL_PLUGIN_LDFLAGS)
 
-plugins_shotwell_transitions_libshotwell_transitions_la_LIBADD = \
+plugins_shotwell_transitions_shotwell_transitions_la_LIBADD = \
        $(top_builddir)/plugins/common/libshotwell-plugin-common.la