X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Ficons%2Fautomake.mk;h=7aee3f34248325ab54bb5df34ecd3f744dddfa34;hb=258cbd9cdf386687122b0854274923acafc786d4;hp=f57c9b4847a78fa4f2404654d7aa740712366afb;hpb=e2da62d735c597afeef2e0e9b36e5a4a83d7da94;p=pspp

diff --git a/src/ui/gui/icons/automake.mk b/src/ui/gui/icons/automake.mk
index f57c9b4847..7aee3f3424 100644
--- a/src/ui/gui/icons/automake.mk
+++ b/src/ui/gui/icons/automake.mk
@@ -1,6 +1,6 @@
-include $(top_srcdir)/src/ui/gui/icons/manifest
+EXTRA_DIST += $(icons) $(icon_srcs) src/ui/gui/icons/COPYING_CCBYSA3
 
-EXTRA_DIST += $(icons) $(icon_srcs)
+include $(top_srcdir)/src/ui/gui/icons/manifest
 
 themedir = $(DESTDIR)$(datadir)/icons/hicolor
 
@@ -10,9 +10,9 @@ 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 && \
+			if (cd $(top_srcdir)/src/ui/gui/icons/$$size/$$context && \
 				(test ! "`printf '%s %s %s' . .. *`" = '. .. *' || test -f '*')) 2> /dev/null ; then \
-				$(INSTALL_DATA) $(top_srcdir)/src/ui/gui/icons/$$context/$$size/* $(themedir)/$$size/$$context ; \
+				$(INSTALL_DATA) $(top_srcdir)/src/ui/gui/icons/$$size/$$context/* $(themedir)/$$size/$$context ; \
 			fi ; \
 		done ; \
 	done
@@ -21,7 +21,7 @@ install-ext-icons:
 uninstall-ext-icons:
 	for context in apps mimetypes; do \
 		for size in $(sizes); do \
-			if (cd $(top_srcdir)/src/ui/gui/icons/$$context/$$size && \
+			if (cd $(top_srcdir)/src/ui/gui/icons/$$size/$$context && \
 				(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* ; \
@@ -59,12 +59,18 @@ 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
+nodist_src_ui_gui_psppire_DATA = src/ui/gui/icons/splash.png
+
+src/ui/gui/icons/splash.png: $(top_srcdir)/src/ui/gui/icons/splash-t.png $(top_srcdir)/src/ui/gui/icons/splash-r.png Makefile
+	@$(MKDIR_P) src/ui/gui/icons
+	@case `echo $(VERSION) | $(SED) -e 's/[0-9][0-9]*\.[0-9]*\([0-9]\)\.[0-9][0-9]*/\1/'` in \
+	  [13579]) cp $(top_srcdir)/src/ui/gui/icons/splash-t.png $@ ; \
+	;;\
+	  *) cp $(top_srcdir)/src/ui/gui/icons/splash-r.png $@ ; \
+	;;\
+esac
+
+EXTRA_DIST += $(top_srcdir)/src/ui/gui/artwork/splash.svg $(icons) $(icon_srcs)
 
 endif