hal: Branch 'master'

Sergey Lapin slapinid at gmail.com
Sat Jan 13 23:02:38 PST 2007


Richard Hughes wrote:
> On Sat, 2007-01-13 at 12:30 +0300, Sergey Lapin wrote:
>> commit 348b48b3cbe0133759441df102935c759fbecf7f
>> Author: Sergey Lapin <slapin at slapin-notebook.localdomain>
>> Date:   Sat Jan 13 12:13:47 2007 +0300
>>
>>      Returned back unit test executable.
>>      make check will check cache from now on.
> 
> "make distcheck" fails.
> 
> make[5]: Entering directory
> `/home/hughsie/user/code/hal/hal.git/hal-0.5.9/_build/hald'
> make[5]: *** No rule to make target `hald-cache-test.sh', needed by
> `check-TESTS'.  Stop.
> 
> Richard.
> 
> 
> 

Fixed now.
Btw, why do my commit messages are awaiting moderation? Only if I re-send them from my real address
they seem to get there...
I have properly set up my local version...

commit 92209ec0ae7b860746beb243fa52a1d405efb29f
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_SOURCE_INFORMATION \

  ./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




More information about the hal mailing list