work on PRINT encoding

[pspp] / Smake

diff --git a/Smake b/Smake
index aaf1ff90da4cf66ba579a0082e8a6db0aa473de0..61235efd90c19a39113e1c85633fddb6befe1975 100644 (file)
--- a/Smake
+++ b/Smake
@@ -7,42 +7,58 @@ GNULIB_TOOL = $(GNULIB)/gnulib-tool
 GNULIB_MODULES = \
        assert \
        byteswap \
+       c-strcase \
+       c-strcasestr \
        c-ctype \
        c-strtod \
+       clean-temp \
+       close \
+       configmake \
+       count-one-bits \
+       crc \
        crypto/md4 \
+       crypto/md5 \
        dirname \
-       exit \
+       dtoastr \
+       environ \
+       fatal-signal \
+       fcntl \
        fpieee \
        fprintf-posix \
        full-read \
        full-write \
         fseeko \
+        ftello \
        fwriteerror \
-       gethostname \
        getline \
-       getlogin_r \
-       getopt \
-       gettext-h \
+       gettext \
        gettimeofday \
+        getopt-gnu \
+       gitlog-to-changelog \
+       include_next \
        isfinite \
+       isinf \
+       isnan \
        intprops \
        inttostr \
-       linebreak \
        localcharset \
         mbchar \
+        mbiter \
        memcasecmp \
        memchr \
-       memcmp \
-       memmem \
-       memmove \
        mempcpy \
-       memset \
+       memrchr \
        minmax \
+       mkdtemp \
        mkstemp \
        printf-posix \
        printf-safe \
        progname \
+       rawmemchr \
+       read-file \
+       regex \
        relocatable-prog \
+       rename \
        round \
        snprintf \
        snprintf-posix \
@@ -51,21 +67,34 @@ GNULIB_MODULES = \
        stdbool \
        stdint \
        stpcpy \
-       strcase \
-       strcspn \
        strerror \
        strftime \
-       strsep \
        strtod \
        strtok_r \
-       strtol \
-       strtoul \
        sys_stat \
-       tmpfile \
+       tempname \
        trunc \
+       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 \
+       version-etc-fsf \
        vfprintf-posix \
        vprintf-posix \
        vsnprintf \
@@ -74,40 +103,43 @@ GNULIB_MODULES = \
        xalloc \
        xalloc-die \
        xmalloca \
+       xmemdup0 \
        xsize \
        xstrndup \
        xvasprintf
 
-all: po/POTFILES.in
+all: prep_ph
+       $(MAKE) -f Smake Makefile.in configure
+
+.PHONY: prep_ph
+prep_ph: 
+       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 \
+       $(GNULIB_TOOL) --add-import --no-changelog --m4-base=gl/m4 \
                --source-base=gl --lib=libgl --tests-base=tests \
-               --doc-base=gl/doc --import $(GNULIB_MODULES)
-       echo '*' > gl/.cvsignore
-       echo '*' > gl/m4/.cvsignore
+               --doc-base=gl/doc --aux-dir=build-aux  \
+               --libtool $(GNULIB_MODULES)
        libtoolize --force --automake
-       autopoint --force
+
+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
        touch m4/Makefile.am
        gettextize --force --no-changelog
 
-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 -e `dirname $$f`/`basename $$f .c`.q ; then continue; fi; \
-               echo $$f ; \
-       done | sort | uniq > $@.tmp
-       if test ! -e $@ || ! cmp -s $@.tmp $@; then mv $@.tmp $@; fi
-       rm -f $@.tmp
-
 check: all
        rm -rf _check
        mkdir _check
@@ -123,15 +155,14 @@ _debug: all
        test -d _debug || mkdir _debug
        cd _debug && ../configure $(CONFIGUREFLAGS) --enable-debug
 
-PO_FILES = po/ChangeLog po/Makefile po/Makefile.in po/Makefile.in.in   \
-po/POTFILES po/POTFILES.in po/Rules-quot po/boldquot.sed               \
+PO_FILES = po/ChangeLog \
+po/Rules-quot po/boldquot.sed          \
 po/cat-id-tbl.c po/en@boldquot.header po/en@quot.header                        \
 po/insert-header.sin po/quot.sed po/remove-potcdate.sin po/stamp-po    \
 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
@@ -150,4 +181,4 @@ clean:
        rm -f ltmain.sh
        rm -f reloc-ldflags install-reloc
 
-.PHONY: all gettextize potfiles clean
+.PHONY: all gettextize clean