gvfs r1816 - in trunk: . hal monitor monitor/hal

[davidz svn gnome org]

Author: davidz
Date: Tue Jul  8 16:50:26 2008
New Revision: 1816
URL: http://svn.gnome.org/viewvc/gvfs?rev=1816&view=rev

Log:
2008-07-08  David Zeuthen  <davidz redhat com>

        * configure.in:
        * Makefile.am:
        * hal/*:
        * monitor/Makefile.am:
        * monitor/hal/*:
        Move hal/ to monitor/hal/.



Added:
   trunk/monitor/hal/
      - copied from r1814, /trunk/hal/
   trunk/monitor/hal/Makefile.am
      - copied unchanged from r1815, /trunk/hal/Makefile.am
   trunk/monitor/hal/ghaldrive.c
      - copied unchanged from r1815, /trunk/hal/ghaldrive.c
   trunk/monitor/hal/ghaldrive.h
      - copied unchanged from r1815, /trunk/hal/ghaldrive.h
   trunk/monitor/hal/ghalmount.c
      - copied unchanged from r1815, /trunk/hal/ghalmount.c
   trunk/monitor/hal/ghalmount.h
      - copied unchanged from r1815, /trunk/hal/ghalmount.h
   trunk/monitor/hal/ghalvolume.c
      - copied unchanged from r1815, /trunk/hal/ghalvolume.c
   trunk/monitor/hal/ghalvolume.h
      - copied unchanged from r1815, /trunk/hal/ghalvolume.h
   trunk/monitor/hal/ghalvolumemonitor.c
      - copied unchanged from r1815, /trunk/hal/ghalvolumemonitor.c
   trunk/monitor/hal/ghalvolumemonitor.h
      - copied unchanged from r1815, /trunk/hal/ghalvolumemonitor.h
   trunk/monitor/hal/hal-device.c
      - copied unchanged from r1815, /trunk/hal/hal-device.c
   trunk/monitor/hal/hal-device.h
      - copied unchanged from r1815, /trunk/hal/hal-device.h
   trunk/monitor/hal/hal-pool.c
      - copied unchanged from r1815, /trunk/hal/hal-pool.c
   trunk/monitor/hal/hal-pool.h
      - copied unchanged from r1815, /trunk/hal/hal-pool.h
   trunk/monitor/hal/hal-volume-monitor-daemon.c
      - copied unchanged from r1815, /trunk/hal/hal-volume-monitor-daemon.c
   trunk/monitor/hal/hal.monitor
      - copied unchanged from r1815, /trunk/hal/hal.monitor
   trunk/monitor/hal/org.gtk.Private.HalVolumeMonitor.service.in
      - copied unchanged from r1815, /trunk/hal/org.gtk.Private.HalVolumeMonitor.service.in
Removed:
   trunk/hal/
   trunk/monitor/hal/hal-module.c
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.ac
   trunk/monitor/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Tue Jul  8 16:50:26 2008
@@ -11,10 +11,6 @@
 	test \
 	$(NULL)
 
-if USE_HAL
-SUBDIRS += hal
-endif
-
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
 EXTRA_DIST = \

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Jul  8 16:50:26 2008
@@ -556,7 +556,7 @@
 daemon/Makefile
 monitor/Makefile
 monitor/proxy/Makefile
-hal/Makefile
+monitor/hal/Makefile
 gconf/Makefile
 programs/Makefile
 test/Makefile

Modified: trunk/monitor/Makefile.am
==============================================================================
--- trunk/monitor/Makefile.am	(original)
+++ trunk/monitor/Makefile.am	Tue Jul  8 16:50:26 2008
@@ -1,2 +1,6 @@
 
 SUBDIRS = proxy
+
+if USE_HAL
+SUBDIRS += hal
+endif