Merge master into gtk3.

[pspp] / Smake

diff --git a/Smake b/Smake
index 646389e439cb9dc68d857dda5d79da3d961c5f65..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,8 +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.svg
 
 CATEGORY_ICONS = \
 src/ui/gui/icons/categories/16x16/align-left.png \
@@ -135,23 +135,23 @@ src/ui/gui/icons/categories/16x16/align-right.png \
 src/ui/gui/icons/categories/16x16/measure-scale.png \
 src/ui/gui/icons/categories/16x16/measure-ordinal.png \
 src/ui/gui/icons/categories/16x16/measure-nominal.png \
-src/ui/gui/icons/categories/16x16/measure-date-scale \
+src/ui/gui/icons/categories/16x16/measure-date-scale.png \
 src/ui/gui/icons/categories/16x16/measure-date-nominal.png \
-src/ui/gui/icons/categories/16x16/measure-date-ordinal \
+src/ui/gui/icons/categories/16x16/measure-date-ordinal.png \
 src/ui/gui/icons/categories/16x16/measure-time-scale.png \
-src/ui/gui/icons/categories/16x16/measure-time-nominal \
-src/ui/gui/icons/categories/16x16/measure-time-ordinal \
+src/ui/gui/icons/categories/16x16/measure-time-nominal.png \
+src/ui/gui/icons/categories/16x16/measure-time-ordinal.png \
 src/ui/gui/icons/categories/16x16/measure-string-nominal.png \
 src/ui/gui/icons/categories/16x16/measure-string-ordinal.png \
-src/ui/gui/icons/categories/16x16/measure-currency-scale \
+src/ui/gui/icons/categories/16x16/measure-currency-scale.png \
 src/ui/gui/icons/categories/16x16/measure-currency-nominal.png \
-src/ui/gui/icons/categories/16x16/measure-currency-ordinal \
+src/ui/gui/icons/categories/16x16/measure-currency-ordinal.png \
 src/ui/gui/icons/categories/16x16/role-input.png \
 src/ui/gui/icons/categories/16x16/role-target.png \
 src/ui/gui/icons/categories/16x16/role-both.png \
 src/ui/gui/icons/categories/16x16/role-none.png \
 src/ui/gui/icons/categories/16x16/role-partition.png \
-src/ui/gui/icons/categories/16x16/role-split.png \
+src/ui/gui/icons/categories/16x16/role-split.png
 
 MIMETYPE_ICONS = \
 src/ui/gui/icons/mimetypes/32x32/application-x-spss-por.png \
@@ -173,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 = \
@@ -200,6 +198,8 @@ src/ui/gui/icons/actions/24x24/file-open-data.png \
 src/ui/gui/icons/actions/24x24/file-save-data.png \
 src/ui/gui/icons/actions/24x24/view-value-labels.png \
 src/ui/gui/icons/actions/16x16/file-new-data.png \
+src/ui/gui/icons/actions/16x16/file-syntax-data.png \
+src/ui/gui/icons/actions/16x16/file-system-data.png \
 src/ui/gui/icons/actions/16x16/file-open-data.png \
 src/ui/gui/icons/actions/16x16/file-import-data.png \
 src/ui/gui/icons/actions/16x16/file-export-data.png \
@@ -208,6 +208,8 @@ src/ui/gui/icons/actions/16x16/file-save-as.png \
 src/ui/gui/icons/actions/16x16/file-print.png \
 src/ui/gui/icons/actions/16x16/file-rename-data-set.png \
 src/ui/gui/icons/actions/16x16/file-display-information.png \
+src/ui/gui/icons/actions/16x16/display-information-working-file.png \
+src/ui/gui/icons/actions/16x16/display-information-external-file.png \
 src/ui/gui/icons/actions/16x16/file-recently-used.png \
 src/ui/gui/icons/actions/16x16/file-quit.png \
 src/ui/gui/icons/actions/16x16/file-display-information.png \
@@ -243,20 +245,21 @@ src/ui/gui/icons/actions/16x16/transform-automatic-recode.png \
 src/ui/gui/icons/actions/16x16/transform-in-to-same-variables.png \
 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 \
+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
-src/ui/gui/icons/actions/16x16/analyze-realiability.png
-src/ui/gui/icons/actions/16x16/analyze-regression.png
-src/ui/gui/icons/actions/16x16/analyze-non-parametric-statistics.png
-src/ui/gui/icons/actions/16x16/analyze-roc-curve.png
-src/ui/gui/icons/actions/16x16/utilities-variables.png
-src/ui/gui/icons/actions/16x16/utilities-data-file-comments.png
-src/ui/gui/icons/actions/16x16/windows-minimize-all.png
-src/ui/gui/icons/actions/16x16/windows-split.png
-src/ui/gui/icons/actions/16x16/help-reference-manual.png
+src/ui/gui/icons/actions/16x16/analyze-kmeans-cluster.png \
+src/ui/gui/icons/actions/16x16/analyze-factor-analysis.png \
+src/ui/gui/icons/actions/16x16/analyze-realiability.png \
+src/ui/gui/icons/actions/16x16/analyze-regression.png \
+src/ui/gui/icons/actions/16x16/analyze-non-parametric-statistics.png \
+src/ui/gui/icons/actions/16x16/analyze-roc-curve.png \
+src/ui/gui/icons/actions/16x16/utilities-variables.png \
+src/ui/gui/icons/actions/16x16/utilities-data-file-comments.png \
+src/ui/gui/icons/actions/16x16/windows-minimize-all.png \
+src/ui/gui/icons/actions/16x16/windows-split.png \
+src/ui/gui/icons/actions/16x16/help-reference-manual.png \
 src/ui/gui/icons/actions/16x16/help-about.png
 
 
@@ -414,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 $< $@