X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=b27456bced1c709447c3f1efec04615c3c9e220b;hb=refs%2Fheads%2Fpivot-table2;hp=2a777426c5a6fbed714511a9cff28594f04b2090;hpb=2ee6c61278915427fb637e917cf0fdc94462e992;p=pspp diff --git a/Smake b/Smake index 2a777426c5..b27456bced 100644 --- a/Smake +++ b/Smake @@ -19,7 +19,7 @@ GNULIB_MODULES = \ count-one-bits \ crc \ crypto/md4 \ - crypto/md5 \ + crypto/rijndael \ dirname \ dtoastr \ environ \ @@ -33,6 +33,7 @@ GNULIB_MODULES = \ ftello \ fwriteerror \ getline \ + getpass \ gettext \ gettimeofday \ getopt-gnu \ @@ -75,10 +76,12 @@ GNULIB_MODULES = \ stpcpy \ strerror \ strftime \ + strsep \ strtod \ strtok_r \ sys_stat \ tempname \ + termios \ trunc \ unicase/u8-casecmp \ unicase/u8-casefold \ @@ -124,155 +127,173 @@ src/ui/gui/icons/apps/22x22/pspp.png \ 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/48x48/pspp.png \ +src/ui/gui/icons/apps/scalable/pspp.svg CATEGORY_ICONS = \ -src/ui/gui/icons/categories/24x24/variable-string-nominal.png \ -src/ui/gui/icons/categories/24x24/align-center.png \ -src/ui/gui/icons/categories/24x24/variable-nominal.png \ -src/ui/gui/icons/categories/24x24/align-left.png \ -src/ui/gui/icons/categories/24x24/variable-date-scale.png \ -src/ui/gui/icons/categories/24x24/variable-scale.png \ -src/ui/gui/icons/categories/24x24/variable-string-ordinal.png \ -src/ui/gui/icons/categories/24x24/variable-ordinal.png \ -src/ui/gui/icons/categories/24x24/align-right.png \ -src/ui/gui/icons/categories/24x24/variable-date-nominal.png \ -src/ui/gui/icons/categories/24x24/variable-date-ordinal.png \ -src/ui/gui/icons/categories/24x24/variable-string-scale.png \ -src/ui/gui/icons/categories/16x16/variable-string-nominal.png \ -src/ui/gui/icons/categories/16x16/align-center.png \ -src/ui/gui/icons/categories/16x16/variable-nominal.png \ src/ui/gui/icons/categories/16x16/align-left.png \ -src/ui/gui/icons/categories/16x16/variable-date-scale.png \ -src/ui/gui/icons/categories/16x16/variable-scale.png \ -src/ui/gui/icons/categories/16x16/variable-string-ordinal.png \ -src/ui/gui/icons/categories/16x16/variable-ordinal.png \ +src/ui/gui/icons/categories/16x16/align-center.png \ src/ui/gui/icons/categories/16x16/align-right.png \ -src/ui/gui/icons/categories/16x16/variable-date-nominal.png \ -src/ui/gui/icons/categories/16x16/variable-date-ordinal.png \ -src/ui/gui/icons/categories/16x16/variable-string-scale.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.png \ +src/ui/gui/icons/categories/16x16/measure-date-nominal.png \ +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.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.png \ +src/ui/gui/icons/categories/16x16/measure-currency-nominal.png \ +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 MIMETYPE_ICONS = \ src/ui/gui/icons/mimetypes/32x32/application-x-spss-por.png \ src/ui/gui/icons/mimetypes/32x32/application-x-spss-sav.png \ src/ui/gui/icons/mimetypes/32x32/application-x-spss-sps.png \ +src/ui/gui/icons/mimetypes/32x32/application-x-spss-zsav.png \ src/ui/gui/icons/mimetypes/22x22/application-x-spss-por.png \ src/ui/gui/icons/mimetypes/22x22/application-x-spss-sav.png \ src/ui/gui/icons/mimetypes/22x22/application-x-spss-sps.png \ +src/ui/gui/icons/mimetypes/22x22/application-x-spss-zsav.png \ src/ui/gui/icons/mimetypes/24x24/application-x-spss-por.png \ src/ui/gui/icons/mimetypes/24x24/application-x-spss-sav.png \ src/ui/gui/icons/mimetypes/24x24/application-x-spss-sps.png \ +src/ui/gui/icons/mimetypes/24x24/application-x-spss-zsav.png \ src/ui/gui/icons/mimetypes/256x256/application-x-spss-por.png \ src/ui/gui/icons/mimetypes/256x256/application-x-spss-sav.png \ src/ui/gui/icons/mimetypes/256x256/application-x-spss-sps.png \ +src/ui/gui/icons/mimetypes/256x256/application-x-spss-zsav.png \ src/ui/gui/icons/mimetypes/16x16/application-x-spss-por.png \ src/ui/gui/icons/mimetypes/16x16/application-x-spss-sav.png \ src/ui/gui/icons/mimetypes/16x16/application-x-spss-sps.png \ +src/ui/gui/icons/mimetypes/16x16/application-x-spss-zsav.png \ 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 \ +src/ui/gui/icons/mimetypes/48x48/application-x-spss-zsav.png \ MISC_ICONS = src/ui/gui/icons/splash.png - ACTION_ICONS = \ -src/ui/gui/icons/actions/24x24/edit-copy.png \ -src/ui/gui/icons/actions/24x24/windows-split.png \ -src/ui/gui/icons/actions/24x24/edit-paste.png \ -src/ui/gui/icons/actions/24x24/help-reference-manual.png \ -src/ui/gui/icons/actions/24x24/view-value-labels.png \ -src/ui/gui/icons/actions/24x24/file-print-document.png \ -src/ui/gui/icons/actions/24x24/file-open-document.png \ -src/ui/gui/icons/actions/24x24/transform-runpending-transforms.png \ -src/ui/gui/icons/actions/24x24/file-save-document.png \ -src/ui/gui/icons/actions/24x24/file-rename-dataset.png \ -src/ui/gui/icons/actions/24x24/edit-select-all.png \ -src/ui/gui/icons/actions/24x24/file-display-information.png \ -src/ui/gui/icons/actions/24x24/edit-insert-variable.png \ -src/ui/gui/icons/actions/24x24/file-export-document.png \ -src/ui/gui/icons/actions/24x24/utilities-case.png \ -src/ui/gui/icons/actions/24x24/data-sort-cases.png \ -src/ui/gui/icons/actions/24x24/utilities-variable.png \ -src/ui/gui/icons/actions/24x24/edit-clear-data.png \ -src/ui/gui/icons/actions/24x24/utilities-datafile-comments.png \ -src/ui/gui/icons/actions/24x24/windows-minimize.png \ -src/ui/gui/icons/actions/24x24/transform-recode-different-variables.png \ -src/ui/gui/icons/actions/24x24/transform-compute.png \ -src/ui/gui/icons/actions/24x24/recent-dialogs.png \ -src/ui/gui/icons/actions/24x24/transform-count.png \ -src/ui/gui/icons/actions/24x24/edit-goto-case.png \ +src/ui/gui/icons/actions/32x32/data-split-file.png \ +src/ui/gui/icons/actions/32x32/data-select-cases.png \ +src/ui/gui/icons/actions/32x32/data-weight-cases.png \ +src/ui/gui/icons/actions/32x32/transform-compute.png \ +src/ui/gui/icons/actions/32x32/edit-find.png \ +src/ui/gui/icons/actions/32x32/edit-go-to-case.png \ +src/ui/gui/icons/actions/32x32/edit-go-to-variable.png \ +src/ui/gui/icons/actions/32x32/edit-insert-case.png \ +src/ui/gui/icons/actions/32x32/edit-insert-variable.png \ +src/ui/gui/icons/actions/32x32/edit-cut.png \ +src/ui/gui/icons/actions/32x32/edit-copy.png \ +src/ui/gui/icons/actions/32x32/edit-paste.png \ +src/ui/gui/icons/actions/32x32/edit-undo.png \ +src/ui/gui/icons/actions/32x32/edit-redo.png \ +src/ui/gui/icons/actions/32x32/edit-select-all.png \ +src/ui/gui/icons/actions/32x32/file-open-data.png \ +src/ui/gui/icons/actions/32x32/file-save-data.png \ +src/ui/gui/icons/actions/32x32/file-export-data.png \ +src/ui/gui/icons/actions/32x32/file-print.png \ +src/ui/gui/icons/actions/32x32/view-value-labels.png \ +src/ui/gui/icons/actions/32x32/utilities-variables.png \ +src/ui/gui/icons/actions/32x32/run-all.png \ src/ui/gui/icons/actions/24x24/data-split-file.png \ -src/ui/gui/icons/actions/24x24/help-about.png \ -src/ui/gui/icons/actions/24x24/transform-automatic-recode.png \ -src/ui/gui/icons/actions/24x24/data-transpose.png \ -src/ui/gui/icons/actions/24x24/edit-search-case.png \ -src/ui/gui/icons/actions/24x24/view-fullscreen.png \ -src/ui/gui/icons/actions/24x24/edit-add-variable.png \ -src/ui/gui/icons/actions/24x24/data-select-case.png \ -src/ui/gui/icons/actions/24x24/file-import-document.png \ +src/ui/gui/icons/actions/24x24/data-select-cases.png \ src/ui/gui/icons/actions/24x24/data-weight-cases.png \ -src/ui/gui/icons/actions/24x24/edit-add-case.png \ +src/ui/gui/icons/actions/24x24/transform-compute.png \ +src/ui/gui/icons/actions/24x24/edit-find.png \ +src/ui/gui/icons/actions/24x24/edit-go-to-case.png \ +src/ui/gui/icons/actions/24x24/edit-go-to-variable.png \ src/ui/gui/icons/actions/24x24/edit-insert-case.png \ -src/ui/gui/icons/actions/24x24/file-quit.png \ -src/ui/gui/icons/actions/24x24/file-recently-used.png \ -src/ui/gui/icons/actions/24x24/edit-goto-variable.png \ -src/ui/gui/icons/actions/24x24/transform-rank-cases.png \ -src/ui/gui/icons/actions/24x24/transform-recode-same-variables.png \ -src/ui/gui/icons/actions/24x24/view-fonts.png \ -src/ui/gui/icons/actions/24x24/file-saveas-document.png \ +src/ui/gui/icons/actions/24x24/edit-insert-variable.png \ src/ui/gui/icons/actions/24x24/edit-cut.png \ -src/ui/gui/icons/actions/24x24/file-new-document.png \ -src/ui/gui/icons/actions/24x24/data-aggregate.png \ +src/ui/gui/icons/actions/24x24/edit-copy.png \ +src/ui/gui/icons/actions/24x24/edit-paste.png \ +src/ui/gui/icons/actions/24x24/edit-undo.png \ +src/ui/gui/icons/actions/24x24/edit-redo.png \ +src/ui/gui/icons/actions/24x24/edit-select-all.png \ +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/file-export-data.png \ +src/ui/gui/icons/actions/24x24/file-print.png \ +src/ui/gui/icons/actions/24x24/view-value-labels.png \ +src/ui/gui/icons/actions/24x24/utilities-variables.png \ +src/ui/gui/icons/actions/24x24/run-all.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 \ +src/ui/gui/icons/actions/16x16/file-save-data.png \ +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 \ +src/ui/gui/icons/actions/16x16/edit-insert-variable.png \ +src/ui/gui/icons/actions/16x16/edit-insert-case.png \ +src/ui/gui/icons/actions/16x16/edit-go-to-variable.png \ +src/ui/gui/icons/actions/16x16/edit-go-to-case.png \ +src/ui/gui/icons/actions/16x16/edit-cut.png \ src/ui/gui/icons/actions/16x16/edit-copy.png \ -src/ui/gui/icons/actions/16x16/windows-split.png \ src/ui/gui/icons/actions/16x16/edit-paste.png \ -src/ui/gui/icons/actions/16x16/help-reference-manual.png \ -src/ui/gui/icons/actions/16x16/view-value-labels.png \ -src/ui/gui/icons/actions/16x16/file-print-document.png \ -src/ui/gui/icons/actions/16x16/file-open-document.png \ -src/ui/gui/icons/actions/16x16/transform-runpending-transforms.png \ -src/ui/gui/icons/actions/16x16/file-save-document.png \ -src/ui/gui/icons/actions/16x16/file-rename-dataset.png \ +src/ui/gui/icons/actions/16x16/edit-delete.png \ +src/ui/gui/icons/actions/16x16/edit-undo.png \ +src/ui/gui/icons/actions/16x16/edit-redo.png \ src/ui/gui/icons/actions/16x16/edit-select-all.png \ -src/ui/gui/icons/actions/16x16/file-display-information.png \ -src/ui/gui/icons/actions/16x16/edit-insert-variable.png \ -src/ui/gui/icons/actions/16x16/file-export-document.png \ -src/ui/gui/icons/actions/16x16/utilities-case.png \ +src/ui/gui/icons/actions/16x16/edit-clear.png \ +src/ui/gui/icons/actions/16x16/edit-find.png \ +src/ui/gui/icons/actions/16x16/view-font.png \ +src/ui/gui/icons/actions/16x16/view-value-labels.png \ src/ui/gui/icons/actions/16x16/data-sort-cases.png \ -src/ui/gui/icons/actions/16x16/utilities-variable.png \ -src/ui/gui/icons/actions/16x16/edit-clear-data.png \ -src/ui/gui/icons/actions/16x16/utilities-datafile-comments.png \ -src/ui/gui/icons/actions/16x16/windows-minimize.png \ -src/ui/gui/icons/actions/16x16/transform-recode-different-variables.png \ -src/ui/gui/icons/actions/16x16/transform-compute.png \ -src/ui/gui/icons/actions/16x16/recent-dialogs.png \ -src/ui/gui/icons/actions/16x16/transform-count.png \ -src/ui/gui/icons/actions/16x16/edit-goto-case.png \ -src/ui/gui/icons/actions/16x16/data-split-file.png \ -src/ui/gui/icons/actions/16x16/help-about.png \ -src/ui/gui/icons/actions/16x16/transform-automatic-recode.png \ src/ui/gui/icons/actions/16x16/data-transpose.png \ -src/ui/gui/icons/actions/16x16/edit-search-case.png \ -src/ui/gui/icons/actions/16x16/view-fullscreen.png \ -src/ui/gui/icons/actions/16x16/edit-add-variable.png \ -src/ui/gui/icons/actions/16x16/data-select-case.png \ -src/ui/gui/icons/actions/16x16/file-import-document.png \ +src/ui/gui/icons/actions/16x16/data-aggregate.png \ +src/ui/gui/icons/actions/16x16/data-split-file.png \ +src/ui/gui/icons/actions/16x16/data-select-cases.png \ src/ui/gui/icons/actions/16x16/data-weight-cases.png \ -src/ui/gui/icons/actions/16x16/edit-add-case.png \ -src/ui/gui/icons/actions/16x16/edit-insert-case.png \ -src/ui/gui/icons/actions/16x16/file-quit.png \ -src/ui/gui/icons/actions/16x16/file-recently-used.png \ -src/ui/gui/icons/actions/16x16/edit-goto-variable.png \ +src/ui/gui/icons/actions/16x16/run-all.png \ +src/ui/gui/icons/actions/16x16/run-selection.png \ +src/ui/gui/icons/actions/16x16/run-current-line.png \ +src/ui/gui/icons/actions/16x16/run-to-end.png \ +src/ui/gui/icons/actions/16x16/transform-compute.png \ +src/ui/gui/icons/actions/16x16/transform-count.png \ src/ui/gui/icons/actions/16x16/transform-rank-cases.png \ -src/ui/gui/icons/actions/16x16/transform-recode-same-variables.png \ -src/ui/gui/icons/actions/16x16/view-fonts.png \ -src/ui/gui/icons/actions/16x16/file-saveas-document.png \ -src/ui/gui/icons/actions/16x16/edit-cut.png \ -src/ui/gui/icons/actions/16x16/file-new-document.png \ -src/ui/gui/icons/actions/16x16/data-aggregate.png \ +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.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/help-about.png + ICONS=$(CATEGORY_ICONS) $(ACTION_ICONS) $(MIMETYPE_ICONS) $(APP_ICONS) $(MISC_ICONS) @@ -349,7 +370,7 @@ prep_ph: echo >&2 "libtoolize not found"; \ exit 1; \ fi; \ - $$LIBTOOLIZE --force --automake + $$LIBTOOLIZE --force --automake --copy aclocal.m4: aclocal -I m4 -I gl/m4 @@ -414,7 +435,18 @@ clean: .PHONY: all gettextize clean -src/ui/gui/icons/%.png: src/ui/gui/artwork/%.svg src/ui/gui/icons/COPYING_CCBYSA3 + +# The "convert" program from imagemagick can be used to create png from svg but doesn't properly deal +# with the alpha channels. Therefore, it is not recommended for production pspp builds, but might +# be useful to get something working on a platform which doesn't have a working gimp. + +#svg2png=convert -background transparent $1 $3 + +src/ui/gui/icons/%.png: src/ui/gui/artwork/%.svg build-aux/svg2png src/ui/gui/icons/COPYING_CCBYSA3 mkdir -p $(dir $@) - gimp -i -b '(let* ((image (car (gimp-file-load 1 "$<" "$<")))) (gimp-image-attach-parasite image (list "gimp-comment" 0 "$(shell cat $(lastword $^))" )) (gimp-file-save 1 image (car (gimp-image-get-active-drawable image)) "$@" "$@")) (gimp-quit 1)' + build-aux/svg2png "$<" "$(lastword $^)" "$@" + +src/ui/gui/icons/%.svg: src/ui/gui/artwork/%.svg + mkdir -p $(dir $@) + cp $< $@