X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=730dbfcb7dae184a8e21317956a95eabec38ef00;hb=0c88e75ba323baad4440ef0ab66bc35df2f1aecc;hp=694ca57697b0b9334f4e8ff32b4246416c4df2d6;hpb=adf4bc614f52fd20d34190dc710af5db9a897c40;p=pspp

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 694ca57697..730dbfcb7d 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -98,38 +98,35 @@ src_ui_gui_spreadsheet_test_SOURCES = src/ui/gui/spreadsheet-test.c src/ui/gui/p
 src_ui_gui_psppiredir = $(pkgdatadir)
 
 
-themedir = $(DESTDIR)$(datadir)/icons/hicolor
-context = pspp
+thethemedir = $(DESTDIR)$(datadir)/icons/hicolor
+thecontext = pspp
 
 
 install-lang:
 	$(INSTALL_DATA) $(top_srcdir)/src/ui/gui/pspp.lang $(DESTDIR)$(pkgdatadir)
 
-install-icons:
+install-legacy-icons:
 	for size in 16x16 ; do \
-	  $(MKDIR_P) $(themedir)/$$size/$(context) ; \
-          $(INSTALL_DATA) $(top_srcdir)/src/ui/gui/icons/$$size/* $(themedir)/$$size/$(context) ; \
-	  $(MKDIR_P) $(themedir)/$$size/apps ; \
-	  $(INSTALL_DATA) $(top_srcdir)/src/ui/gui/app-icons/$$size/pspp.png $(themedir)/$$size/apps ; \
+	  $(MKDIR_P) $(thethemedir)/$$size/$(thecontext) ; \
+          $(INSTALL_DATA) $(top_srcdir)/src/ui/gui/icons/$$size/* $(thethemedir)/$$size/$(thecontext) ; \
 	done 
-	if test -z "$(DESTDIR)" ; then \
-		gtk-update-icon-cache --ignore-theme-index $(themedir); \
-	fi
 
-INSTALL_DATA_HOOKS += install-icons install-lang
+INSTALL_DATA_HOOKS += install-legacy-icons install-lang
 
-uninstall-icons:
+uninstall-legacy-icons:
 	for size in 16x16 ; do \
-          rm -r -f $(themedir)/$$size/$(context); \
-          rm -f $(themedir)/$$size/apps/pspp.png; \
+          rm -r -f $(thethemedir)/$$size/$(thecontext); \
 	done 
-	gtk-update-icon-cache --ignore-theme-index $(themedir)
 
-UNINSTALL_DATA_HOOKS += uninstall-icons
+update-icon-cache:
+	if test -z "$(DESTDIR)" ; then \
+		gtk-update-icon-cache --ignore-theme-index $(thethemedir); \
+	fi
+
+UNINSTALL_DATA_HOOKS += uninstall-legacy-icons
 
 dist_src_ui_gui_psppire_DATA = \
 	$(UI_FILES) \
-	$(top_srcdir)/src/ui/gui/app-icons/16x16/pspp.png \
 	$(top_srcdir)/src/ui/gui/pspp.lang \
 	$(top_srcdir)/src/ui/gui/pspplogo.png \
 	$(top_srcdir)/src/ui/gui/icons/value-labels.png \
@@ -145,7 +142,6 @@ dist_src_ui_gui_psppire_DATA = \
 	$(top_srcdir)/src/ui/gui/icons/16x16/scale.png \
 	$(top_srcdir)/src/ui/gui/icons/16x16/string.png \
 	$(top_srcdir)/src/ui/gui/icons/16x16/date-scale.png \
-	$(top_srcdir)/src/ui/gui/icons/splash.png \
 	$(top_srcdir)/src/ui/gui/psppire.gtkrc
 
 src_ui_gui_psppire_SOURCES = \
@@ -413,3 +409,8 @@ src/ui/gui/include/gtk/gtk.h: src/ui/gui/include/gtk/gtk.in.h
 CLEANFILES += src/ui/gui/include/gtk/gtk.h
 EXTRA_DIST += src/ui/gui/include/gtk/gtk.in.h
 
+include $(top_srcdir)/src/ui/gui/icons/automake.mk
+
+UNINSTALL_DATA_HOOKS += update-icon-cache
+INSTALL_DATA_HOOKS += update-icon-cache
+