hal: Branch 'master'

[Sergey Lapin]

 hald/Makefile.am                 |    2 +-
 hald/hald-cache-test.sh          |    3 +++
 tools/device-manager/Makefile.am |    2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

New commits:
diff-tree 92209ec0ae7b860746beb243fa52a1d405efb29f (from 348b48b3cbe0133759441df102935c759fbecf7f)
Author: Sergey Lapin <slapinid at gmail.com>
Date:   Sun Jan 14 09:46:44 2007 +0300

    Fixed distcheck problem

diff --git a/hald/Makefile.am b/hald/Makefile.am
index c2bfa4a..589832f 100644
--- a/hald/Makefile.am
+++ b/hald/Makefile.am
@@ -81,7 +81,7 @@ endif
  ## Red Hat end
 
 EXTRA_DIST =			\
-	hald_marshal.list
+	hald_marshal.list hald-cache-test.sh
 
 hald_marshal.h: hald_marshal.list
 	glib-genmarshal $< --prefix=hald_marshal --header > $@
diff --git a/hald/hald-cache-test.sh b/hald/hald-cache-test.sh
index ee09cd9..d026a98 100755
--- a/hald/hald-cache-test.sh
+++ b/hald/hald-cache-test.sh
@@ -11,3 +11,6 @@ export HAL_FDI_SOURCE_PREPROBE HAL_FDI_S
 
 ./hald-generate-fdi-cache || exit 2
 ./hald-cache-test || exit 2
+
+#required by distcheck
+rm -Rf .local-fdi
diff --git a/tools/device-manager/Makefile.am b/tools/device-manager/Makefile.am
index eb4fa4c..f382f66 100644
--- a/tools/device-manager/Makefile.am
+++ b/tools/device-manager/Makefile.am
@@ -36,5 +36,5 @@ dist_devicemanager_DATA =               
 #	- rm -f $(DESTDIR)$(bindir)/hal-device-manager
 
 clean-local :
-	rm -f *~
+	rm -f *~ *.pyc *.pyo
 	rm -f hal-device-manager.glade.h