work on PRINT encoding

[pspp] / Smake

diff --git a/Smake b/Smake
index b90bdbe829d252f9474b4771876d58caf4751515..61235efd90c19a39113e1c85633fddb6befe1975 100644 (file)
--- a/Smake
+++ b/Smake
@@ -7,6 +7,8 @@ GNULIB_TOOL = $(GNULIB)/gnulib-tool
 GNULIB_MODULES = \
        assert \
        byteswap \
+       c-strcase \
+       c-strcasestr \
        c-ctype \
        c-strtod \
        clean-temp \
@@ -15,9 +17,10 @@ GNULIB_MODULES = \
        count-one-bits \
        crc \
        crypto/md4 \
+       crypto/md5 \
        dirname \
+       dtoastr \
        environ \
-       exit \
        fatal-signal \
        fcntl \
        fpieee \
@@ -28,10 +31,11 @@ GNULIB_MODULES = \
         ftello \
        fwriteerror \
        getline \
-       getopt \
-       gettext-h \
+       gettext \
        gettimeofday \
+        getopt-gnu \
        gitlog-to-changelog \
+       include_next \
        isfinite \
        isinf \
        isnan \
@@ -39,18 +43,19 @@ GNULIB_MODULES = \
        inttostr \
        localcharset \
         mbchar \
+        mbiter \
        memcasecmp \
        memchr \
-       memcmp \
-       memmove \
        mempcpy \
-       memset \
+       memrchr \
        minmax \
        mkdtemp \
        mkstemp \
        printf-posix \
        printf-safe \
        progname \
+       rawmemchr \
+       read-file \
        regex \
        relocatable-prog \
        rename \
@@ -62,22 +67,30 @@ GNULIB_MODULES = \
        stdbool \
        stdint \
        stpcpy \
-       strcase \
-       strcspn \
        strerror \
        strftime \
        strtod \
        strtok_r \
-       strtol \
-       strtoul \
        sys_stat \
        tempname \
        trunc \
-       unilbrk/ulc-width-linebreaks \
+       unictype/ctype-print \
+       unictype/property-id-continue \
+       unictype/property-id-start \
+       unigbrk/uc-is-grapheme-break \
+       unilbrk/u8-possible-linebreaks \
        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 \
@@ -95,19 +108,32 @@ GNULIB_MODULES = \
        xstrndup \
        xvasprintf
 
-all: 
+all: prep_ph
+       $(MAKE) -f Smake Makefile.in configure
+
+.PHONY: prep_ph
+prep_ph: 
        test -e ChangeLog || touch ChangeLog
        test -d m4 || mkdir m4
        touch m4/Makefile.am
-       $(GNULIB_TOOL) --import --no-changelog --m4-base=gl/m4 \
+       $(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 \
-               $(GNULIB_MODULES)
+               --doc-base=gl/doc --aux-dir=build-aux  \
+               --libtool $(GNULIB_MODULES)
        libtoolize --force --automake
+
+aclocal.m4:
        aclocal -I m4 -I gl/m4
+
+configure: configure.ac aclocal.m4
        autoconf
+
+config.h.in: configure.ac
        autoheader
-       automake --add-missing --copy --no-force
+
+Makefile.in: Makefile.am config.h.in aclocal.m4
+       automake --add-missing --copy --no-force --include-deps
+
 
 gettextize:
        test -d m4 || mkdir m4