work on PRINT encoding

[pspp] / Smake

diff --git a/Smake b/Smake
index a118607cb66498a13a2bfcd8fa9c1e8f2778f163..61235efd90c19a39113e1c85633fddb6befe1975 100644 (file)
--- a/Smake
+++ b/Smake
@@ -8,6 +8,7 @@ GNULIB_MODULES = \
        assert \
        byteswap \
        c-strcase \
+       c-strcasestr \
        c-ctype \
        c-strtod \
        clean-temp \
@@ -34,6 +35,7 @@ GNULIB_MODULES = \
        gettimeofday \
         getopt-gnu \
        gitlog-to-changelog \
+       include_next \
        isfinite \
        isinf \
        isnan \
@@ -41,9 +43,11 @@ GNULIB_MODULES = \
        inttostr \
        localcharset \
         mbchar \
+        mbiter \
        memcasecmp \
        memchr \
        mempcpy \
+       memrchr \
        minmax \
        mkdtemp \
        mkstemp \
@@ -63,13 +67,10 @@ GNULIB_MODULES = \
        stdbool \
        stdint \
        stpcpy \
-       strcase \
        strerror \
        strftime \
        strtod \
        strtok_r \
-       strtol \
-       strtoul \
        sys_stat \
        tempname \
        trunc \
@@ -77,6 +78,7 @@ GNULIB_MODULES = \
        unictype/property-id-continue \
        unictype/property-id-start \
        unigbrk/uc-is-grapheme-break \
+       unilbrk/u8-possible-linebreaks \
        unistd \
        unistr/u8-check \
        unistr/u8-cpy \
@@ -106,22 +108,31 @@ 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
-       $(MAKE) -f Smake 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  \
+               --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
 
-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)
+Makefile.in: Makefile.am config.h.in aclocal.m4
+       automake --add-missing --copy --no-force --include-deps
 
 
 gettextize: