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



commit 87e021d971ea96c3f188e3317108325d8afc647f
Author: Richard Hughes <richard hughsie com>
Date:   Tue Mar 7 16:18:18 2017 +0000

    trivial: Split out shell-extensions to a new directory

 configure.ac                                       |    1 +
 plugins/Makefile.am                                |   15 ++++-----------
 plugins/shell-extensions/Makefile.am               |    8 ++++++++
 .../gs-plugin-shell-extensions.c                   |    0
 4 files changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ea3b234..98dfe19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -498,6 +498,7 @@ plugins/odrs/Makefile
 plugins/ostree/Makefile
 plugins/packagekit/Makefile
 plugins/repos/Makefile
+plugins/shell-extensions/Makefile
 plugins/snap/Makefile
 plugins/steam/Makefile
 plugins/ubuntuone/Makefile
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 471cefd..f4f1ca5 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -56,6 +56,10 @@ if HAVE_WEBAPPS
 SUBDIRS += epiphany
 endif
 
+if HAVE_SHELL_EXTENSIONS
+SUBDIRS += shell-extensions
+endif
+
 AM_CPPFLAGS =                                          \
        -DDATADIR=\"$(datadir)\"                        \
        -DG_LOG_DOMAIN=\"GsPlugin\"                     \
@@ -71,21 +75,10 @@ plugin_LTLIBRARIES =
 
 appdata_in_files =
 
-if HAVE_SHELL_EXTENSIONS
-plugin_LTLIBRARIES += libgs_plugin_shell-extensions.la
-endif
-
 if HAVE_FLATPAK
 plugin_LTLIBRARIES += libgs_plugin_flatpak.la
 endif
 
-if HAVE_SHELL_EXTENSIONS
-libgs_plugin_shell_extensions_la_SOURCES = gs-plugin-shell-extensions.c
-libgs_plugin_shell_extensions_la_LIBADD = $(GS_PLUGIN_LIBS) $(JSON_GLIB_LIBS)
-libgs_plugin_shell_extensions_la_LDFLAGS = -module -avoid-version
-libgs_plugin_shell_extensions_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(JSON_GLIB_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/shell-extensions/Makefile.am b/plugins/shell-extensions/Makefile.am
new file mode 100644
index 0000000..b3fc7c2
--- /dev/null
+++ b/plugins/shell-extensions/Makefile.am
@@ -0,0 +1,8 @@
+plugindir = $(GS_PLUGIN_DIR)
+plugin_LTLIBRARIES = libgs_plugin_shell-extensions.la
+libgs_plugin_shell_extensions_la_SOURCES = gs-plugin-shell-extensions.c
+libgs_plugin_shell_extensions_la_LIBADD = $(GS_PLUGIN_LIBS) $(JSON_GLIB_LIBS)
+libgs_plugin_shell_extensions_la_LDFLAGS = -module -avoid-version
+libgs_plugin_shell_extensions_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(JSON_GLIB_CFLAGS)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/gs-plugin-shell-extensions.c b/plugins/shell-extensions/gs-plugin-shell-extensions.c
similarity index 100%
rename from plugins/gs-plugin-shell-extensions.c
rename to plugins/shell-extensions/gs-plugin-shell-extensions.c


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