User icon-slicer to generate the icons, instead of cursorthemegen.

2 files changed, 11 insertions, 15 deletions

diff --git a/cursor/sugar/.gitignore b/cursor/sugar/.gitignore
new file mode 100644
index 0000000..4baf0b7
--- /dev/null
+++ b/cursor/sugar/.gitignore
@@ -0,0 +1 @@
+cursors
diff --git a/cursor/sugar/Makefile.am b/cursor/sugar/Makefile.am
index cb9beec..9af934c 100644
--- a/cursor/sugar/Makefile.am
+++ b/cursor/sugar/Makefile.am
@@ -1,6 +1,3 @@
-THEMEGEN = $(top_builddir)/cursor/cursorthemegen/cursorthemegen
-THEME_DIR = $(top_builddir)/cursor/sugar/theme
-
 all-local: sugar.stamp
 
 sugar_images =			\
@@ -12,26 +9,24 @@ sugar_images =			\
 	sugar-05.png		\
 	sugar-06.png		\
 	sugar-07.png		\
-	sugar-08.png              \
-	sugar-09.png              \
-	sugar-10.png             \
-	sugar-11.png             \
+	sugar-08.png            \
+	sugar-09.png            \
+	sugar-10.png            \
+	sugar-11.png            \
 	sugar-hotspots.png
 
 sugar.stamp: $(sugar_images) $(THEMEGEN) sugar.cursortheme
-	rm -rf sugar &&     	                                \
-	BDIR=`pwd` && cd $(srcdir) &&                           \
-	$$BDIR/$(THEMEGEN) sugar.cursortheme $$BDIR/theme &&    	\
-	cd $$BDIR && touch sugar.stamp
+	$(ICON_SLICER) --image-dir=$(srcdir) --output-dir=$(builddir) $(srcdir)/sugar.cursortheme
+	touch sugar.stamp
 
 clean-local:
-	rm -rf $(THEME_DIR)
-	rm -rf $(top_builddir)/cursor/sugar/sugar.stamp
+	rm -rf cursors
+	rm sugar.stamp
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/icons/sugar/cursors/
-	for i in `cd $(THEME_DIR) && echo *` ; do					\
-	  $(INSTALL) $(THEME_DIR)/$$i $(DESTDIR)$(datadir)/icons/sugar/cursors/$$i ;	\
+	for i in `cd $(srcdir)/cursors && echo *` ; do						\
+	  $(INSTALL) $(srcdir)/cursors/$$i $(DESTDIR)$(datadir)/icons/sugar/cursors/$$i ;	\
 	done
 
 uninstall-local: