X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=8956a743a6569213b6c9308df99d1b844438f82a;hb=7eb25e65dbd7fbee132e3df6cfb743938cc578bc;hp=74202e999efb4e2302890cbc94c54bb017a8a8f3;hpb=ac0bf135a197ff174ef3ea5e12db8cf93ec6523c;p=pspp-builds.git

diff --git a/Smake b/Smake
index 74202e99..8956a743 100644
--- a/Smake
+++ b/Smake
@@ -11,6 +11,7 @@ GNULIB_MODULES = \
 	byteswap \
 	c-ctype \
 	c-strtod \
+	dirname \
 	exit \
 	full-read \
 	full-write \
@@ -18,11 +19,12 @@ GNULIB_MODULES = \
 	getline \
 	getlogin_r \
 	getopt \
-	gettext \
+	gettext-h \
 	intprops \
 	inttostr \
 	linebreak \
 	localcharset \
+        mbchar \
 	memcasecmp \
 	memchr \
 	memcmp \
@@ -30,10 +32,11 @@ GNULIB_MODULES = \
 	memmove \
 	mempcpy \
 	memset \
+	minmax \
+	mkstemp \
 	progname \
-	readlink \
+	relocatable-prog \
 	snprintf \
-	stat-macros \
 	stdarg \
 	stdbool \
 	stdint \
@@ -43,17 +46,17 @@ GNULIB_MODULES = \
 	strerror \
 	strftime \
 	strsep \
-	strstr \
 	strtod \
 	strtok_r \
 	strtol \
 	strtoul \
+	sys_stat \
+	tmpfile \
 	unistd \
 	unlocked-io \
 	vsnprintf \
 	xalloc \
 	xalloc-die \
-	xreadlink \
 	xsize \
 	xstrndup \
 	xvasprintf
@@ -67,8 +70,6 @@ all: po/POTFILES.in
 		--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
@@ -79,7 +80,7 @@ all: po/POTFILES.in
 gettextize:
 	test -d m4 || mkdir m4
 	touch m4/Makefile.am
-	gettextize -f -c --intl --no-changelog
+	gettextize --force --no-changelog
 
 po/POTFILES.in:
 	for f in `find src \( -name \*.[qc] -o -name \*.glade \) ! -name .\* -print` ; do \
@@ -126,6 +127,7 @@ clean:
 	rm -f mdate-sh texinfo.tex
 	rm -f doc/stamp-vti
 	rm -f config.h.in~
+	rm -f config.h.in
 	find . -name Makefile.in -exec rm -f {} \; 
 	rm -f compile
 	rm -f ltmain.sh