Bug #10492: Redglass xcursor theme doesn't package the "watch" cursor

X.Org Bugzilla #10492 <http://bugs.freedesktop.org/show_bug.cgi?id=10492>
Patch #9402 <http://bugs.freedesktop.org/attachment.cgi?id=9402>

6 files changed, 13 insertions, 11 deletions

diff --git a/genmakefile.sh b/genmakefile.sh
index 9bc5f71..34d0b8b 100755
--- a/genmakefile.sh
+++ b/genmakefile.sh
@@ -13,8 +13,7 @@ echo
 
 for i in $CURSORS; do
 	echo -n "${i}:"
-	for j in 16 24 32 48 64; do
-		png="${i}-${j}.png"
+	for png in $(cut -d" " -f4 ${i}.cfg); do
 		EXTRA_DIST="${EXTRA_DIST} ${png}"
 		echo -n " \$(srcdir)/${png}"
 	done
diff --git a/handhelds/Makefile.am b/handhelds/Makefile.am
index 4f78540..8cf7de1 100644
--- a/handhelds/Makefile.am
+++ b/handhelds/Makefile.am
@@ -2,8 +2,8 @@ cursordir = @cursordir@/handhelds/cursors
 
 all: Makefile.cursors
 
-Makefile.cursors:
-	$(top_srcdir)/genmakefile.sh $(srcdir)/Makefile.cfg
+Makefile.cursors: $(srcdir)/Makefile.cfg
+	$(top_srcdir)/genmakefile.sh $(srcdir)/Makefile.cfg > $@
 
 if HANDHELDS
 include Makefile.cursors
diff --git a/redglass/Makefile.am b/redglass/Makefile.am
index 3f2b471..6c44681 100644
--- a/redglass/Makefile.am
+++ b/redglass/Makefile.am
@@ -2,8 +2,8 @@ cursordir = @cursordir@/redglass/cursors
 
 all: Makefile.cursors
 
-Makefile.cursors:
-	$(top_srcdir)/genmakefile.sh $(srcdir)/Makefile.cfg
+Makefile.cursors: $(srcdir)/Makefile.cfg
+	$(top_srcdir)/genmakefile.sh $(srcdir)/Makefile.cfg > $@
 
 if REDGLASS
 include Makefile.cursors
diff --git a/redglass/Makefile.cfg b/redglass/Makefile.cfg
index 95c9515..8021b5f 100644
--- a/redglass/Makefile.cfg
+++ b/redglass/Makefile.cfg
@@ -1,6 +1,6 @@
 # this is not a makefile, but a shell fragment; quote accordingly.
 
-CURSORS="X_cursor based_arrow_down based_arrow_up bottom_left_corner bottom_right_corner bottom_side bottom_tee center_ptr circle cross dot dotbox double_arrow draped_box fleur gumby hand2 left_ptr left_ptr_watch left_side left_tee ll_angle pencil right_ptr right_side right_tee sb_h_double_arrow sb_right_arrow sb_up_arrow sb_v_double_arrow shuttle top_left_corner top_right_corner top_side top_tee xterm"
+CURSORS="X_cursor based_arrow_down based_arrow_up bottom_left_corner bottom_right_corner bottom_side bottom_tee center_ptr circle cross dot dotbox double_arrow draped_box fleur gumby hand2 left_ptr left_ptr_watch left_side left_tee ll_angle pencil right_ptr right_side right_tee sb_h_double_arrow sb_right_arrow sb_up_arrow sb_v_double_arrow shuttle top_left_corner top_right_corner top_side top_tee watch xterm"
 
 
 #CursorLinkTarget(arrow,right_ptr)
diff --git a/redglass/Makefile.cursors b/redglass/Makefile.cursors
index 08e71fb..7e9a85c 100644
--- a/redglass/Makefile.cursors
+++ b/redglass/Makefile.cursors
@@ -1,6 +1,6 @@
 # this is a generated file -- do not edit.
 
