diff options
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | Makefile.am | 4 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | monitor/Makefile.am | 4 | ||||
-rw-r--r-- | monitor/hal/Makefile.am (renamed from hal/Makefile.am) | 0 | ||||
-rw-r--r-- | monitor/hal/ghaldrive.c (renamed from hal/ghaldrive.c) | 0 | ||||
-rw-r--r-- | monitor/hal/ghaldrive.h (renamed from hal/ghaldrive.h) | 0 | ||||
-rw-r--r-- | monitor/hal/ghalmount.c (renamed from hal/ghalmount.c) | 0 | ||||
-rw-r--r-- | monitor/hal/ghalmount.h (renamed from hal/ghalmount.h) | 0 | ||||
-rw-r--r-- | monitor/hal/ghalvolume.c (renamed from hal/ghalvolume.c) | 0 | ||||
-rw-r--r-- | monitor/hal/ghalvolume.h (renamed from hal/ghalvolume.h) | 0 | ||||
-rw-r--r-- | monitor/hal/ghalvolumemonitor.c (renamed from hal/ghalvolumemonitor.c) | 0 | ||||
-rw-r--r-- | monitor/hal/ghalvolumemonitor.h (renamed from hal/ghalvolumemonitor.h) | 0 | ||||
-rw-r--r-- | monitor/hal/hal-device.c (renamed from hal/hal-device.c) | 0 | ||||
-rw-r--r-- | monitor/hal/hal-device.h (renamed from hal/hal-device.h) | 0 | ||||
-rw-r--r-- | monitor/hal/hal-marshal.list (renamed from hal/hal-marshal.list) | 0 | ||||
-rw-r--r-- | monitor/hal/hal-pool.c (renamed from hal/hal-pool.c) | 0 | ||||
-rw-r--r-- | monitor/hal/hal-pool.h (renamed from hal/hal-pool.h) | 0 | ||||
-rw-r--r-- | monitor/hal/hal-utils.c (renamed from hal/hal-utils.c) | 0 | ||||
-rw-r--r-- | monitor/hal/hal-utils.h (renamed from hal/hal-utils.h) | 0 | ||||
-rw-r--r-- | monitor/hal/hal-volume-monitor-daemon.c (renamed from hal/hal-volume-monitor-daemon.c) | 0 | ||||
-rw-r--r-- | monitor/hal/hal.monitor (renamed from hal/hal.monitor) | 0 | ||||
-rw-r--r-- | monitor/hal/org.gtk.Private.HalVolumeMonitor.service.in (renamed from hal/org.gtk.Private.HalVolumeMonitor.service.in) | 0 |
23 files changed, 14 insertions, 5 deletions
@@ -1,5 +1,14 @@ 2008-07-08 David Zeuthen <davidz@redhat.com> + * configure.in: + * Makefile.am: + * hal/*: + * monitor/Makefile.am: + * monitor/hal/*: + Move hal/ to monitor/hal/. + +2008-07-08 David Zeuthen <davidz@redhat.com> + Provide infrastructure for out of process volume monitors and port the hal volume monitor to use it (#520132). diff --git a/Makefile.am b/Makefile.am index f7acc82a..1964e259 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,10 +11,6 @@ SUBDIRS = \ test \ $(NULL) -if USE_HAL -SUBDIRS += hal -endif - DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc EXTRA_DIST = \ diff --git a/configure.ac b/configure.ac index 8d6c069c..a6b0f4f3 100644 --- a/configure.ac +++ b/configure.ac @@ -556,7 +556,7 @@ client/Makefile daemon/Makefile monitor/Makefile monitor/proxy/Makefile -hal/Makefile +monitor/hal/Makefile gconf/Makefile programs/Makefile test/Makefile diff --git a/monitor/Makefile.am b/monitor/Makefile.am index c7df834a..4e3aabde 100644 --- a/monitor/Makefile.am +++ b/monitor/Makefile.am @@ -1,2 +1,6 @@ SUBDIRS = proxy + +if USE_HAL +SUBDIRS += hal +endif diff --git a/hal/Makefile.am b/monitor/hal/Makefile.am index 38486aff..38486aff 100644 --- a/hal/Makefile.am +++ b/monitor/hal/Makefile.am diff --git a/hal/ghaldrive.c b/monitor/hal/ghaldrive.c index 7a85e888..7a85e888 100644 --- a/hal/ghaldrive.c +++ b/monitor/hal/ghaldrive.c diff --git a/hal/ghaldrive.h b/monitor/hal/ghaldrive.h index 7832db59..7832db59 100644 --- a/hal/ghaldrive.h +++ b/monitor/hal/ghaldrive.h diff --git a/hal/ghalmount.c b/monitor/hal/ghalmount.c index c277e902..c277e902 100644 --- a/hal/ghalmount.c +++ b/monitor/hal/ghalmount.c diff --git a/hal/ghalmount.h b/monitor/hal/ghalmount.h index 31981aed..31981aed 100644 --- a/hal/ghalmount.h +++ b/monitor/hal/ghalmount.h diff --git a/hal/ghalvolume.c b/monitor/hal/ghalvolume.c index 9cb9c951..9cb9c951 100644 --- a/hal/ghalvolume.c +++ b/monitor/hal/ghalvolume.c diff --git a/hal/ghalvolume.h b/monitor/hal/ghalvolume.h index edbdfb31..edbdfb31 100644 --- a/hal/ghalvolume.h +++ b/monitor/hal/ghalvolume.h diff --git a/hal/ghalvolumemonitor.c b/monitor/hal/ghalvolumemonitor.c index 76b88bde..76b88bde 100644 --- a/hal/ghalvolumemonitor.c +++ b/monitor/hal/ghalvolumemonitor.c diff --git a/hal/ghalvolumemonitor.h b/monitor/hal/ghalvolumemonitor.h index a8397030..a8397030 100644 --- a/hal/ghalvolumemonitor.h +++ b/monitor/hal/ghalvolumemonitor.h diff --git a/hal/hal-device.c b/monitor/hal/hal-device.c index 9f0b5bc3..9f0b5bc3 100644 --- a/hal/hal-device.c +++ b/monitor/hal/hal-device.c diff --git a/hal/hal-device.h b/monitor/hal/hal-device.h index 8e91aa63..8e91aa63 100644 --- a/hal/hal-device.h +++ b/monitor/hal/hal-device.h diff --git a/hal/hal-marshal.list b/monitor/hal/hal-marshal.list index 52c82338..52c82338 100644 --- a/hal/hal-marshal.list +++ b/monitor/hal/hal-marshal.list diff --git a/hal/hal-pool.c b/monitor/hal/hal-pool.c index 770effd9..770effd9 100644 --- a/hal/hal-pool.c +++ b/monitor/hal/hal-pool.c diff --git a/hal/hal-pool.h b/monitor/hal/hal-pool.h index 04c8687d..04c8687d 100644 --- a/hal/hal-pool.h +++ b/monitor/hal/hal-pool.h diff --git a/hal/hal-utils.c b/monitor/hal/hal-utils.c index ca90bc7c..ca90bc7c 100644 --- a/hal/hal-utils.c +++ b/monitor/hal/hal-utils.c diff --git a/hal/hal-utils.h b/monitor/hal/hal-utils.h index 7244a29c..7244a29c 100644 --- a/hal/hal-utils.h +++ b/monitor/hal/hal-utils.h diff --git a/hal/hal-volume-monitor-daemon.c b/monitor/hal/hal-volume-monitor-daemon.c index 6f83175d..6f83175d 100644 --- a/hal/hal-volume-monitor-daemon.c +++ b/monitor/hal/hal-volume-monitor-daemon.c diff --git a/hal/hal.monitor b/monitor/hal/hal.monitor index c287f853..c287f853 100644 --- a/hal/hal.monitor +++ b/monitor/hal/hal.monitor diff --git a/hal/org.gtk.Private.HalVolumeMonitor.service.in b/monitor/hal/org.gtk.Private.HalVolumeMonitor.service.in index c785241d..c785241d 100644 --- a/hal/org.gtk.Private.HalVolumeMonitor.service.in +++ b/monitor/hal/org.gtk.Private.HalVolumeMonitor.service.in |