[gnome-software] trivial: Split out ostree to a new directory
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software] trivial: Split out ostree to a new directory
- Date: Tue, 7 Mar 2017 17:04:49 +0000 (UTC)
commit 233cc0362184bc98e8ce5a8e0acfa2238673ff32
Author: Richard Hughes <richard hughsie com>
Date: Tue Mar 7 11:58:13 2017 +0000
trivial: Split out ostree to a new directory
configure.ac | 1 +
plugins/Makefile.am | 15 ++++-----------
plugins/ostree/Makefile.am | 9 +++++++++
plugins/{ => ostree}/gs-plugin-ostree.c | 0
4 files changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d5fefd8..3f76bdb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -508,6 +508,7 @@ lib/gnome-software.pc
plugins/Makefile
plugins/limba/Makefile
plugins/odrs/Makefile
+plugins/ostree/Makefile
plugins/steam/Makefile
plugins/ubuntu-reviews/Makefile
src/Makefile
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 495558e..3ad9660 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -19,6 +19,10 @@ if HAVE_UBUNTU_REVIEWS
SUBDIRS += ubuntu-reviews
endif
+if HAVE_OSTREE
+SUBDIRS += ostree
+endif
+
AM_CPPFLAGS = \
-DI_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE \
-DDATADIR=\"$(datadir)\" \
@@ -97,10 +101,6 @@ if HAVE_FLATPAK
plugin_LTLIBRARIES += libgs_plugin_flatpak.la
endif
-if HAVE_OSTREE
-plugin_LTLIBRARIES += libgs_plugin_ostree.la
-endif
-
if HAVE_RPM
plugin_LTLIBRARIES += libgs_plugin_rpm.la
endif
@@ -206,13 +206,6 @@ libgs_plugin_flatpak_la_LDFLAGS = -module -avoid-version
libgs_plugin_flatpak_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(FLATPAK_CFLAGS)
endif
-if HAVE_OSTREE
-libgs_plugin_ostree_la_SOURCES = gs-plugin-ostree.c
-libgs_plugin_ostree_la_LIBADD = $(GS_PLUGIN_LIBS) $(OSTREE_LIBS)
-libgs_plugin_ostree_la_LDFLAGS = -module -avoid-version
-libgs_plugin_ostree_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(OSTREE_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/ostree/Makefile.am b/plugins/ostree/Makefile.am
new file mode 100644
index 0000000..378f9ae
--- /dev/null
+++ b/plugins/ostree/Makefile.am
@@ -0,0 +1,9 @@
+plugindir = $(GS_PLUGIN_DIR)
+plugin_LTLIBRARIES = libgs_plugin_ostree.la
+
+libgs_plugin_ostree_la_SOURCES = gs-plugin-ostree.c
+libgs_plugin_ostree_la_LIBADD = $(GS_PLUGIN_LIBS) $(OSTREE_LIBS)
+libgs_plugin_ostree_la_LDFLAGS = -module -avoid-version
+libgs_plugin_ostree_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(OSTREE_CFLAGS)
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/gs-plugin-ostree.c b/plugins/ostree/gs-plugin-ostree.c
similarity index 100%
rename from plugins/gs-plugin-ostree.c
rename to plugins/ostree/gs-plugin-ostree.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]