Handle multiple postcomputes.

[pspp] / Smake

diff --git a/Smake b/Smake
index 3cf37f5df12a5e59bf5631a07c22b60b113c9dc0..72c1d34f0b5a6cbc14e6875325fba62c25e68611 100644 (file)
--- a/Smake
+++ b/Smake
@@ -136,6 +136,7 @@ GNULIB_MODULES = \
        unitypes \
        unlocked-io \
        vasprintf-posix \
+       verify \
        version-etc \
        version-etc-fsf \
        vfprintf-posix \
@@ -153,11 +154,11 @@ GNULIB_MODULES = \
        xvasprintf
 
 APP_ICONS = \
-src/ui/gui/icons/16x16/apps/pspp.png \
-src/ui/gui/icons/32x32/apps/pspp.png \
-src/ui/gui/icons/48x48/apps/pspp.png \
-src/ui/gui/icons/256x256/apps/pspp.png \
-src/ui/gui/icons/scalable/apps/pspp.svg
+src/ui/gui/icons/16x16/apps/org.gnu.pspp.png \
+src/ui/gui/icons/32x32/apps/org.gnu.pspp.png \
+src/ui/gui/icons/48x48/apps/org.gnu.pspp.png \
+src/ui/gui/icons/256x256/apps/org.gnu.pspp.png \
+src/ui/gui/icons/scalable/apps/org.gnu.pspp.svg
 
 CATEGORY_ICONS = \
 src/ui/gui/icons/48x48/categories/align-left.png \
@@ -315,11 +316,11 @@ src/ui/gui/icons/manifest: $(MAKEFILE_LIST)
        echo >> $@
 
 
-src/ui/gui/resources.xml: $(ICONS)
+src/ui/gui/resources.xml: $(MAKEFILE_LIST)
        printf '<?xml version="1.0" encoding="UTF-8"?>\n' > $@
        printf '<gresources>\n' >> $@
-       printf ' <gresource prefix="gnu/pspp">\n' >> $@
-       for x in $^; do \
+       printf ' <gresource prefix="org/gnu/pspp">\n' >> $@
+       for x in $(ICONS); do \
          z=`echo "$$x" | sed -e 's%src/ui/gui/%%'` ; \
          printf "  <file>$$z</file>\n" >> $@ ; \
        done
@@ -335,7 +336,8 @@ prep_ph:
        touch build-aux/config.rpath
        $(GNULIB_TOOL) --add-import --no-changelog --m4-base=gl/m4 \
                --source-base=gl --lib=libgl --tests-base=tests \
-               --doc-base=gl/doc --aux-dir=build-aux  \
+               --doc-base=gl/doc --aux-dir=build-aux \
+               --makefile-name=automake.mk --automake-subdir \
                --libtool $(GNULIB_MODULES)
        if (glibtoolize --version) >/dev/null 2>&1; then        \
                LIBTOOLIZE=glibtoolize;                         \
@@ -403,6 +405,7 @@ clean: clean-icons
        rm -f config.h.in~
        rm -f config.h.in
        rm -f gl/Makefile.in
+       rm -f gl/automake.mk
        rm -f Makefile.in
        rm -f build-aux/compile
        rm -f build-aux/ltmain.sh