fixed test to match recent patch

[pspp-builds.git] / Smake

diff --git a/Smake b/Smake
index aaeb8c0ba3b992b1336a3d27dda8f4f6c170fdff..74202e999efb4e2302890cbc94c54bb017a8a8f3 100644 (file)
--- a/Smake
+++ b/Smake
@@ -1,20 +1,80 @@
 # -*- makefile -*-
 
+# Adjust these to reflect where you've installed gnulib.
 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 \
+       byteswap \
+       c-ctype \
+       c-strtod \
+       exit \
+       full-read \
+       full-write \
+       gethostname \
+       getline \
+       getlogin_r \
+       getopt \
+       gettext \
+       intprops \
+       inttostr \
+       linebreak \
+       localcharset \
+       memcasecmp \
+       memchr \
+       memcmp \
+       memmem \
+       memmove \
+       mempcpy \
+       memset \
+       progname \
+       readlink \
+       snprintf \
+       stat-macros \
+       stdarg \
+       stdbool \
+       stdint \
+       stpcpy \
+       strcase \
+       strcspn \
+       strerror \
+       strftime \
+       strsep \
+       strstr \
+       strtod \
+       strtok_r \
+       strtol \
+       strtoul \
+       unistd \
+       unlocked-io \
+       vsnprintf \
+       xalloc \
+       xalloc-die \
+       xreadlink \
+       xsize \
+       xstrndup \
+       xvasprintf
 
 all: po/POTFILES.in
        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 --import $(GNULIB_MODULES)
-       autoreconf --install
+               --source-base=gl --lib=libgl --tests-base=tests \
+               --doc-base=gl/doc --import $(GNULIB_MODULES)
+       echo '*' > gl/.cvsignore
+       echo '*' > gl/m4/.cvsignore
+       test -d intl || mkdir intl
+       echo '*' > intl/.cvsignore
+       libtoolize --force --automake
+       autopoint --force
+       aclocal -I m4 -I gl/m4
+       autoconf
+       autoheader
+       automake --add-missing --copy --no-force
 
 gettextize:
        test -d m4 || mkdir m4
@@ -22,18 +82,34 @@ 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;              \
-               if test -e $$f.q; then echo $$f.q; else echo $$f.c; fi    \
+       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
+       cd _check && ../configure $(CONFIGUREFLAGS)
+       cd _check && make distcheck
+       rm -rf _check
+
+_build: all
+       test -d _build || mkdir _build
+       cd _build && ../configure $(CONFIGUREFLAGS)
+
+_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/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/Makevars.template po/pspp.pot
 
 clean:
        rm -f config.sub config.guess config.rpath
@@ -42,10 +118,16 @@ 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 $(PO_FILES) po/*.gmo 
+       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
+       rm -f ltmain.sh
 
 .PHONY: all gettextize potfiles clean