identifier: Rename token_type_to_string() and make a new version.
[pspp-builds.git] / Smake
diff --git a/Smake b/Smake
index 6e6b70235a2e7ef7d3c7af126642b8e2d398c10c..7efa2cfb1b022ae9afee853678e43e45f9cad669 100644 (file)
--- a/Smake
+++ b/Smake
@@ -15,7 +15,9 @@ GNULIB_MODULES = \
        count-one-bits \
        crc \
        crypto/md4 \
+       crypto/md5 \
        dirname \
+       dtoastr \
        environ \
        fatal-signal \
        fcntl \
@@ -68,12 +70,15 @@ GNULIB_MODULES = \
        sys_stat \
        tempname \
        trunc \
-       unilbrk/ulc-width-linebreaks \
        unistd \
+       unictype/property-id-continue \
+       unictype/property-id-start \
+       unigbrk/uc-is-grapheme-break \
        unistr/u8-cpy \
        unistr/u8-mbtouc \
        unistr/u8-strlen \
        unistr/u8-strncat \
+       uniwidth/u8-strwidth \
        unitypes \
        unlocked-io \
        vasprintf-posix \
@@ -96,10 +101,7 @@ 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 \
-               --libtool $(GNULIB_MODULES)
+       $(MAKE) -f Smake gnulib
        libtoolize --force --automake
        aclocal -I m4 -I gl/m4
        autoconf