hal/fdi/information/10freedesktop Makefile.am,1.7,1.8

[Danny Kukawka]

Update of /cvs/hal/hal/fdi/information/10freedesktop
In directory gabe:/tmp/cvs-serv25778/fdi/information/10freedesktop

Modified Files:
	Makefile.am 
Log Message:
2005-12-12  Danny Kukawka  <danny.kukawka at web.de>

        * fdi/information/10freedesktop/Makefile.am,
          fdi/policy/10osvendor/Makefile.am,
          fdi/preprobe/10osvendor/Makefile.am: fixed validate fdi files for
        correct XML in target check to fix broken 'make distcheck'



Index: Makefile.am
===================================================================
RCS file: /cvs/hal/hal/fdi/information/10freedesktop/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.am	12 Dec 2005 16:09:58 -0000	1.7
+++ Makefile.am	12 Dec 2005 22:42:26 -0000	1.8
@@ -3,12 +3,24 @@
 
 dist_fdi_DATA = 10-usb-card-readers.fdi    \
 		10-usb-music-players.fdi   \
-	        10-usb-zip-drives.fdi      \
+		10-usb-zip-drives.fdi      \
 		10-wireless-mice.fdi	   \
 		10-camera-ptp.fdi	   \
 		10-usb-pda.fdi		   \
 		10-cd-dvd-burner.fdi
 
 check:
-	xmllint --noout --dtdvalid $(top_srcdir)/fdi/fdi.dtd $(dist_fdi_DATA)
-
+	for f in $(dist_fdi_DATA); do \
+	    echo -n "Validate XML in $$f : "; \
+	    xmllint --noout --dtdvalid $(top_srcdir)/fdi/fdi.dtd $(srcdir)/$$f 2> xmllint.error; \
+	    if test -s xmllint.error; \
+	      then \
+    		echo failed; \
+    		cat xmllint.error; \
+    		rm -f xmllint.error; \
+    		exit 1; \
+	    else \
+    		echo ok; \
+    		rm -f xmllint.error; \
+	    fi; \
+        done;