docs

[pspp] / Smake

diff --git a/Smake b/Smake
index caae02fd97718c881cd5bf6ef95f978b707a3fe7..3e63d869a7aaa07048cae896ae4065a0c26f7f3e 100644 (file)
--- a/Smake
+++ b/Smake
@@ -43,9 +43,11 @@ GNULIB_MODULES = \
        crypto/rijndael \
        dirname \
        dtoastr \
+       dtotimespec \
        environ \
        fatal-signal \
        fcntl \
+       fnmatch \
        fpieee \
        fprintf-posix \
        full-read \
@@ -56,9 +58,12 @@ GNULIB_MODULES = \
        getline \
        getpass \
        gettext-h \
+       gettime \
        gettimeofday \
         getopt-gnu \
        gitlog-to-changelog \
+       havelib \
+       iconv \
        include_next \
        isfinite \
        isinf \
@@ -105,6 +110,9 @@ GNULIB_MODULES = \
        sys_stat \
        tempname \
        termios \
+       timespec \
+       timespec-add \
+       timespec-sub \
        trunc \
        unicase/u8-casecmp \
        unicase/u8-casefold \
@@ -130,6 +138,7 @@ GNULIB_MODULES = \
        unitypes \
        unlocked-io \
        vasprintf-posix \
+       verify \
        version-etc \
        version-etc-fsf \
        vfprintf-posix \
@@ -147,11 +156,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.fsf.pspp.png \
+src/ui/gui/icons/32x32/apps/org.fsf.pspp.png \
+src/ui/gui/icons/48x48/apps/org.fsf.pspp.png \
+src/ui/gui/icons/256x256/apps/org.fsf.pspp.png \
+src/ui/gui/icons/scalable/apps/org.fsf.pspp.svg
 
 CATEGORY_ICONS = \
 src/ui/gui/icons/48x48/categories/align-left.png \
@@ -288,6 +297,9 @@ everything: prep_ph  icons
        $(MAKE) -f Smake Makefile.in configure
 
 icons: $(ICONS)
+clean-icons:
+       rm -f $(ICONS)
+.PHONY: icons clean-icons
 
 src/ui/gui/icons/manifest: $(MAKEFILE_LIST)
        $(RM) $@
@@ -326,7 +338,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;                         \
@@ -378,7 +391,7 @@ 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
 
-clean:
+clean: clean-icons
        rm -f config.sub config.guess config.rpath
        rm -fr autom4te.cache
        rm -f aclocal.m4
@@ -394,6 +407,7 @@ clean:
        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