[gvfs] Fix build error when using HAL backend

[Ting-Wei Lan <lantw src gnome org>]

commit 32377d138d4d28f5da5ed0935d4b90fa2647c1ec
Author: Ting-Wei Lan <lantw src gnome org>
Date:   Thu Feb 5 11:57:08 2015 +0800

    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

 common/Makefile.am                                 |   10 ++++++++++
 .../hal/gvfsdbusutils.c => common/gvfshalutils.c   |    2 +-
 .../hal/gvfsdbusutils.h => common/gvfshalutils.h   |    0
 daemon/Makefile.am                                 |    6 ++++--
 monitor/gphoto2/Makefile.am                        |    5 ++++-
 monitor/gphoto2/hal-pool.c                         |    2 +-
 monitor/hal/Makefile.am                            |    2 +-
 monitor/hal/hal-pool.c                             |    2 +-
 8 files changed, 22 insertions(+), 7 deletions(-)
---
diff --git a/common/Makefile.am b/common/Makefile.am
index ac860ce..932b46b 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -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)
diff --git a/monitor/hal/gvfsdbusutils.c b/common/gvfshalutils.c
similarity index 99%
rename from monitor/hal/gvfsdbusutils.c
rename to common/gvfshalutils.c
index 08a6205..113e228 100644
--- a/monitor/hal/gvfsdbusutils.c
+++ b/common/gvfshalutils.c
@@ -26,7 +26,7 @@
 #include <string.h>
 
 #include <glib/gi18n-lib.h>
-#include <gvfsdbusutils.h>
+#include <gvfshalutils.h>
 #include <gio/gio.h>
 
 static void
diff --git a/monitor/hal/gvfsdbusutils.h b/common/gvfshalutils.h
similarity index 100%
rename from monitor/hal/gvfsdbusutils.h
rename to common/gvfshalutils.h
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 34e4ad8..d55a1d9 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -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 = \
diff --git a/monitor/gphoto2/Makefile.am b/monitor/gphoto2/Makefile.am
index 106b781..663c3a9 100644
--- a/monitor/gphoto2/Makefile.am
+++ b/monitor/gphoto2/Makefile.am
@@ -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
 
 
diff --git a/monitor/gphoto2/hal-pool.c b/monitor/gphoto2/hal-pool.c
index d691a71..f73ac2f 100644
--- a/monitor/gphoto2/hal-pool.c
+++ b/monitor/gphoto2/hal-pool.c
@@ -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"
diff --git a/monitor/hal/Makefile.am b/monitor/hal/Makefile.am
index 002cfca..81d6c10 100644
--- a/monitor/hal/Makefile.am
+++ b/monitor/hal/Makefile.am
@@ -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)
diff --git a/monitor/hal/hal-pool.c b/monitor/hal/hal-pool.c
index ec92aa7..c31abf2 100644
--- a/monitor/hal/hal-pool.c
+++ b/monitor/hal/hal-pool.c
@@ -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"