Merge master into gtk3.

[pspp] / Smake

diff --git a/Smake b/Smake
index f113790a6275ad6ab74db40a00bee53a39e2f25c..5fa1a6c48c16b626ad732e4f19f0b8deb127b7b3 100644 (file)
--- a/Smake
+++ b/Smake
@@ -79,6 +79,7 @@ GNULIB_MODULES = \
        strtok_r \
        sys_stat \
        tempname \
+       termios \
        trunc \
        unicase/u8-casecmp \
        unicase/u8-casefold \
@@ -125,7 +126,7 @@ src/ui/gui/icons/apps/24x24/pspp.png \
 src/ui/gui/icons/apps/256x256/pspp.png \
 src/ui/gui/icons/apps/16x16/pspp.png \
 src/ui/gui/icons/apps/48x48/pspp.png \
-src/ui/gui/icons/apps/scalable/pspp.png
+src/ui/gui/icons/apps/scalable/pspp.svg
 
 CATEGORY_ICONS = \
 src/ui/gui/icons/categories/16x16/align-left.png \
@@ -172,9 +173,7 @@ src/ui/gui/icons/mimetypes/48x48/application-x-spss-por.png \
 src/ui/gui/icons/mimetypes/48x48/application-x-spss-sav.png \
 src/ui/gui/icons/mimetypes/48x48/application-x-spss-sps.png \
 
-MISC_ICONS = src/ui/gui/icons/splash.png \
-src/ui/gui/icons/about-logo.png
-
+MISC_ICONS = src/ui/gui/icons/splash.png
 
 
 ACTION_ICONS = \
@@ -248,6 +247,7 @@ src/ui/gui/icons/actions/16x16/transform-in-to-different-variables.png \
 src/ui/gui/icons/actions/16x16/transform-run-pending.png \
 src/ui/gui/icons/actions/16x16/analyze-descriptive-statistics.png \
 src/ui/gui/icons/actions/16x16/analyze-compare-means.png \
+src/ui/gui/icons/actions/16x16/analyze-univariate-analysis.png \
 src/ui/gui/icons/actions/16x16/analyze-bivariate-correlation.png \
 src/ui/gui/icons/actions/16x16/analyze-kmeans-cluster.png \
 src/ui/gui/icons/actions/16x16/analyze-factor-analysis.png \
@@ -417,3 +417,7 @@ src/ui/gui/icons/%.png: src/ui/gui/artwork/%.svg src/ui/gui/icons/COPYING_CCBYSA
        mkdir -p $(dir $@)
        $(call svg2png,$<,$(lastword $^),$@)
 
+
+src/ui/gui/icons/%.svg: src/ui/gui/artwork/%.svg
+       mkdir -p $(dir $@)
+       cp $< $@