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

[Richard Hughes <rhughes src gnome org>]

commit 25e294c9bad336a2be3658b998a19185982bde58
Author: Richard Hughes <richard hughsie com>
Date:   Tue Mar 7 11:43:25 2017 +0000

    trivial: Split out odrs to a new directory

 configure.ac                                       |    1 +
 plugins/Makefile.am                                |   16 ++++------------
 plugins/odrs/Makefile.am                           |   18 ++++++++++++++++++
 plugins/{ => odrs}/gs-plugin-odrs.c                |    0
 .../org.gnome.Software.Plugin.Odrs.metainfo.xml.in |    0
 po/POTFILES.in                                     |    2 +-
 6 files changed, 24 insertions(+), 13 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d92b6b2..33bc181 100644
--- a/configure.ac
+++ b/configure.ac
@@ -507,6 +507,7 @@ lib/Makefile
 lib/gnome-software.pc
 plugins/Makefile
 plugins/limba/Makefile
+plugins/odrs/Makefile
 src/Makefile
 tests/Makefile
 ])
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index befc842..406c29f 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -7,6 +7,10 @@ if HAVE_LIMBA
 SUBDIRS += limba
 endif
 
+if HAVE_ODRS
+SUBDIRS += odrs
+endif
+
 AM_CPPFLAGS =                                          \
        -DI_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE  \
        -DDATADIR=\"$(datadir)\"                        \
@@ -97,10 +101,6 @@ if HAVE_STEAM
 plugin_LTLIBRARIES += libgs_plugin_steam.la
 endif
 
-if HAVE_ODRS
-plugin_LTLIBRARIES += libgs_plugin_odrs.la
-endif
-
 if HAVE_RPM
 plugin_LTLIBRARIES += libgs_plugin_rpm.la
 endif
@@ -213,14 +213,6 @@ libgs_plugin_ostree_la_LDFLAGS = -module -avoid-version
 libgs_plugin_ostree_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(OSTREE_CFLAGS)
 endif
 
-if HAVE_ODRS
-appdata_in_files += org.gnome.Software.Plugin.Odrs.metainfo.xml.in
-libgs_plugin_odrs_la_SOURCES = gs-plugin-odrs.c
-libgs_plugin_odrs_la_LIBADD = $(GS_PLUGIN_LIBS) $(JSON_GLIB_LIBS)
-libgs_plugin_odrs_la_LDFLAGS = -module -avoid-version
-libgs_plugin_odrs_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(JSON_GLIB_CFLAGS)
-endif
-
 if HAVE_RPM
 libgs_plugin_rpm_la_SOURCES = gs-plugin-rpm.c
 libgs_plugin_rpm_la_LIBADD = $(GS_PLUGIN_LIBS) $(RPM_LIBS)
diff --git a/plugins/odrs/Makefile.am b/plugins/odrs/Makefile.am
new file mode 100644
index 0000000..ae779ae
--- /dev/null
+++ b/plugins/odrs/Makefile.am
@@ -0,0 +1,18 @@
+plugindir = $(GS_PLUGIN_DIR)
+plugin_LTLIBRARIES = libgs_plugin_odrs.la
+
+libgs_plugin_odrs_la_SOURCES = gs-plugin-odrs.c
+libgs_plugin_odrs_la_LIBADD = $(GS_PLUGIN_LIBS) $(JSON_GLIB_LIBS)
+libgs_plugin_odrs_la_LDFLAGS = -module -avoid-version
+libgs_plugin_odrs_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(JSON_GLIB_CFLAGS)
+
+%.metainfo.xml: %.metainfo.xml.in
+       $(AM_V_GEN) msgfmt --xml -d $(top_srcdir)/po --template $< -o $@
+
+appdata_in_files = org.gnome.Software.Plugin.Odrs.metainfo.xml.in
+appdatadir = $(datadir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+EXTRA_DIST = $(appdata_in_files)
+CLEANFILES = $(appdata_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/gs-plugin-odrs.c b/plugins/odrs/gs-plugin-odrs.c
similarity index 100%
rename from plugins/gs-plugin-odrs.c
rename to plugins/odrs/gs-plugin-odrs.c
diff --git a/plugins/org.gnome.Software.Plugin.Odrs.metainfo.xml.in 
b/plugins/odrs/org.gnome.Software.Plugin.Odrs.metainfo.xml.in
similarity index 100%
rename from plugins/org.gnome.Software.Plugin.Odrs.metainfo.xml.in
rename to plugins/odrs/org.gnome.Software.Plugin.Odrs.metainfo.xml.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a989af6..b6d6240 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -73,6 +73,6 @@ plugins/org.gnome.Software.Plugin.Epiphany.metainfo.xml.in
 plugins/org.gnome.Software.Plugin.Flatpak.metainfo.xml.in
 plugins/org.gnome.Software.Plugin.Fwupd.metainfo.xml.in
 plugins/limba/org.gnome.Software.Plugin.Limba.metainfo.xml.in
-plugins/org.gnome.Software.Plugin.Odrs.metainfo.xml.in
+plugins/odrs/org.gnome.Software.Plugin.Odrs.metainfo.xml.in
 plugins/org.gnome.Software.Plugin.Snap.metainfo.xml.in
 plugins/org.gnome.Software.Plugin.Steam.metainfo.xml.in