X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=Smake;h=2741599f57cadddc00983b39a636c22fb618a602;hb=985c40f2a83588b25f0e6fe7f7d82863c5d34d43;hp=6f0f7cc5251a5b974ff31cdcae673646625f225e;hpb=4de79b34b329d1da6cdeb145993d3efd911e2967;p=pspp-builds.git

diff --git a/Smake b/Smake
index 6f0f7cc5..2741599f 100644
--- a/Smake
+++ b/Smake
@@ -3,22 +3,46 @@
 GNULIB = ../gnulib
 GNULIB_TOOL = $(GNULIB)/gnulib-tool
 
+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
-	$(GNULIB_TOOL) --import
+	test -d m4 || mkdir m4
+	touch m4/Makefile.am
+	$(GNULIB_TOOL) --import --no-changelog --m4-base=gl/m4 \
+		--source-base=gl --lib=libgl --tests-base=tests \
+		--import $(GNULIB_MODULES)
 	autoreconf --install
 
 gettextize:
+	test -d m4 || mkdir m4
 	touch m4/Makefile.am
 	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
 	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)
+
 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			\
@@ -32,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