X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Ficons%2Fautomake.mk;h=f57c9b4847a78fa4f2404654d7aa740712366afb;hb=refs%2Fbuilds%2F20140209033012%2Fpspp;hp=541090d8a5cd5078ee00214617d3ccca2445872c;hpb=76dbb1be016ad9b0d22d43d08414c293807c5a0a;p=pspp

diff --git a/src/ui/gui/icons/automake.mk b/src/ui/gui/icons/automake.mk
index 541090d8a5..f57c9b4847 100644
--- a/src/ui/gui/icons/automake.mk
+++ b/src/ui/gui/icons/automake.mk
@@ -4,24 +4,29 @@ EXTRA_DIST += $(icons) $(icon_srcs)
 
 themedir = $(DESTDIR)$(datadir)/icons/hicolor
 
-sizes=16x16 22x22  24x24 32x32 48x48 256x256
+sizes=16x16 22x22  24x24 32x32 48x48 256x256 scalable
 
-install-mimetypes:
-	for size in $(sizes); do \
-		$(MKDIR_P) $(themedir)/$$size/mimetypes ; \
-		if (cd $(top_srcdir)/src/ui/gui/icons/mimetypes/$$size && \
-			(test ! "`printf '%s %s %s' . .. *`" = '. .. *' || test -f '*')) 2> /dev/null ; then \
-			$(INSTALL_DATA) $(top_srcdir)/src/ui/gui/icons/mimetypes/$$size/* $(themedir)/$$size/mimetypes ; \
-		fi ; \
+install-ext-icons:
+	for context in apps mimetypes; do \
+		for size in $(sizes); do \
+		$(MKDIR_P) $(themedir)/$$size/$$context ; \
+			if (cd $(top_srcdir)/src/ui/gui/icons/$$context/$$size && \
+				(test ! "`printf '%s %s %s' . .. *`" = '. .. *' || test -f '*')) 2> /dev/null ; then \
+				$(INSTALL_DATA) $(top_srcdir)/src/ui/gui/icons/$$context/$$size/* $(themedir)/$$size/$$context ; \
+			fi ; \
+		done ; \
 	done
 
 
-uninstall-mimetypes:
-	for size in $(sizes); do \
-		if (cd $(top_srcdir)/src/ui/gui/icons/mimetypes/$$size && \
-			(test ! "`printf '%s %s %s' . .. *`" = '. .. *' || test -f '*')) 2> /dev/null ; then \
-			  rm -rf $(themedir)/$$size/mimetypes/application-x-spss-* ; \
-		fi ; \
+uninstall-ext-icons:
+	for context in apps mimetypes; do \
+		for size in $(sizes); do \
+			if (cd $(top_srcdir)/src/ui/gui/icons/$$context/$$size && \
+				(test ! "`printf '%s %s %s' . .. *`" = '. .. *' || test -f '*')) 2> /dev/null ; then \
+				  rm -rf $(themedir)/$$size/$$context/application-x-spss-* ; \
+				  rm -rf $(themedir)/$$size/$$context/pspp* ; \
+			fi ; \
+		done ; \
 	done
 
 
@@ -50,6 +55,16 @@ uninstall-icons:
 	done
 
 
+INSTALL_DATA_HOOKS += install-icons install-ext-icons
+UNINSTALL_DATA_HOOKS += uninstall-icons uninstall-ext-icons
+
+if HAVE_GUI
+dist_src_ui_gui_psppire_DATA += \
+	$(top_srcdir)/src/ui/gui/icons/splash.png
+
+src_ui_gui_psppire_SOURCES += \
+	src/ui/gui/icons/icon-names.c \
+	src/ui/gui/icons/icon-names.h
+
+endif
 
-INSTALL_DATA_HOOKS += install-icons install-mimetypes
-UNINSTALL_DATA_HOOKS += uninstall-icons uninstall-mimetypes