X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=a8a28a6472c8540d985ade8fb1cd765af6c41ccc;hb=refs%2Fheads%2Fpxd;hp=e31c3cb565bcfc16f30de3e991d4699ff7cb2aed;hpb=56231bc7e8c2cda46a69d10362193556dd8cad41;p=pspp diff --git a/Smake b/Smake index e31c3cb565..a8a28a6472 100644 --- a/Smake +++ b/Smake @@ -19,7 +19,8 @@ GNULIB_MODULES = \ count-one-bits \ crc \ crypto/md4 \ - crypto/md5 \ + crypto/rijndael \ + crypto/sha1 \ dirname \ dtoastr \ environ \ @@ -33,6 +34,7 @@ GNULIB_MODULES = \ ftello \ fwriteerror \ getline \ + getpass \ gettext \ gettimeofday \ getopt-gnu \ @@ -75,10 +77,12 @@ GNULIB_MODULES = \ stpcpy \ strerror \ strftime \ + strsep \ strtod \ strtok_r \ sys_stat \ tempname \ + termios \ trunc \ unicase/u8-casecmp \ unicase/u8-casefold \ @@ -156,46 +160,76 @@ 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/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 \ @@ -270,39 +304,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) $@ @@ -337,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 @@ -407,14 +413,11 @@ 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=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)' - +#svg2png=convert -background transparent $1 $3 -src/ui/gui/icons/%.png: src/ui/gui/artwork/%.svg src/ui/gui/icons/COPYING_CCBYSA3 +src/ui/gui/icons/%.png: src/ui/gui/artwork/%.svg build-aux/svg2png src/ui/gui/icons/COPYING_CCBYSA3 mkdir -p $(dir $@) - $(call svg2png,$<,$(lastword $^),$@) + build-aux/svg2png "$<" "$(lastword $^)" "$@" src/ui/gui/icons/%.svg: src/ui/gui/artwork/%.svg