X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=683a8e382871f190c1a824d66f263a7a65a602c1;hb=afdf3096926b561f4e6511c10fcf73fc6796b9d2;hp=014208b25b5241390e8c2a775659bceacfaab0fb;hpb=325168fb62e51d5154e932abec91ba40dd081f3f;p=pspp-builds.git

diff --git a/Smake b/Smake
index 014208b2..683a8e38 100644
--- a/Smake
+++ b/Smake
@@ -15,7 +15,9 @@ GNULIB_MODULES = \
 	count-one-bits \
 	crc \
 	crypto/md4 \
+	crypto/md5 \
 	dirname \
+	dtoastr \
 	environ \
 	fatal-signal \
 	fcntl \
@@ -47,6 +49,7 @@ GNULIB_MODULES = \
 	printf-posix \
 	printf-safe \
 	progname \
+	read-file \
 	regex \
 	relocatable-prog \
 	rename \
@@ -68,14 +71,17 @@ 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-mbtouc \
 	unistr/u8-strlen \
 	unistr/u8-strncat \
+	uniwidth/u8-strwidth \
 	unitypes \
 	unlocked-io \
 	vasprintf-posix \
@@ -98,10 +104,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