DESCRIPTIVES: Eliminate main restriction on Z-score variable name length.

[pspp-builds.git] / Smake

diff --git a/Smake b/Smake
index ad228ebaa255b8fbe85e9d116ce4734760a7cff0..5e05933dfafd9a4d85f1439d64d72d0cfa30179d 100644 (file)
--- a/Smake
+++ b/Smake
@@ -9,12 +9,15 @@ GNULIB_MODULES = \
        byteswap \
        c-ctype \
        c-strtod \
+       clean-temp \
        close \
+       configmake \
        count-one-bits \
+       crc \
        crypto/md4 \
+       crypto/md5 \
        dirname \
        environ \
-       exit \
        fatal-signal \
        fcntl \
        fpieee \
@@ -24,12 +27,10 @@ GNULIB_MODULES = \
         fseeko \
         ftello \
        fwriteerror \
-       gethostname \
        getline \
-       getlogin_r \
-       getopt \
        gettext-h \
        gettimeofday \
+        getopt-gnu \
        gitlog-to-changelog \
        isfinite \
        isinf \
@@ -40,11 +41,9 @@ GNULIB_MODULES = \
         mbchar \
        memcasecmp \
        memchr \
-       memcmp \
-       memmove \
        mempcpy \
-       memset \
        minmax \
+       mkdtemp \
        mkstemp \
        printf-posix \
        printf-safe \
@@ -61,23 +60,24 @@ GNULIB_MODULES = \
        stdint \
        stpcpy \
        strcase \
-       strcspn \
        strerror \
        strftime \
-       strsep \
        strtod \
        strtok_r \
        strtol \
        strtoul \
        sys_stat \
        tempname \
-       tmpfile \
        trunc \
        unilbrk/ulc-width-linebreaks \
        unistd \
+       unictype/property-id-continue \
+       unictype/property-id-start \
        unistr/u8-cpy \
+       unistr/u8-mbtouc \
        unistr/u8-strlen \
        unistr/u8-strncat \
+       unitypes \
        unlocked-io \
        vasprintf-posix \
        version-etc \
@@ -98,19 +98,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=. --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
@@ -139,7 +141,6 @@ po/Makevars.template po/pspp.pot
 
 clean:
        rm -f config.sub config.guess config.rpath
-       rm -f ABOUT-NLS
        rm -fr autom4te.cache
        rm -f aclocal.m4
        rm -f missing mkinstalldirs