replace_file_start: On error, ensure that the appropriate errno value is held

[pspp] / Smake

diff --git a/Smake b/Smake
index 5a312e616b2c6bb650c4a05e9a3baae68269a2cd..09f1c84e0a2c5bd9f7d8d1fbe04a397590793c5e 100644 (file)
--- a/Smake
+++ b/Smake
@@ -19,7 +19,6 @@ GNULIB_MODULES = \
        count-one-bits \
        crc \
        crypto/md4 \
-       crypto/md5 \
        crypto/rijndael \
        dirname \
        dtoastr \
@@ -77,6 +76,7 @@ GNULIB_MODULES = \
        stpcpy \
        strerror \
        strftime \
+       strsep \
        strtod \
        strtok_r \
        sys_stat \
@@ -303,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) $@
@@ -370,7 +342,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