-CURSORFILES = X_cursor based_arrow_down based_arrow_up bottom_left_corner bottom_right_corner bottom_side bottom_tee center_ptr circle cross dot dotbox double_arrow draped_box fleur gumby hand2 left_ptr left_ptr_watch left_side left_tee ll_angle pencil right_ptr right_side right_tee sb_h_double_arrow sb_right_arrow sb_up_arrow sb_v_double_arrow shuttle top_left_corner top_right_corner top_side top_tee xterm
+CURSORFILES = X_cursor based_arrow_down based_arrow_up bottom_left_corner bottom_right_corner bottom_side bottom_tee center_ptr circle cross dot dotbox double_arrow draped_box fleur gumby hand2 left_ptr left_ptr_watch left_side left_tee ll_angle pencil right_ptr right_side right_tee sb_h_double_arrow sb_right_arrow sb_up_arrow sb_v_double_arrow shuttle top_left_corner top_right_corner top_side top_tee watch xterm
 CLEANFILES = $(CURSORFILES)
 cursor_DATA = $(CURSORFILES)
 
@@ -58,7 +58,7 @@ hand2: $(srcdir)/hand2-16.png $(srcdir)/hand2-24.png $(srcdir)/hand2-32.png $(sr
 left_ptr: $(srcdir)/left_ptr-16.png $(srcdir)/left_ptr-24.png $(srcdir)/left_ptr-32.png $(srcdir)/left_ptr-48.png $(srcdir)/left_ptr-64.png
 	$(XCURSORGEN) -p $(srcdir) $(srcdir)/left_ptr.cfg left_ptr
 
-left_ptr_watch: $(srcdir)/left_ptr_watch-16.png $(srcdir)/left_ptr_watch-24.png $(srcdir)/left_ptr_watch-32.png $(srcdir)/left_ptr_watch-48.png $(srcdir)/left_ptr_watch-64.png
+left_ptr_watch: $(srcdir)/left_ptr_watch-16.png $(srcdir)/left_ptr-16.png $(srcdir)/left_ptr_watch-24.png $(srcdir)/left_ptr-24.png $(srcdir)/left_ptr_watch-32.png $(srcdir)/left_ptr-32.png $(srcdir)/left_ptr_watch-48.png $(srcdir)/left_ptr-48.png $(srcdir)/left_ptr_watch-64.png $(srcdir)/left_ptr-64.png
 	$(XCURSORGEN) -p $(srcdir) $(srcdir)/left_ptr_watch.cfg left_ptr_watch
 
 left_side: $(srcdir)/left_side-16.png $(srcdir)/left_side-24.png $(srcdir)/left_side-32.png $(srcdir)/left_side-48.png $(srcdir)/left_side-64.png
@@ -109,7 +109,10 @@ top_side: $(srcdir)/top_side-16.png $(srcdir)/top_side-24.png $(srcdir)/top_side
 top_tee: $(srcdir)/top_tee-16.png $(srcdir)/top_tee-24.png $(srcdir)/top_tee-32.png $(srcdir)/top_tee-48.png $(srcdir)/top_tee-64.png
 	$(XCURSORGEN) -p $(srcdir) $(srcdir)/top_tee.cfg top_tee
 
+watch: $(srcdir)/hourglass-full-16.png $(srcdir)/hourglass-75-16.png $(srcdir)/hourglass-50-16.png $(srcdir)/hourglass-25-16.png $(srcdir)/hourglass-empty-16.png $(srcdir)/hourglass-45-16.png $(srcdir)/hourglass-90-16.png $(srcdir)/hourglass-135-16.png $(srcdir)/hourglass-full-24.png $(srcdir)/hourglass-75-24.png $(srcdir)/hourglass-50-24.png $(srcdir)/hourglass-25-24.png $(srcdir)/hourglass-empty-24.png $(srcdir)/hourglass-45-24.png $(srcdir)/hourglass-90-24.png $(srcdir)/hourglass-135-24.png $(srcdir)/hourglass-full-32.png $(srcdir)/hourglass-75-32.png $(srcdir)/hourglass-50-32.png $(srcdir)/hourglass-25-32.png $(srcdir)/hourglass-empty-32.png $(srcdir)/hourglass-45-32.png $(srcdir)/hourglass-90-32.png $(srcdir)/hourglass-135-32.png $(srcdir)/hourglass-full-48.png $(srcdir)/hourglass-75-48.png $(srcdir)/hourglass-50-48.png $(srcdir)/hourglass-25-48.png $(srcdir)/hourglass-empty-48.png $(srcdir)/hourglass-45-48.png $(srcdir)/hourglass-90-48.png $(srcdir)/hourglass-135-48.png $(srcdir)/hourglass-full-64.png $(srcdir)/hourglass-75-64.png $(srcdir)/hourglass-50-64.png $(srcdir)/hourglass-25-64.png $(srcdir)/hourglass-empty-64.png $(srcdir)/hourglass-45-64.png $(srcdir)/hourglass-90-64.png $(srcdir)/hourglass-135-64.png
+	$(XCURSORGEN) -p $(srcdir) $(srcdir)/watch.cfg watch
+
 xterm: $(srcdir)/xterm-16.png $(srcdir)/xterm-24.png $(srcdir)/xterm-32.png $(srcdir)/xterm-48.png $(srcdir)/xterm-64.png
 	$(XCURSORGEN) -p $(srcdir) $(srcdir)/xterm.cfg xterm
 
-EXTRA_DIST = X_cursor-16.png X_cursor-24.png X_cursor-32.png X_cursor-48.png X_cursor-64.png X_cursor.cfg X_cursor.xcf based_arrow_down-16.png based_arrow_down-24.png based_arrow_down-32.png based_arrow_down-48.png based_arrow_down-64.png based_arrow_down.cfg based_arrow_down.xcf based_arrow_up-16.png based_arrow_up-24.png based_arrow_up-32.png based_arrow_up-48.png based_arrow_up-64.png based_arrow_up.cfg based_arrow_up.xcf bottom_left_corner-16.png bottom_left_corner-24.png bottom_left_corner-32.png bottom_left_corner-48.png bottom_left_corner-64.png bottom_left_corner.cfg bottom_left_corner.xcf bottom_right_corner-16.png bottom_right_corner-24.png bottom_right_corner-32.png bottom_right_corner-48.png bottom_right_corner-64.png bottom_right_corner.cfg bottom_right_corner.xcf bottom_side-16.png bottom_side-24.png bottom_side-32.png bottom_side-48.png bottom_side-64.png bottom_side.cfg bottom_side.xcf bottom_tee-16.png bottom_tee-24.png bottom_tee-32.png bottom_tee-48.png bottom_tee-64.png bottom_tee.cfg bottom_tee.xcf center_ptr-16.png center_ptr-24.png center_ptr-32.png center_ptr-48.png center_ptr-64.png center_ptr.cfg center_ptr.xcf circle-16.png circle-24.png circle-32.png circle-48.png circle-64.png circle.cfg circle.xcf cross-16.png cross-24.png cross-32.png cross-48.png cross-64.png cross.cfg cross.xcf dot-16.png dot-24.png dot-32.png dot-48.png dot-64.png dot.cfg dot.xcf dotbox-16.png dotbox-24.png dotbox-32.png dotbox-48.png dotbox-64.png dotbox.cfg dotbox.xcf double_arrow-16.png double_arrow-24.png double_arrow-32.png double_arrow-48.png double_arrow-64.png double_arrow.cfg double_arrow.xcf draped_box-16.png draped_box-24.png draped_box-32.png draped_box-48.png draped_box-64.png draped_box.cfg draped_box.xcf fleur-16.png fleur-24.png fleur-32.png fleur-48.png fleur-64.png fleur.cfg fleur.xcf gumby-16.png gumby-24.png gumby-32.png gumby-48.png gumby-64.png gumby.cfg gumby.xcf hand2-16.png hand2-24.png hand2-32.png hand2-48.png hand2-64.png hand2.cfg hand2.xcf left_ptr-16.png left_ptr-24.png left_ptr-32.png left_ptr-48.png left_ptr-64.png left_ptr.cfg left_ptr.xcf left_ptr_watch-16.png left_ptr_watch-24.png left_ptr_watch-32.png left_ptr_watch-48.png left_ptr_watch-64.png left_ptr_watch.cfg left_ptr_watch.xcf left_side-16.png left_side-24.png left_side-32.png left_side-48.png left_side-64.png left_side.cfg left_side.xcf left_tee-16.png left_tee-24.png left_tee-32.png left_tee-48.png left_tee-64.png left_tee.cfg left_tee.xcf ll_angle-16.png ll_angle-24.png ll_angle-32.png ll_angle-48.png ll_angle-64.png ll_angle.cfg ll_angle.xcf pencil-16.png pencil-24.png pencil-32.png pencil-48.png pencil-64.png pencil.cfg pencil.xcf right_ptr-16.png right_ptr-24.png right_ptr-32.png right_ptr-48.png right_ptr-64.png right_ptr.cfg right_ptr.xcf right_side-16.png right_side-24.png right_side-32.png right_side-48.png right_side-64.png right_side.cfg right_side.xcf right_tee-16.png right_tee-24.png right_tee-32.png right_tee-48.png right_tee-64.png right_tee.cfg right_tee.xcf sb_h_double_arrow-16.png sb_h_double_arrow-24.png sb_h_double_arrow-32.png sb_h_double_arrow-48.png sb_h_double_arrow-64.png sb_h_double_arrow.cfg sb_h_double_arrow.xcf sb_right_arrow-16.png sb_right_arrow-24.png sb_right_arrow-32.png sb_right_arrow-48.png sb_right_arrow-64.png sb_right_arrow.cfg sb_right_arrow.xcf sb_up_arrow-16.png sb_up_arrow-24.png sb_up_arrow-32.png sb_up_arrow-48.png sb_up_arrow-64.png sb_up_arrow.cfg sb_up_arrow.xcf sb_v_double_arrow-16.png sb_v_double_arrow-24.png sb_v_double_arrow-32.png sb_v_double_arrow-48.png sb_v_double_arrow-64.png sb_v_double_arrow.cfg sb_v_double_arrow.xcf shuttle-16.png shuttle-24.png shuttle-32.png shuttle-48.png shuttle-64.png shuttle.cfg shuttle.xcf top_left_corner-16.png top_left_corner-24.png top_left_corner-32.png top_left_corner-48.png top_left_corner-64.png top_left_corner.cfg top_left_corner.xcf top_right_corner-16.png top_right_corner-24.png top_right_corner-32.png top_right_corner-48.png top_right_corner-64.png top_right_corner.cfg top_right_corner.xcf top_side-16.png top_side-24.png top_side-32.png top_side-48.png top_side-64.png top_side.cfg top_side.xcf top_tee-16.png top_tee-24.png top_tee-32.png top_tee-48.png top_tee-64.png top_tee.cfg top_tee.xcf xterm-16.png xterm-24.png xterm-32.png xterm-48.png xterm-64.png xterm.cfg xterm.xcf Makefile.cfg Makefile.cursors basic_arrow.xcf gumby-128.png gumby.svg watch-16.png watch-24.png watch-32.png watch-48.png watch-64.png watch.cfg watch.xcf hourglass-135-16.png hourglass-135-24.png hourglass-135-32.png hourglass-135-48.png hourglass-135-64.png hourglass-25-16.png hourglass-25-24.png hourglass-25-32.png hourglass-25-48.png hourglass-25-64.png hourglass-45-16.png hourglass-45-24.png hourglass-45-32.png hourglass-45-48.png hourglass-45-64.png hourglass-50-16.png hourglass-50-24.png hourglass-50-32.png hourglass-50-48.png hourglass-50-64.png hourglass-75-16.png hourglass-75-24.png hourglass-75-32.png hourglass-75-48.png hourglass-75-64.png hourglass-90-16.png hourglass-90-24.png hourglass-90-32.png hourglass-90-48.png hourglass-90-64.png hourglass-empty-16.png hourglass-empty-24.png hourglass-empty-32.png hourglass-empty-48.png hourglass-empty-64.png hourglass-full-16.png hourglass-full-24.png hourglass-full-32.png hourglass-full-48.png hourglass-full-64.png hourglass-135.xcf hourglass-25.xcf hourglass-45.xcf hourglass-50.xcf hourglass-75.xcf hourglass-90.xcf hourglass-empty.xcf hourglass-full.xcf hourglass-plain.xcf
+EXTRA_DIST = X_cursor-16.png X_cursor-24.png X_cursor-32.png X_cursor-48.png X_cursor-64.png X_cursor.cfg X_cursor.xcf based_arrow_down-16.png based_arrow_down-24.png based_arrow_down-32.png based_arrow_down-48.png based_arrow_down-64.png based_arrow_down.cfg based_arrow_down.xcf based_arrow_up-16.png based_arrow_up-24.png based_arrow_up-32.png based_arrow_up-48.png based_arrow_up-64.png based_arrow_up.cfg based_arrow_up.xcf bottom_left_corner-16.png bottom_left_corner-24.png bottom_left_corner-32.png bottom_left_corner-48.png bottom_left_corner-64.png bottom_left_corner.cfg bottom_left_corner.xcf bottom_right_corner-16.png bottom_right_corner-24.png bottom_right_corner-32.png bottom_right_corner-48.png bottom_right_corner-64.png bottom_right_corner.cfg bottom_right_corner.xcf bottom_side-16.png bottom_side-24.png bottom_side-32.png bottom_side-48.png bottom_side-64.png bottom_side.cfg bottom_side.xcf bottom_tee-16.png bottom_tee-24.png bottom_tee-32.png bottom_tee-48.png bottom_tee-64.png bottom_tee.cfg bottom_tee.xcf center_ptr-16.png center_ptr-24.png center_ptr-32.png center_ptr-48.png center_ptr-64.png center_ptr.cfg center_ptr.xcf circle-16.png circle-24.png circle-32.png circle-48.png circle-64.png circle.cfg circle.xcf cross-16.png cross-24.png cross-32.png cross-48.png cross-64.png cross.cfg cross.xcf dot-16.png dot-24.png dot-32.png dot-48.png dot-64.png dot.cfg dot.xcf dotbox-16.png dotbox-24.png dotbox-32.png dotbox-48.png dotbox-64.png dotbox.cfg dotbox.xcf double_arrow-16.png double_arrow-24.png double_arrow-32.png double_arrow-48.png double_arrow-64.png double_arrow.cfg double_arrow.xcf draped_box-16.png draped_box-24.png draped_box-32.png draped_box-48.png draped_box-64.png draped_box.cfg draped_box.xcf fleur-16.png fleur-24.png fleur-32.png fleur-48.png fleur-64.png fleur.cfg fleur.xcf gumby-16.png gumby-24.png gumby-32.png gumby-48.png gumby-64.png gumby.cfg gumby.xcf hand2-16.png hand2-24.png hand2-32.png hand2-48.png hand2-64.png hand2.cfg hand2.xcf left_ptr-16.png left_ptr-24.png left_ptr-32.png left_ptr-48.png left_ptr-64.png left_ptr.cfg left_ptr.xcf left_ptr_watch-16.png left_ptr-16.png left_ptr_watch-24.png left_ptr-24.png left_ptr_watch-32.png left_ptr-32.png left_ptr_watch-48.png left_ptr-48.png left_ptr_watch-64.png left_ptr-64.png left_ptr_watch.cfg left_ptr_watch.xcf left_side-16.png left_side-24.png left_side-32.png left_side-48.png left_side-64.png left_side.cfg left_side.xcf left_tee-16.png left_tee-24.png left_tee-32.png left_tee-48.png left_tee-64.png left_tee.cfg left_tee.xcf ll_angle-16.png ll_angle-24.png ll_angle-32.png ll_angle-48.png ll_angle-64.png ll_angle.cfg ll_angle.xcf pencil-16.png pencil-24.png pencil-32.png pencil-48.png pencil-64.png pencil.cfg pencil.xcf right_ptr-16.png right_ptr-24.png right_ptr-32.png right_ptr-48.png right_ptr-64.png right_ptr.cfg right_ptr.xcf right_side-16.png right_side-24.png right_side-32.png right_side-48.png right_side-64.png right_side.cfg right_side.xcf right_tee-16.png right_tee-24.png right_tee-32.png right_tee-48.png right_tee-64.png right_tee.cfg right_tee.xcf sb_h_double_arrow-16.png sb_h_double_arrow-24.png sb_h_double_arrow-32.png sb_h_double_arrow-48.png sb_h_double_arrow-64.png sb_h_double_arrow.cfg sb_h_double_arrow.xcf sb_right_arrow-16.png sb_right_arrow-24.png sb_right_arrow-32.png sb_right_arrow-48.png sb_right_arrow-64.png sb_right_arrow.cfg sb_right_arrow.xcf sb_up_arrow-16.png sb_up_arrow-24.png sb_up_arrow-32.png sb_up_arrow-48.png sb_up_arrow-64.png sb_up_arrow.cfg sb_up_arrow.xcf sb_v_double_arrow-16.png sb_v_double_arrow-24.png sb_v_double_arrow-32.png sb_v_double_arrow-48.png sb_v_double_arrow-64.png sb_v_double_arrow.cfg sb_v_double_arrow.xcf shuttle-16.png shuttle-24.png shuttle-32.png shuttle-48.png shuttle-64.png shuttle.cfg shuttle.xcf top_left_corner-16.png top_left_corner-24.png top_left_corner-32.png top_left_corner-48.png top_left_corner-64.png top_left_corner.cfg top_left_corner.xcf top_right_corner-16.png top_right_corner-24.png top_right_corner-32.png top_right_corner-48.png top_right_corner-64.png top_right_corner.cfg top_right_corner.xcf top_side-16.png top_side-24.png top_side-32.png top_side-48.png top_side-64.png top_side.cfg top_side.xcf top_tee-16.png top_tee-24.png top_tee-32.png top_tee-48.png top_tee-64.png top_tee.cfg top_tee.xcf hourglass-full-16.png hourglass-75-16.png hourglass-50-16.png hourglass-25-16.png hourglass-empty-16.png hourglass-45-16.png hourglass-90-16.png hourglass-135-16.png hourglass-full-24.png hourglass-75-24.png hourglass-50-24.png hourglass-25-24.png hourglass-empty-24.png hourglass-45-24.png hourglass-90-24.png hourglass-135-24.png hourglass-full-32.png hourglass-75-32.png hourglass-50-32.png hourglass-25-32.png hourglass-empty-32.png hourglass-45-32.png hourglass-90-32.png hourglass-135-32.png hourglass-full-48.png hourglass-75-48.png hourglass-50-48.png hourglass-25-48.png hourglass-empty-48.png hourglass-45-48.png hourglass-90-48.png hourglass-135-48.png hourglass-full-64.png hourglass-75-64.png hourglass-50-64.png hourglass-25-64.png hourglass-empty-64.png hourglass-45-64.png hourglass-90-64.png hourglass-135-64.png watch.cfg watch.xcf xterm-16.png xterm-24.png xterm-32.png xterm-48.png xterm-64.png xterm.cfg xterm.xcf Makefile.cfg Makefile.cursors basic_arrow.xcf gumby-128.png gumby.svg watch-16.png watch-24.png watch-32.png watch-48.png watch-64.png watch.cfg watch.xcf hourglass-135-16.png hourglass-135-24.png hourglass-135-32.png hourglass-135-48.png hourglass-135-64.png hourglass-25-16.png hourglass-25-24.png hourglass-25-32.png hourglass-25-48.png hourglass-25-64.png hourglass-45-16.png hourglass-45-24.png hourglass-45-32.png hourglass-45-48.png hourglass-45-64.png hourglass-50-16.png hourglass-50-24.png hourglass-50-32.png hourglass-50-48.png hourglass-50-64.png hourglass-75-16.png hourglass-75-24.png hourglass-75-32.png hourglass-75-48.png hourglass-75-64.png hourglass-90-16.png hourglass-90-24.png hourglass-90-32.png hourglass-90-48.png hourglass-90-64.png hourglass-empty-16.png hourglass-empty-24.png hourglass-empty-32.png hourglass-empty-48.png hourglass-empty-64.png hourglass-full-16.png hourglass-full-24.png hourglass-full-32.png hourglass-full-48.png hourglass-full-64.png hourglass-135.xcf hourglass-25.xcf hourglass-45.xcf hourglass-50.xcf hourglass-75.xcf hourglass-90.xcf hourglass-empty.xcf hourglass-full.xcf hourglass-plain.xcf
diff --git a/whiteglass/Makefile.am b/whiteglass/Makefile.am
index 86b7a88..ecd819f 100644
--- a/whiteglass/Makefile.am
+++ b/whiteglass/Makefile.am
@@ -2,7 +2,7 @@ cursordir = @cursordir@/whiteglass/cursors
 
 all: Makefile.cursors
 
-Makefile.cursors:
+Makefile.cursors: $(srcdir)/Makefile.cfg
 	$(top_srcdir)/genmakefile.sh $(srcdir)/Makefile.cfg > $@
 
 if WHITEGLASS