Fixed reading of system files with non-ascii characters in variable names.

[pspp-builds.git] / Smake

diff --git a/Smake b/Smake
index 492fa79798375b1df7f4a93ac23ec5f1259e0119..2741599f57cadddc00983b39a636c22fb618a602 100644 (file)
--- a/Smake
+++ b/Smake
@@ -3,11 +3,12 @@
 GNULIB = ../gnulib
 GNULIB_TOOL = $(GNULIB)/gnulib-tool
 
-GNULIB_MODULES = alloca alloca-opt assert full-read full-write         \
-gethostname getline getlogin_r getopt gettext memchr memcmp memmem     \
-memmove memset progname readlink restrict snprintf stat-macros stdbool \
-stpcpy strcase strcspn strerror strftime strstr strtod strtok_r strtol \
-strtoul vsnprintf xalloc xalloc-die xreadlink
+GNULIB_MODULES = alloca alloca-opt assert c-ctype full-read full-write \
+gethostname getline getlogin_r getopt gettext intprops memcasecmp      \
+memchr memcmp memmem memmove memset progname readlink restrict         \
+snprintf stat-macros stdbool stpcpy strcase strcspn strerror strftime  \
+strstr strtod strtok_r strtol strtoul vsnprintf xalloc xalloc-die      \
+xreadlink xvasprintf
 
 all: po/POTFILES.in
        test -d m4 || mkdir m4
@@ -23,8 +24,9 @@ gettextize:
        gettextize -f -c --intl --no-changelog
 
 po/POTFILES.in:
-       for f in `find src -name \*.[qc] -print | sed 's/\.[qc]$$//'`; do \
-               if test $$f = src/version.c; then break; fi;              \
+       for f in `find src -name \*.[qc] ! -name .\* -print \
+                 | sed 's/\.[qc]$$//'`; do \
+               if test $$f = src/libpspp/version.c; then break; fi;              \
                if test -e $$f.q; then echo $$f.q; else echo $$f.c; fi    \
        done | sort | uniq > $@.tmp
        if test ! -e $@ || ! cmp -s $@.tmp $@; then mv $@.tmp $@; fi
@@ -37,6 +39,10 @@ check: all
        cd _check && make distcheck
        rm -rf _check
 
+_build: all
+       test -d _build || mkdir _build
+       cd _build && ../configure $(CONFIGUREFLAGS)
+
 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/cat-id-tbl.c po/en@boldquot.header po/en@quot.header                        \
@@ -50,10 +56,15 @@ clean:
        rm -f aclocal.m4
        rm -f missing mkinstalldirs
        rm -f install-sh
-       rm -f configure Makefile Makefile.in
+       rm -f configure Makefile 
        rm -f depcomp
-       rm -fr intl gl
+       rm -rf intl gl
        rm -f m4/*.m4
        rm -f $(PO_FILES)
+       rm -f mdate-sh texinfo.tex
+       rm -f doc/stamp-vti
+       rm -f config.h.in~
+       find . -name Makefile.in -exec rm -f {} \; 
+       rm -f compile
 
 .PHONY: all gettextize potfiles clean