[gvfs] Remove unused code from client libs
- From: Alexander Larsson <alexl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gvfs] Remove unused code from client libs
- Date: Tue, 21 Aug 2012 11:03:50 +0000 (UTC)
commit 6cbe00dbfa5d4035918d5a2b28228dd5db915652
Author: Alexander Larsson <alexl redhat com>
Date: Tue Aug 21 13:02:56 2012 +0200
Remove unused code from client libs
The gvfsmountinfo.c (and its libbluray dependency) is unused by
the client code, so we remove it from the common shared lib.
We use a non-shared lib for this, as in practice only one of the
monitors that use this code will be build/installed/used.
common/Makefile.am | 15 ++++++++++++++-
monitor/gdu/Makefile.am | 1 +
monitor/hal/Makefile.am | 1 +
monitor/udisks2/Makefile.am | 1 +
4 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/common/Makefile.am b/common/Makefile.am
index 5eada63..80f26ac 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1,6 +1,7 @@
NULL =
lib_LTLIBRARIES=libgvfscommon.la
+noinst_LTLIBRARIES = libgvfscommon-monitor.la
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gvfs \
-I$(top_srcdir)/daemon \
@@ -25,7 +26,6 @@ libgvfscommon_la_SOURCES = \
gmounttracker.c gmounttracker.h \
gvfsdaemonprotocol.c gvfsdaemonprotocol.h \
gvfsicon.h gvfsicon.c \
- gvfsmountinfo.h gvfsmountinfo.c \
gvfsfileinfo.c gvfsfileinfo.h \
$(dbus_built_sources) \
$(NULL)
@@ -37,6 +37,19 @@ libgvfscommon_la_LIBADD = \
$(GLIB_LIBS) \
$(BLURAY_LIBS)
+libgvfscommon_monitor_la_SOURCES = \
+ gvfsmountinfo.h gvfsmountinfo.c \
+ $(NULL)
+
+libgvfscommon_monitor_la_CFLAGS = \
+ $(GLIB_LIBS) \
+ $(BLURAY_CFLAGS)
+
+libgvfscommon_monitor_la_LIBADD = \
+ libgvfscommon.la \
+ $(BLURAY_LIBS) \
+ $(GLIB_LIBS)
+
if HAVE_AVAHI
lib_LTLIBRARIES += libgvfscommon-dnssd.la
diff --git a/monitor/gdu/Makefile.am b/monitor/gdu/Makefile.am
index 5d49cbc..6871f58 100644
--- a/monitor/gdu/Makefile.am
+++ b/monitor/gdu/Makefile.am
@@ -32,6 +32,7 @@ gvfs_gdu_volume_monitor_LDADD = \
$(GDU_LIBS) \
$(GUDEV_LIBS) \
$(top_builddir)/common/libgvfscommon.la \
+ $(top_builddir)/common/libgvfscommon-monitor.la \
$(top_builddir)/monitor/proxy/libgvfsproxyvolumemonitordaemon-noin.la \
$(NULL)
diff --git a/monitor/hal/Makefile.am b/monitor/hal/Makefile.am
index da8fc7b..8ccced6 100644
--- a/monitor/hal/Makefile.am
+++ b/monitor/hal/Makefile.am
@@ -42,6 +42,7 @@ gvfs_hal_volume_monitor_LDADD = \
$(GLIB_LIBS) \
$(HAL_LIBS) \
$(top_builddir)/common/libgvfscommon.la \
+ $(top_builddir)/common/libgvfscommon-monitor.la \
$(top_builddir)/monitor/proxy/libgvfsproxyvolumemonitordaemon-noin.la \
$(NULL)
diff --git a/monitor/udisks2/Makefile.am b/monitor/udisks2/Makefile.am
index 36d80e0..723380b 100644
--- a/monitor/udisks2/Makefile.am
+++ b/monitor/udisks2/Makefile.am
@@ -37,6 +37,7 @@ gvfs_udisks2_volume_monitor_LDADD = \
$(LIBSYSTEMD_LOGIN_LIBS) \
$(KEYRING_LIBS) \
$(top_builddir)/common/libgvfscommon.la \
+ $(top_builddir)/common/libgvfscommon-monitor.la \
$(top_builddir)/monitor/proxy/libgvfsproxyvolumemonitordaemon-noin.la \
$(NULL)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]