Commit 32377d13 authored by Ting-Wei Lan's avatar Ting-Wei Lan

Fix build error when using HAL backend

gvfsdbusutils.[ch] are renamed to gvfshalutils.[ch] to prevent confusion.

https://bugzilla.gnome.org/show_bug.cgi?id=722411
parent 05e83e53
......@@ -43,6 +43,16 @@ libgvfscommon_la_LIBADD = \
$(GLIB_LIBS) \
$(BLURAY_LIBS)
if USE_HAL
noinst_LTLIBRARIES += libgvfscommon-hal.la
libgvfscommon_hal_la_SOURCES = \
gvfshalutils.c gvfshalutils.h
libgvfscommon_hal_la_CFLAGS = \
$(DBUS_CFLAGS)
libgvfscommon_hal_la_LIBADD = \
$(DBUS_LIBS)
endif
libgvfscommon_monitor_la_SOURCES = \
gvfsmountinfo.h gvfsmountinfo.c \
$(NULL)
......
......@@ -26,7 +26,7 @@
#include <string.h>
#include <glib/gi18n-lib.h>
#include <gvfsdbusutils.h>
#include <gvfshalutils.h>
#include <gio/gio.h>
static void
......
......@@ -423,7 +423,8 @@ endif
if USE_GUDEV
gvfsd_cdda_LDADD = $(libraries) $(CDDA_LIBS) $(GUDEV_LIBS)
else
gvfsd_cdda_LDADD = $(libraries) $(CDDA_LIBS) $(HAL_LIBS)
gvfsd_cdda_LDADD = $(libraries) $(CDDA_LIBS) $(HAL_LIBS) \
$(top_builddir)/common/libgvfscommon-hal.la
endif
gvfsd_gphoto2_SOURCES = \
......@@ -448,7 +449,8 @@ if USE_GUDEV
gvfsd_gphoto2_LDADD = $(libraries) $(GPHOTO2_LIBS) $(GUDEV_LIBS) \
$(top_builddir)/common/libgvfscommon-gphoto2.la
else
gvfsd_gphoto2_LDADD = $(libraries) $(GPHOTO2_LIBS) $(HAL_LIBS)
gvfsd_gphoto2_LDADD = $(libraries) $(GPHOTO2_LIBS) $(HAL_LIBS) \
$(top_builddir)/common/libgvfscommon-hal.la
endif
gvfsd_mtp_SOURCES = \
......
......@@ -63,7 +63,10 @@ gvfs_gphoto2_volume_monitor_LDADD += \
$(top_builddir)/common/libgvfscommon-gphoto2.la \
$(NULL)
else
gvfs_gphoto2_volume_monitor_LDADD += $(HAL_LIBS)
gvfs_gphoto2_volume_monitor_LDADD += \
$(HAL_LIBS) \
$(top_builddir)/common/libgvfscommon-hal.la \
$(NULL)
endif
......
......@@ -23,7 +23,7 @@
#include <string.h>
#include <sys/time.h>
#include <gvfsdbusutils.h>
#include <gvfshalutils.h>
#include "hal-pool.h"
#include "hal-marshal.h"
......
......@@ -23,7 +23,6 @@ gvfs_hal_volume_monitor_SOURCES = \
ghalvolume.c ghalvolume.h \
ghalmount.c ghalmount.h \
ghalvolumemonitor.c ghalvolumemonitor.h \
gvfsdbusutils.c gvfsdbusutils.h \
$(NULL)
gvfs_hal_volume_monitor_CFLAGS = \
......@@ -45,6 +44,7 @@ gvfs_hal_volume_monitor_LDADD = \
$(DBUS_LIBS) \
$(HAL_LIBS) \
$(top_builddir)/common/libgvfscommon.la \
$(top_builddir)/common/libgvfscommon-hal.la \
$(top_builddir)/common/libgvfscommon-monitor.la \
$(top_builddir)/monitor/proxy/libgvfsproxyvolumemonitordaemon-noin.la \
$(NULL)
......
......@@ -23,7 +23,7 @@
#include <string.h>
#include <sys/time.h>
#include <gvfsdbusutils.h>
#include <gvfshalutils.h>
#include "hal-pool.h"
#include "hal-marshal.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment