[gnome-software] trivial: Split out external-appstream to a new directory

[Richard Hughes <rhughes src gnome org>]

commit 831036cc669b7ccb8d92dbc003b53090cc31278f
Author: Richard Hughes <richard hughsie com>
Date:   Tue Mar 7 12:02:27 2017 +0000

    trivial: Split out external-appstream to a new directory

 configure.ac                                       |    1 +
 plugins/Makefile.am                                |   24 +++----------------
 plugins/external-appstream/Makefile.am             |   15 ++++++++++++
 .../gs-install-appstream.c                         |    0
 .../gs-plugin-external-appstream.c                 |    0
 po/POTFILES.in                                     |    2 +-
 6 files changed, 21 insertions(+), 21 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3f76bdb..fb6aa04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -506,6 +506,7 @@ doc/api/Makefile
 lib/Makefile
 lib/gnome-software.pc
 plugins/Makefile
+plugins/external-appstream/Makefile
 plugins/limba/Makefile
 plugins/odrs/Makefile
 plugins/ostree/Makefile
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 3ad9660..6d3e864 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -23,6 +23,10 @@ if HAVE_OSTREE
 SUBDIRS += ostree
 endif
 
+if HAVE_EXTERNAL_APPSTREAM
+SUBDIRS += external-appstream
+endif
+
 AM_CPPFLAGS =                                          \
        -DI_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE  \
        -DDATADIR=\"$(datadir)\"                        \
@@ -56,13 +60,6 @@ plugin_LTLIBRARIES =                                 \
 
 appdata_in_files =
 
-if HAVE_EXTERNAL_APPSTREAM
-plugin_LTLIBRARIES += libgs_plugin_external-appstream.la
-
-libexec_PROGRAMS = gnome-software-install-appstream
-
-endif
-
 if HAVE_SNAP
 plugin_LTLIBRARIES += libgs_plugin_snap.la
 endif
@@ -120,19 +117,6 @@ libgs_plugin_generic_updates_la_LIBADD = $(GS_PLUGIN_LIBS)
 libgs_plugin_generic_updates_la_LDFLAGS = -module -avoid-version
 libgs_plugin_generic_updates_la_CFLAGS = $(GS_PLUGIN_CFLAGS)
 
-if HAVE_EXTERNAL_APPSTREAM
-libgs_plugin_external_appstream_la_SOURCES =           \
-       gs-plugin-external-appstream.c
-libgs_plugin_external_appstream_la_LIBADD = $(GS_PLUGIN_LIBS)
-libgs_plugin_external_appstream_la_LDFLAGS = -module -avoid-version
-libgs_plugin_external_appstream_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(SOUP_CFLAGS)
-
-gnome_software_install_appstream_SOURCES = gs-install-appstream.c
-gnome_software_install_appstream_LDADD = $(GLIB_LIBS) $(APPSTREAM_LIBS)
-gnome_software_install_appstream_CFLAGS = $(WARN_CFLAGS)
-gnome_software_install_appstream_LDFLAGS = $(PIE_LDFLAGS) $(RELRO_LDFLAGS)
-endif
-
 libgs_plugin_key_colors_la_SOURCES = gs-plugin-key-colors.c
 libgs_plugin_key_colors_la_LIBADD = $(GS_PLUGIN_LIBS)
 libgs_plugin_key_colors_la_LDFLAGS = -module -avoid-version
diff --git a/plugins/external-appstream/Makefile.am b/plugins/external-appstream/Makefile.am
new file mode 100644
index 0000000..be8f696
--- /dev/null
+++ b/plugins/external-appstream/Makefile.am
@@ -0,0 +1,15 @@
+plugindir = $(GS_PLUGIN_DIR)
+plugin_LTLIBRARIES = libgs_plugin_external-appstream.la
+
+libgs_plugin_external_appstream_la_SOURCES = gs-plugin-external-appstream.c
+libgs_plugin_external_appstream_la_LIBADD = $(GS_PLUGIN_LIBS)
+libgs_plugin_external_appstream_la_LDFLAGS = -module -avoid-version
+libgs_plugin_external_appstream_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(SOUP_CFLAGS)
+
+libexec_PROGRAMS = gnome-software-install-appstream
+gnome_software_install_appstream_SOURCES = gs-install-appstream.c
+gnome_software_install_appstream_LDADD = $(GLIB_LIBS) $(APPSTREAM_LIBS)
+gnome_software_install_appstream_CFLAGS = $(WARN_CFLAGS)
+gnome_software_install_appstream_LDFLAGS = $(PIE_LDFLAGS) $(RELRO_LDFLAGS)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/gs-install-appstream.c b/plugins/external-appstream/gs-install-appstream.c
similarity index 100%
rename from plugins/gs-install-appstream.c
rename to plugins/external-appstream/gs-install-appstream.c
diff --git a/plugins/gs-plugin-external-appstream.c 
b/plugins/external-appstream/gs-plugin-external-appstream.c
similarity index 100%
rename from plugins/gs-plugin-external-appstream.c
rename to plugins/external-appstream/gs-plugin-external-appstream.c
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6b39513..2c64a5a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -66,7 +66,7 @@ src/gs-upgrade-banner.c
 src/gs-upgrade-banner.ui
 src/org.gnome.Software.desktop.in
 plugins/gs-desktop-common.c
-plugins/gs-install-appstream.c
+plugins/external-appstream/gs-install-appstream.c
 plugins/gs-plugin-fedora-distro-upgrades.c
 plugins/gs-plugin-generic-updates.c
 plugins/org.gnome.Software.Plugin.Epiphany.metainfo.xml.in