X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=0ba1c254d55bf2af93bd6caaa0a6eac3ba73b779;hb=03bfb72314e434ddaa2ff2b770d1d9df2ea1927a;hp=763e996979d8c9705a680ac7e5a05733260a2fd2;hpb=c58173ea116eed59ce96a4b233f2d2d8ceb50b26;p=pspp-builds.git

diff --git a/Smake b/Smake
index 763e9969..0ba1c254 100644
--- a/Smake
+++ b/Smake
@@ -7,6 +7,7 @@ GNULIB_TOOL = $(GNULIB)/gnulib-tool
 GNULIB_MODULES = \
 	assert \
 	byteswap \
+	c-strcase \
 	c-ctype \
 	c-strtod \
 	clean-temp \
@@ -17,6 +18,7 @@ GNULIB_MODULES = \
 	crypto/md4 \
 	crypto/md5 \
 	dirname \
+	dtoastr \
 	environ \
 	fatal-signal \
 	fcntl \
@@ -28,7 +30,7 @@ GNULIB_MODULES = \
         ftello \
 	fwriteerror \
 	getline \
-	gettext-h \
+	gettext \
 	gettimeofday \
         getopt-gnu \
 	gitlog-to-changelog \
@@ -42,12 +44,15 @@ GNULIB_MODULES = \
 	memcasecmp \
 	memchr \
 	mempcpy \
+	memrchr \
 	minmax \
 	mkdtemp \
 	mkstemp \
 	printf-posix \
 	printf-safe \
 	progname \
+	rawmemchr \
+	read-file \
 	regex \
 	relocatable-prog \
 	rename \
@@ -69,14 +74,21 @@ GNULIB_MODULES = \
 	sys_stat \
 	tempname \
 	trunc \
-	unilbrk/ulc-width-linebreaks \
-	unistd \
+	unictype/ctype-print \
 	unictype/property-id-continue \
 	unictype/property-id-start \
+	unigbrk/uc-is-grapheme-break \
+	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 \
@@ -99,10 +111,7 @@ all:
 	test -e ChangeLog || touch ChangeLog
 	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 \
-		--doc-base=gl/doc --aux-dir=build-aux --import \
-		--libtool $(GNULIB_MODULES)
+	$(MAKE) -f Smake gnulib
 	libtoolize --force --automake
 	aclocal -I m4 -I gl/m4
 	autoconf