Fixes https://bugs.freedesktop.org/show_bug.cgi?id=6466 which was originally reported at http://bugs.gentoo.org/show_bug.cgi?id=116730
Finally finishes the conversion of the Imakefile CursorLinkTarget rules into the Makefile.cursor automake fragments generated by genmakefile.sh. (Since Makefile.cursor files are checked into git, the changes made in the generated files are included in this commit as well.) Signed-off-by: Alan Coopersmith <[email protected]> --- configure.ac | 1 + genmakefile.sh | 15 +++++++++++++++ handhelds/Makefile.cfg | 27 ++++++++++++++++++--------- handhelds/Makefile.cursors | 17 +++++++++++++++++ redglass/Makefile.cfg | 27 ++++++++++++++++++--------- redglass/Makefile.cursors | 17 +++++++++++++++++ whiteglass/Makefile.cfg | 19 +++++++++++++++++++ whiteglass/Makefile.cursors | 17 +++++++++++++++++ 8 files changed, 122 insertions(+), 18 deletions(-) diff --git a/configure.ac b/configure.ac index 2f0f23b..0bdf599 100644 --- a/configure.ac +++ b/configure.ac @@ -19,6 +19,7 @@ XORG_MACROS_VERSION(1.3) XORG_DEFAULT_OPTIONS AC_PROG_INSTALL +AC_PROG_LN_S AC_PATH_PROG(XCURSORGEN, xcursorgen, no) if test "x$XCURSORGEN" = xno; then diff --git a/genmakefile.sh b/genmakefile.sh index 4fe7517..78a42f3 100755 --- a/genmakefile.sh +++ b/genmakefile.sh @@ -2,6 +2,12 @@ # this script written by daniel stone <[email protected]>, placed in the # public domain. +# Shell function to replace old Imake CursorLinkTarget macro +CursorLinkTarget() { + CURSORLINKS="${CURSORLINKS} $1" + MAKE_LINKS="$(printf '%s && \\\n\t$(LN_S) %s %s' "${MAKE_LINKS}" $2 $1)" +} + # Default srcdir variable, overridden by Makefile.cfg in handhelds directory srcdir='$(srcdir)' @@ -10,6 +16,7 @@ test "x$1" = "x" || . "$1" printf '# this is a generated file -- do not edit.\n' printf '\n' printf 'CURSORFILES = %s\n' "${CURSORS}" +printf 'CURSORLINKS =%s\n' "${CURSORLINKS}" printf 'CLEANFILES = $(CURSORFILES)\n' printf 'cursor_DATA = $(CURSORFILES)\n' printf '\n' @@ -32,6 +39,14 @@ for i in $CURSORS; do fi done +if test "x${MAKE_LINKS}" != "x" ; then + printf 'install-data-hook:\n' + printf '\tcd $(DESTDIR)$(cursordir) && rm -f $(CURSORLINKS)\n' + printf '\tcd $(DESTDIR)$(cursordir)%s\n\n' "${MAKE_LINKS}" + printf 'uninstall-hook:\n' + printf '\tcd $(DESTDIR)$(cursordir) && rm -f $(CURSORLINKS)\n\n' +fi + test "x$DIST" = "x" || EXTRA_DIST="${EXTRA_DIST} ${DIST}" # the lack of space is intentional. diff --git a/handhelds/Makefile.cfg b/handhelds/Makefile.cfg index 08f2f11..da0fb3d 100644 --- a/handhelds/Makefile.cfg +++ b/handhelds/Makefile.cfg @@ -6,12 +6,21 @@ DIST="Makefile.cfg Makefile.cursors" # Use .png files from redglass directory srcdir='$(top_srcdir)/redglass' -#CursorLinkTarget(arrow,right_ptr) -#CursorLinkTarget(cross_reverse,cross) -#CursorLinkTarget(crosshair,cross) -#CursorLinkTarget(draft_large,right_ptr) -#CursorLinkTarget(draft_small,right_ptr) -#CursorLinkTarget(plus,cross) -#CursorLinkTarget(tcross,cross) -#CursorLinkTarget(top_left_arrow,left_ptr) -#CursorLinkTarget(08e8e1c95fe2fc01f976f1e063a24ccd,left_ptr_watch) +# CursorLinkTarget dst src makes a link from src -> dst in target directory +CursorLinkTarget arrow right_ptr +CursorLinkTarget cross_reverse cross +CursorLinkTarget crosshair cross +CursorLinkTarget draft_large right_ptr +CursorLinkTarget draft_small right_ptr +CursorLinkTarget plus cross +CursorLinkTarget tcross cross +CursorLinkTarget top_left_arrow left_ptr +## Application specific cursors for Mozilla +# moz_alias 0876e1c15ff2fc01f906f1c363074c0f (left_ptr with small arrow) +# moz_copy 08ffe1cb5fe6fc01f906f1c063814ccf (left_ptr with plus) +# moz_hand_grabbing 208530c400c041818281048008011002 (closed hand) +# moz_hand_grab 5aca4d189052212118709018842178c0 (open hand) +# moz_menu 08ffe1e65f80fcfdf9fff11263e74c48 (left_ptr with menu) +# moz_question_arrow 5c6cd98b3f3ebcb1f9c7f1c204630408 (left_ptr with ?) +# moz_spinning (left_ptr with watch) +CursorLinkTarget 08e8e1c95fe2fc01f976f1e063a24ccd left_ptr_watch diff --git a/handhelds/Makefile.cursors b/handhelds/Makefile.cursors index 6bdf251..49c1052 100644 --- a/handhelds/Makefile.cursors +++ b/handhelds/Makefile.cursors @@ -1,6 +1,7 @@ # 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 watch xterm +CURSORLINKS = arrow cross_reverse crosshair draft_large draft_small plus tcross top_left_arrow 08e8e1c95fe2fc01f976f1e063a24ccd CLEANFILES = $(CURSORFILES) cursor_DATA = $(CURSORFILES) @@ -115,4 +116,20 @@ watch: $(top_srcdir)/redglass/watch-16.png xterm: $(top_srcdir)/redglass/xterm-16.png $(XCURSORGEN) -p $(top_srcdir)/redglass $(srcdir)/xterm.cfg xterm +install-data-hook: + cd $(DESTDIR)$(cursordir) && rm -f $(CURSORLINKS) + cd $(DESTDIR)$(cursordir) && \ + $(LN_S) right_ptr arrow && \ + $(LN_S) cross cross_reverse && \ + $(LN_S) cross crosshair && \ + $(LN_S) right_ptr draft_large && \ + $(LN_S) right_ptr draft_small && \ + $(LN_S) cross plus && \ + $(LN_S) cross tcross && \ + $(LN_S) left_ptr top_left_arrow && \ + $(LN_S) left_ptr_watch 08e8e1c95fe2fc01f976f1e063a24ccd + +uninstall-hook: + cd $(DESTDIR)$(cursordir) && rm -f $(CURSORLINKS) + EXTRA_DIST = X_cursor.cfg based_arrow_down.cfg based_arrow_up.cfg bottom_left_corner.cfg bottom_right_corner.cfg bottom_side.cfg bottom_tee.cfg center_ptr.cfg circle.cfg cross.cfg dot.cfg dotbox.cfg double_arrow.cfg draped_box.cfg fleur.cfg gumby.cfg hand2.cfg left_ptr.cfg left_ptr_watch.cfg left_side.cfg left_tee.cfg ll_angle.cfg pencil.cfg right_ptr.cfg right_side.cfg right_tee.cfg sb_h_double_arrow.cfg sb_right_arrow.cfg sb_up_arrow.cfg sb_v_double_arrow.cfg shuttle.cfg top_left_corner.cfg top_right_corner.cfg top_side.cfg top_tee.cfg watch.cfg xterm.cfg Makefile.cfg Makefile.cursors diff --git a/redglass/Makefile.cfg b/redglass/Makefile.cfg index 8021b5f..c2273ee 100644 --- a/redglass/Makefile.cfg +++ b/redglass/Makefile.cfg @@ -2,16 +2,25 @@ 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 dst src makes a link from src -> dst in target directory +CursorLinkTarget arrow right_ptr +CursorLinkTarget cross_reverse cross +CursorLinkTarget crosshair cross +CursorLinkTarget draft_large right_ptr +CursorLinkTarget draft_small right_ptr +CursorLinkTarget plus cross +CursorLinkTarget tcross cross +CursorLinkTarget top_left_arrow left_ptr +## Application specific cursors for Mozilla +# moz_alias 0876e1c15ff2fc01f906f1c363074c0f (left_ptr with small arrow) +# moz_copy 08ffe1cb5fe6fc01f906f1c063814ccf (left_ptr with plus) +# moz_hand_grabbing 208530c400c041818281048008011002 (closed hand) +# moz_hand_grab 5aca4d189052212118709018842178c0 (open hand) +# moz_menu 08ffe1e65f80fcfdf9fff11263e74c48 (left_ptr with menu) +# moz_question_arrow 5c6cd98b3f3ebcb1f9c7f1c204630408 (left_ptr with ?) +# moz_spinning (left_ptr with watch) +CursorLinkTarget 08e8e1c95fe2fc01f976f1e063a24ccd left_ptr_watch -#CursorLinkTarget(arrow,right_ptr) -#CursorLinkTarget(cross_reverse,cross) -#CursorLinkTarget(crosshair,cross) -#CursorLinkTarget(draft_large,right_ptr) -#CursorLinkTarget(draft_small,right_ptr) -#CursorLinkTarget(plus,cross) -#CursorLinkTarget(tcross,cross) -#CursorLinkTarget(top_left_arrow,left_ptr) -#CursorLinkTarget(08e8e1c95fe2fc01f976f1e063a24ccd,left_ptr_watch) WATCH_SOURCES="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" #CursorTargetFromSource(watch,$(WATCH_SOURCES)) diff --git a/redglass/Makefile.cursors b/redglass/Makefile.cursors index 7e9a85c..782ef37 100644 --- a/redglass/Makefile.cursors +++ b/redglass/Makefile.cursors @@ -1,6 +1,7 @@ # 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 watch xterm +CURSORLINKS = arrow cross_reverse crosshair draft_large draft_small plus tcross top_left_arrow 08e8e1c95fe2fc01f976f1e063a24ccd CLEANFILES = $(CURSORFILES) cursor_DATA = $(CURSORFILES) @@ -115,4 +116,20 @@ watch: $(srcdir)/hourglass-full-16.png $(srcdir)/hourglass-75-16.png $(srcdir)/h 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 +install-data-hook: + cd $(DESTDIR)$(cursordir) && rm -f $(CURSORLINKS) + cd $(DESTDIR)$(cursordir) && \ + $(LN_S) right_ptr arrow && \ + $(LN_S) cross cross_reverse && \ + $(LN_S) cross crosshair && \ + $(LN_S) right_ptr draft_large && \ + $(LN_S) right_ptr draft_small && \ + $(LN_S) cross plus && \ + $(LN_S) cross tcross && \ + $(LN_S) left_ptr top_left_arrow && \ + $(LN_S) left_ptr_watch 08e8e1c95fe2fc01f976f1e063a24ccd + +uninstall-hook: + cd $(DESTDIR)$(cursordir) && rm -f $(CURSORLINKS) + 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 b! ottom_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 le! ft_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 righ! t_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.pn! g top_right_corner-32.png top_right_corner-48.png top_right_corner-64.p! ng 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 hourglas! s-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.cfg b/whiteglass/Makefile.cfg index d128249..bc4083b 100644 --- a/whiteglass/Makefile.cfg +++ b/whiteglass/Makefile.cfg @@ -3,3 +3,22 @@ CURSORS="X_cursor base_arrow_down base_arrow_up boat bottom_left_corner bottom_right_corner bottom_side bottom_tee center_ptr circle cross dot dot_box_mask double_arrow draped_box exchange fleur gumby hand1 hand2 left_ptr left_ptr_watch left_side left_tee ll_angle lr_angle pencil pirate question_arrow right_ptr right_side right_tee sailboat sb_down_arrow sb_h_double_arrow sb_left_arrow sb_right_arrow sb_up_arrow sb_v_double_arrow shuttle sizing target top_left_corner top_right_corner top_side top_tee trek ul_angle ur_angle watch xterm" DIST="Makefile.cfg Makefile.cursors gumby-128.png basic_arrow-16.png basic_arrow-24.png basic_arrow-32.png basic_arrow-48.png basic_arrow-64.png basic_arrow.cfg basic_arrow.xcf" + +# CursorLinkTarget dst src makes a link from src -> dst in target directory +CursorLinkTarget arrow right_ptr +CursorLinkTarget cross_reverse cross +CursorLinkTarget crosshair cross +CursorLinkTarget draft_large right_ptr +CursorLinkTarget draft_small right_ptr +CursorLinkTarget plus cross +CursorLinkTarget tcross cross +CursorLinkTarget top_left_arrow left_ptr +## Application specific cursors for Mozilla +# moz_alias 0876e1c15ff2fc01f906f1c363074c0f (left_ptr with small arrow) +# moz_copy 08ffe1cb5fe6fc01f906f1c063814ccf (left_ptr with plus) +# moz_hand_grabbing 208530c400c041818281048008011002 (closed hand) +# moz_hand_grab 5aca4d189052212118709018842178c0 (open hand) +# moz_menu 08ffe1e65f80fcfdf9fff11263e74c48 (left_ptr with menu) +# moz_question_arrow 5c6cd98b3f3ebcb1f9c7f1c204630408 (left_ptr with ?) +# moz_spinning (left_ptr with watch) +CursorLinkTarget 08e8e1c95fe2fc01f976f1e063a24ccd left_ptr_watch diff --git a/whiteglass/Makefile.cursors b/whiteglass/Makefile.cursors index 94aa58a..84ec0bc 100644 --- a/whiteglass/Makefile.cursors +++ b/whiteglass/Makefile.cursors @@ -1,6 +1,7 @@ # this is a generated file -- do not edit. CURSORFILES = X_cursor base_arrow_down base_arrow_up boat bottom_left_corner bottom_right_corner bottom_side bottom_tee center_ptr circle cross dot dot_box_mask double_arrow draped_box exchange fleur gumby hand1 hand2 left_ptr left_ptr_watch left_side left_tee ll_angle lr_angle pencil pirate question_arrow right_ptr right_side right_tee sailboat sb_down_arrow sb_h_double_arrow sb_left_arrow sb_right_arrow sb_up_arrow sb_v_double_arrow shuttle sizing target top_left_corner top_right_corner top_side top_tee trek ul_angle ur_angle watch xterm +CURSORLINKS = arrow cross_reverse crosshair draft_large draft_small plus tcross top_left_arrow 08e8e1c95fe2fc01f976f1e063a24ccd CLEANFILES = $(CURSORFILES) cursor_DATA = $(CURSORFILES) @@ -157,4 +158,20 @@ watch: $(srcdir)/watch-16.png $(srcdir)/watch-24.png $(srcdir)/watch-32.png $(sr 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 +install-data-hook: + cd $(DESTDIR)$(cursordir) && rm -f $(CURSORLINKS) + cd $(DESTDIR)$(cursordir) && \ + $(LN_S) right_ptr arrow && \ + $(LN_S) cross cross_reverse && \ + $(LN_S) cross crosshair && \ + $(LN_S) right_ptr draft_large && \ + $(LN_S) right_ptr draft_small && \ + $(LN_S) cross plus && \ + $(LN_S) cross tcross && \ + $(LN_S) left_ptr top_left_arrow && \ + $(LN_S) left_ptr_watch 08e8e1c95fe2fc01f976f1e063a24ccd + +uninstall-hook: + cd $(DESTDIR)$(cursordir) && rm -f $(CURSORLINKS) + 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 base_arrow_down-16.png base_arrow_down-24.png base_arrow_down-32.png base_arrow_down-48.png base_arrow_down-64.png base_arrow_down.cfg base_arrow_down.xcf base_arrow_up-16.png base_arrow_up-24.png base_arrow_up-32.png base_arrow_up-48.png base_arrow_up-64.png base_arrow_up.cfg base_arrow_up.xcf boat-16.png boat-24.png boat-32.png boat-48.png boat-64.png boat.cfg boat.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_te! e-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 dot_box_mask-16.png dot_box_mask-24.png dot_box_mask-32.png dot_box_mask-48.png dot_box_mask-64.png dot_box_mask.cfg dot_box_mask.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 exchange-16.png exchange-24.png exchange-32.png exchange-48.png exchange-64.png exchange.cfg exchange.xcf fleur-16.png fl! eur-24.png fleur-32.png fleur-48.png fleur-64.png fleur.cfg fl! eur.xcf gumby-16.png gumby-24.png gumby-32.png gumby-48.png gumby-64.png gumby.cfg gumby.xcf hand1-16.png hand1-24.png hand1-32.png hand1-48.png hand1-64.png hand1.cfg hand1.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 lr_angle-16.png lr_angle-24.png lr_angle-32.png lr_angle-48.png lr_angle-64.png lr_angle.cfg lr_angle.xcf pencil-16.png pencil-24.png pencil-32.pn! g pencil-48.png pencil-64.png pencil.cfg pencil.xcf pirate-16.png pirate-24.png pirate-32.png pirate-48.png pirate-64.png pirate.cfg pirate.xcf question_arrow-16.png question_arrow-24.png question_arrow-32.png question_arrow-48.png question_arrow-64.png question_arrow.cfg question_arrow.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 sailboat-16.png sailboat-24.png sailboat-32.png sailboat-48.png sailboat-64.png sailboat.cfg sailboat.xcf sb_down_arrow-16.png sb_down_arrow-24.png sb_down_arrow-32.png sb_down_arrow-48.png sb_down_arrow-64.png sb_down_arrow.cfg sb_down_arrow.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_le! ft_arrow-16.png sb_left_arrow-24.png sb_left_arrow-32.png sb_left_arrow-48.png sb_left_arrow-64.png sb_left_arrow.cfg sb_left_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 sizing-16.png sizing-24.png sizing-32.png sizing-48.png sizing-64.png sizing.cfg sizing.xcf target-16.png target-24.png target-32.png target-48.png target-64.png target.cfg target.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_c! orner.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 trek-16.png trek-24.png trek-32.png trek-48.png trek-64.png trek.cfg trek.xcf ul_angle-16.png ul_angle-24.png ul_angle-32.png ul_angle-48.png ul_angle-64.png ul_angle.cfg ul_angle.xcf ur_angle-16.png ur_angle-24.png ur_angle-32.png ur_angle-48.png ur_angle-64.png ur_angle.cfg ur_angle.xcf watch-16.png watch-24.png watch-32.png watch-48.png watch-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 gumby-128.png basic_arrow-16.png basic_arrow-24.png basic_arrow-32.png basic_arrow-48.png basic_arrow! -64.png basic_arrow.cfg basic_arrow.xcf -- 1.7.9.2 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
