X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=0314c9b7cd063be9bd53686df0c215e076a7f3e9;hb=912833f9331784d692ade66c76bffb5497b890e0;hp=646389e439cb9dc68d857dda5d79da3d961c5f65;hpb=3d543a3b6363c77a8b932aa376c09ff1019f34fd;p=pspp diff --git a/Smake b/Smake index 646389e439..0314c9b7cd 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 \ @@ -125,8 +128,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,71 +137,101 @@ 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 \ 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 \ -src/ui/gui/icons/about-logo.png - +MISC_ICONS = src/ui/gui/icons/splash.png ACTION_ICONS = \ 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/data-select-cases.png \ src/ui/gui/icons/actions/24x24/data-weight-cases.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/edit-insert-variable.png \ +src/ui/gui/icons/actions/24x24/edit-cut.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 \ @@ -208,6 +240,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 +277,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 @@ -268,39 +303,11 @@ all: prep_ph icons icons: $(ICONS) src/ui/gui/icons/icon-names.c src/ui/gui/icons/icon-names.c: $(MAKEFILE_LIST) - $(RM) $@ + $(RM) -f $@ printf '/* This is a generated file. Do not edit. */\n' >> $@ - printf '#include "icon-names.h"\n' >> $@ - echo >> $@ - printf 'static const char *action_icon_name[] =' >> $@ - printf '\n{\n' >> $@ - for i in $(ACTION_ICONS) ; do \ - echo $$i; \ - done | sed -e 's%[a-zA-Z/]*/[1-9]*x[1-9]*/\([^ ]*\)\.png%\1%g' | sort -u | while read f ; do \ - printf ' "%s", \n' $$f >> $@ ; \ - done ; \ - printf '};\n\n' >> $@ ; \ - printf 'const struct icon_context action_icon_context = {\n' >> $@ - printf ' action_icon_name,\n' >> $@ - printf " sizeof (action_icon_name) / sizeof (action_icon_name[0]),\n" >> $@ - printf " \"actions\"\n" >> $@ - printf '};\n' >> $@ ; \ - echo >> $@ - printf 'static const char *category_icon_name[] =' >> $@ - printf '\n{\n' >> $@ - for i in $(CATEGORY_ICONS) ; do \ - echo $$i; \ - done | sed -e 's%[a-zA-Z/]*/[1-9]*x[1-9]*/\([^ ]*\)\.png%\1%g' | sort -u | while read f ; do \ - printf ' "%s", \n' $$f >> $@ ; \ - done ; \ - printf '};\n\n' >> $@ ; \ - printf 'const struct icon_context category_icon_context = {\n' >> $@ - printf ' category_icon_name,\n' >> $@ - printf " sizeof (category_icon_name) / sizeof (category_icon_name[0]),\n" >> $@ - printf " \"categories\"\n" >> $@ - printf '};\n' >> $@ ; \ - echo >> $@ - + printf '#include "icon-names.h"\n\n' >> $@ + build-aux/icon-list action actions $(ACTION_ICONS) >> $@ + build-aux/icon-list category categories $(CATEGORY_ICONS) >> $@ src/ui/gui/icons/manifest: $(MAKEFILE_LIST) $(RM) $@ @@ -313,7 +320,8 @@ src/ui/gui/icons/manifest: $(MAKEFILE_LIST) echo >> $@ printf 'icon_srcs = ' >> $@ for i in $(ICONS); do \ - printf ' \\\n\t '$$i | sed -e 's/\.png$$/.svg/' -e 's%/icons/%/artwork/%' >> $@ ; \ + printf ' \\\n\t ' >> $@ ;\ + printf $$i | awk '{ gsub(".png",".svg")gsub("icons","artwork");printf $$0}' >> $@ ; \ done echo ' ' >> $@ echo >> $@ @@ -335,13 +343,13 @@ 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 configure: configure.ac aclocal.m4 - autoconf + autoconf || rm $@ # autoconf 2.69 has (what I think is) a bug. It will create configure even when failure is detected. config.h.in: configure.ac autoheader @@ -372,8 +380,7 @@ _debug: all -PO_FILES = po/ChangeLog \ -po/Rules-quot po/boldquot.sed \ +PO_FILES = po/Rules-quot po/boldquot.sed \ po/cat-id-tbl.c po/en@boldquot.header po/en@quot.header \ po/insert-header.sin po/quot.sed po/remove-potcdate.sin po/stamp-po \ po/Makevars.template po/pspp.pot @@ -393,7 +400,8 @@ clean: rm -f doc/stamp-vti rm -f config.h.in~ rm -f config.h.in - find . -name Makefile.in -exec rm -f {} \; + rm -f gl/Makefile.in + rm -f Makefile.in rm -f compile rm -f ltmain.sh rm -f reloc-ldflags install-reloc @@ -405,12 +413,13 @@ clean: # 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 $1 $3 +#svg2png=convert -background transparent $1 $3 -svg2png=gimp -i -b '(let* ((image (car (gimp-file-load 1 "$1" "$1")))) (gimp-image-attach-parasite image (list "gimp-comment" 0 "$(shell cat $2)")) (gimp-file-save 1 image (car (gimp-image-get-active-drawable image)) "$3" "$3")) (gimp-quit 1)' +src/ui/gui/icons/%.png: src/ui/gui/artwork/%.svg build-aux/svg2png src/ui/gui/icons/COPYING_CCBYSA3 + mkdir -p $(dir $@) + build-aux/svg2png "$<" "$(lastword $^)" "$@" -src/ui/gui/icons/%.png: src/ui/gui/artwork/%.svg src/ui/gui/icons/COPYING_CCBYSA3 +src/ui/gui/icons/%.svg: src/ui/gui/artwork/%.svg mkdir -p $(dir $@) - $(call svg2png,$<,$(lastword $^),$@) - + cp $< $@