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



commit 7e08724d9581669cfd89b1fdaeb6fb5fec0b20c3
Author: Richard Hughes <richard hughsie com>
Date:   Tue Mar 7 11:40:12 2017 +0000

    trivial: Split out limba to a new directory

 configure.ac                                       |    1 +
 plugins/Makefile.am                                |   18 ++++++------------
 plugins/limba/Makefile.am                          |   18 ++++++++++++++++++
 plugins/{ => limba}/gs-plugin-limba.c              |    0
 ...org.gnome.Software.Plugin.Limba.metainfo.xml.in |    0
 po/POTFILES.in                                     |    2 +-
 6 files changed, 26 insertions(+), 13 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index eb71e9e..d92b6b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -506,6 +506,7 @@ doc/api/Makefile
 lib/Makefile
 lib/gnome-software.pc
 plugins/Makefile
+plugins/limba/Makefile
 src/Makefile
 tests/Makefile
 ])
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 32e3806..befc842 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,6 +1,12 @@
 ## We require new-style dependency handling.
 AUTOMAKE_OPTIONS = 1.7
 
+SUBDIRS =
+
+if HAVE_LIMBA
+SUBDIRS += limba
+endif
+
 AM_CPPFLAGS =                                          \
        -DI_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE  \
        -DDATADIR=\"$(datadir)\"                        \
@@ -87,10 +93,6 @@ if HAVE_OSTREE
 plugin_LTLIBRARIES += libgs_plugin_ostree.la
 endif
 
-if HAVE_LIMBA
-plugin_LTLIBRARIES += libgs_plugin_limba.la
-endif
-
 if HAVE_STEAM
 plugin_LTLIBRARIES += libgs_plugin_steam.la
 endif
@@ -189,14 +191,6 @@ libgs_plugin_appstream_la_LIBADD = $(GS_PLUGIN_LIBS) $(APPSTREAM_LIBS)
 libgs_plugin_appstream_la_LDFLAGS = -module -avoid-version
 libgs_plugin_appstream_la_CFLAGS = $(GS_PLUGIN_CFLAGS)
 
-if HAVE_LIMBA
-appdata_in_files += org.gnome.Software.Plugin.Limba.metainfo.xml.in
-libgs_plugin_limba_la_SOURCES = gs-plugin-limba.c
-libgs_plugin_limba_la_LIBADD = $(GS_PLUGIN_LIBS) $(LIMBA_LIBS)
-libgs_plugin_limba_la_LDFLAGS = -module -avoid-version
-libgs_plugin_limba_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(LIMBA_CFLAGS)
-endif
-
 if HAVE_FLATPAK
 appdata_in_files += org.gnome.Software.Plugin.Flatpak.metainfo.xml.in
 libgs_plugin_flatpak_la_SOURCES =                      \
diff --git a/plugins/limba/Makefile.am b/plugins/limba/Makefile.am
new file mode 100644
index 0000000..f011086
--- /dev/null
+++ b/plugins/limba/Makefile.am
@@ -0,0 +1,18 @@
+plugindir = $(GS_PLUGIN_DIR)
+plugin_LTLIBRARIES = libgs_plugin_limba.la
+
+libgs_plugin_limba_la_SOURCES = gs-plugin-limba.c
+libgs_plugin_limba_la_LIBADD = $(GS_PLUGIN_LIBS) $(LIMBA_LIBS)
+libgs_plugin_limba_la_LDFLAGS = -module -avoid-version
+libgs_plugin_limba_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(LIMBA_CFLAGS)
+
+%.metainfo.xml: %.metainfo.xml.in
+       $(AM_V_GEN) msgfmt --xml -d $(top_srcdir)/po --template $< -o $@
+
+appdata_in_files = org.gnome.Software.Plugin.Limba.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-limba.c b/plugins/limba/gs-plugin-limba.c
similarity index 100%
rename from plugins/gs-plugin-limba.c
rename to plugins/limba/gs-plugin-limba.c
diff --git a/plugins/org.gnome.Software.Plugin.Limba.metainfo.xml.in 
b/plugins/limba/org.gnome.Software.Plugin.Limba.metainfo.xml.in
similarity index 100%
rename from plugins/org.gnome.Software.Plugin.Limba.metainfo.xml.in
rename to plugins/limba/org.gnome.Software.Plugin.Limba.metainfo.xml.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5b5b015..a989af6 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -72,7 +72,7 @@ plugins/gs-plugin-generic-updates.c
 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/org.gnome.Software.Plugin.Limba.metainfo.xml.in
+plugins/limba/org.gnome.Software.Plugin.Limba.metainfo.xml.in
 plugins/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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]