Fix up build following dropping ulc-width-linebreaks module.

[pspp-builds.git] / Smake

diff --git a/Smake b/Smake
index 176715bf4a94324abfe7788bbbd9f7d2fb7161f2..a118607cb66498a13a2bfcd8fa9c1e8f2778f163 100644 (file)
--- a/Smake
+++ b/Smake
@@ -7,16 +7,19 @@ GNULIB_TOOL = $(GNULIB)/gnulib-tool
 GNULIB_MODULES = \
        assert \
        byteswap \
+       c-strcase \
        c-ctype \
        c-strtod \
+       clean-temp \
        close \
        configmake \
        count-one-bits \
        crc \
        crypto/md4 \
+       crypto/md5 \
        dirname \
+       dtoastr \
        environ \
-       exit \
        fatal-signal \
        fcntl \
        fpieee \
@@ -27,9 +30,9 @@ GNULIB_MODULES = \
         ftello \
        fwriteerror \
        getline \
-       getopt \
-       gettext-h \
+       gettext \
        gettimeofday \
+        getopt-gnu \
        gitlog-to-changelog \
        isfinite \
        isinf \
@@ -40,16 +43,15 @@ GNULIB_MODULES = \
         mbchar \
        memcasecmp \
        memchr \
-       memcmp \
-       memmove \
        mempcpy \
-       memset \
        minmax \
        mkdtemp \
        mkstemp \
        printf-posix \
        printf-safe \
        progname \
+       rawmemchr \
+       read-file \
        regex \
        relocatable-prog \
        rename \
@@ -62,7 +64,6 @@ GNULIB_MODULES = \
        stdint \
        stpcpy \
        strcase \
-       strcspn \
        strerror \
        strftime \
        strtod \
@@ -71,13 +72,23 @@ GNULIB_MODULES = \
        strtoul \
        sys_stat \
        tempname \
-       tmpfile \
        trunc \
-       unilbrk/ulc-width-linebreaks \
+       unictype/ctype-print \
+       unictype/property-id-continue \
+       unictype/property-id-start \
+       unigbrk/uc-is-grapheme-break \
        unistd \
+       unistr/u8-check \
        unistr/u8-cpy \
+       unistr/u8-mblen \
+       unistr/u8-mbtouc \
+       unistr/u8-mbtoucr \
        unistr/u8-strlen \
+       unistr/u8-strmbtouc \
        unistr/u8-strncat \
+       unistr/u8-uctomb \
+       uniwidth/u8-strwidth \
+       unitypes \
        unlocked-io \
        vasprintf-posix \
        version-etc \
@@ -98,20 +109,21 @@ GNULIB_MODULES = \
 all: 
        test -e ChangeLog || touch ChangeLog
        test -d m4 || mkdir m4
-       echo '*' > m4/.cvsignore
        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)
-       echo '*' > gl/.cvsignore
-       echo '*' > gl/m4/.cvsignore
+       $(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