pivot table procedure conceptually works

[pspp] / Smake

diff --git a/Smake b/Smake
index a148027f2a7669ce9cfd6125e8e3351e25abd8af..b27456bced1c709447c3f1efec04615c3c9e220b 100644 (file)
--- 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,6 +76,7 @@ GNULIB_MODULES = \
        stpcpy \
        strerror \
        strftime \
+       strsep \
        strtod \
        strtok_r \
        sys_stat \
@@ -368,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
@@ -438,14 +440,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=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 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