Smake: Remove ulc-width-linebreaks module.

[pspp-builds.git] / Smake

diff --git a/Smake b/Smake
index 014208b25b5241390e8c2a775659bceacfaab0fb..8c6669d0d1ad2335a8e3b5849823f2f29d8deae4 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,7 +70,6 @@ GNULIB_MODULES = \
        sys_stat \
        tempname \
        trunc \
-       unilbrk/ulc-width-linebreaks \
        unistd \
        unictype/property-id-continue \
        unictype/property-id-start \
@@ -76,6 +77,7 @@ GNULIB_MODULES = \
        unistr/u8-mbtouc \
        unistr/u8-strlen \
        unistr/u8-strncat \
+       uniwidth/u8-strwidth \
        unitypes \
        unlocked-io \
        vasprintf-posix \
@@ -98,10 +100,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