hal: Branch 'master'

[Richard Hughes]

 hald/Makefile.am |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

New commits:
diff-tree b4d7405bded1c621e73fe28826dbd7df6343b05f (from dc1d6286d49990a4226cb917c821d26e1e15a97a)
Author: Richard Hughes <hughsie at hughsie-laptop.(none)>
Date:   Wed Nov 1 13:10:01 2006 +0000

    allow make distcheck to work with a readonly buildroot
    
    Instead of playing games with glib-genmarshal, invoke it without
    using a temporary file.
    Writing temporary files into src and then deleting them makes make
    distcheck fail on Ubuntu Edgy, and this patch fixes it.

diff --git a/hald/Makefile.am b/hald/Makefile.am
index 1f804e1..7201b1a 100644
--- a/hald/Makefile.am
+++ b/hald/Makefile.am
@@ -71,16 +71,12 @@ EXTRA_DIST =			\
 	hald_marshal.list
 
 hald_marshal.h: hald_marshal.list
-	cd $(srcdir) \
-	&& glib-genmarshal --prefix=hald_marshal hald_marshal.list --header >> xgen-gmh \
-	&& (cmp -s xgen-gmh hald_marshal.h || cp xgen-gmh hald_marshal.h) \
-	&& rm -f xgen-gmh xgen-gmh~
+	glib-genmarshal $< --prefix=hald_marshal --header > $@
 
 hald_marshal.c: hald_marshal.list
-	cd $(srcdir) \
-	&& glib-genmarshal --prefix=hald_marshal hald_marshal.list --body >> xgen-gmc \
-	&& (cmp -s xgen-gmc hald_marshal.c || cp xgen-gmc hald_marshal.c) \
-	&& rm -f xgen-gmc xgen-gmc~
+	echo "#include \"hald_marshal.h\"" > $@ && \
+	glib-genmarshal $< --prefix=hald_marshal --body >> $@
+
 
 install-data-local:
 	-$(mkdir_p) $(HALD_SOCKET_DIR)