Use new Gnulib function dtoastr() to format short, accurate real numbers.

[pspp-builds.git] / Smake

diff --git a/Smake b/Smake
index b90bdbe829d252f9474b4771876d58caf4751515..6d54f5b730ca0f212c67f670f7407b98ebeec728 100644 (file)
--- a/Smake
+++ b/Smake
@@ -15,9 +15,10 @@ GNULIB_MODULES = \
        count-one-bits \
        crc \
        crypto/md4 \
+       crypto/md5 \
        dirname \
+       dtoastr \
        environ \
-       exit \
        fatal-signal \
        fcntl \
        fpieee \
@@ -28,9 +29,9 @@ GNULIB_MODULES = \
         ftello \
        fwriteerror \
        getline \
-       getopt \
        gettext-h \
        gettimeofday \
+        getopt-gnu \
        gitlog-to-changelog \
        isfinite \
        isinf \
@@ -41,10 +42,7 @@ GNULIB_MODULES = \
         mbchar \
        memcasecmp \
        memchr \
-       memcmp \
-       memmove \
        mempcpy \
-       memset \
        minmax \
        mkdtemp \
        mkstemp \
@@ -63,7 +61,6 @@ GNULIB_MODULES = \
        stdint \
        stpcpy \
        strcase \
-       strcspn \
        strerror \
        strftime \
        strtod \
@@ -75,9 +72,13 @@ GNULIB_MODULES = \
        trunc \
        unilbrk/ulc-width-linebreaks \
        unistd \
+       unictype/property-id-continue \
+       unictype/property-id-start \
        unistr/u8-cpy \
+       unistr/u8-mbtouc \
        unistr/u8-strlen \
        unistr/u8-strncat \
+       unitypes \
        unlocked-io \
        vasprintf-posix \
        version-etc \
@@ -99,16 +100,20 @@ all:
        test -e ChangeLog || touch ChangeLog
        test -d m4 || mkdir m4
        touch m4/Makefile.am
-       $(GNULIB_TOOL) --import --no-changelog --m4-base=gl/m4 \
-               --source-base=gl --lib=libgl --tests-base=tests \
-               --doc-base=gl/doc --aux-dir=build-aux --import \
-               $(GNULIB_MODULES)
+       $(MAKE) -f Smake gnulib
        libtoolize --force --automake
        aclocal -I m4 -I gl/m4
        autoconf
        autoheader
        automake --add-missing --copy --no-force
 
+gnulib:
+       $(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 --import \
+               --libtool $(GNULIB_MODULES)
+
+
 gettextize:
        test -d m4 || mkdir m4
        touch m4/Makefile.am