Use default encoding when reading system files if no encoding is given in file.

[pspp-builds.git] / Smake

diff --git a/Smake b/Smake
index aaf1ff90da4cf66ba579a0082e8a6db0aa473de0..78789d4fed818420b8567a8508ed155dc5fde5b9 100644 (file)
--- a/Smake
+++ b/Smake
@@ -5,18 +5,25 @@ GNULIB = ../gnulib
 GNULIB_TOOL = $(GNULIB)/gnulib-tool
 
 GNULIB_MODULES = \
+       argp \
        assert \
        byteswap \
        c-ctype \
        c-strtod \
+       close \
+       count-one-bits \
        crypto/md4 \
        dirname \
+       environ \
        exit \
+       fatal-signal \
+       fcntl \
        fpieee \
        fprintf-posix \
        full-read \
        full-write \
         fseeko \
+        ftello \
        fwriteerror \
        gethostname \
        getline \
@@ -24,16 +31,17 @@ GNULIB_MODULES = \
        getopt \
        gettext-h \
        gettimeofday \
+       gitlog-to-changelog \
        isfinite \
+       isinf \
+       isnan \
        intprops \
        inttostr \
-       linebreak \
        localcharset \
         mbchar \
        memcasecmp \
        memchr \
        memcmp \
-       memmem \
        memmove \
        mempcpy \
        memset \
@@ -42,7 +50,9 @@ GNULIB_MODULES = \
        printf-posix \
        printf-safe \
        progname \
+       regex \
        relocatable-prog \
+       rename \
        round \
        snprintf \
        snprintf-posix \
@@ -61,8 +71,10 @@ GNULIB_MODULES = \
        strtol \
        strtoul \
        sys_stat \
+       tempname \
        tmpfile \
        trunc \
+       unilbrk/ulc-width-linebreaks \
        unistd \
        unlocked-io \
        vasprintf-posix \
@@ -74,17 +86,19 @@ GNULIB_MODULES = \
        xalloc \
        xalloc-die \
        xmalloca \
+       xmemdup0 \
        xsize \
        xstrndup \
        xvasprintf
 
 all: po/POTFILES.in
+       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 --import $(GNULIB_MODULES)
+               --doc-base=gl/doc --aux-dir=. --import $(GNULIB_MODULES)
        echo '*' > gl/.cvsignore
        echo '*' > gl/m4/.cvsignore
        libtoolize --force --automake
@@ -102,6 +116,7 @@ gettextize:
 po/POTFILES.in:
        for f in `find src \( -name \*.[qc] -o -name \*.glade \) ! -name .\* -print` ; do \
                if test $$f = src/libpspp/version.c; then continue; fi;   \
+               if test $$f = src/ui/gui/psppire-marshal.c; then continue; fi; \
                if test -e `dirname $$f`/`basename $$f .c`.q ; then continue; fi; \
                echo $$f ; \
        done | sort | uniq > $@.tmp