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

diff --git a/Smake b/Smake
index 763e9969..7efa2cfb 100644
--- a/Smake
+++ b/Smake
@@ -17,6 +17,7 @@ GNULIB_MODULES = \
 	crypto/md4 \
 	crypto/md5 \
 	dirname \
+	dtoastr \
 	environ \
 	fatal-signal \
 	fcntl \
@@ -69,14 +70,15 @@ GNULIB_MODULES = \
 	sys_stat \
 	tempname \
 	trunc \
-	unilbrk/ulc-width-linebreaks \
 	unistd \
 	unictype/property-id-continue \
 	unictype/property-id-start \
+	unigbrk/uc-is-grapheme-break \
 	unistr/u8-cpy \
 	unistr/u8-mbtouc \
 	unistr/u8-strlen \
 	unistr/u8-strncat \
+	uniwidth/u8-strwidth \
 	unitypes \
 	unlocked-io \
 	vasprintf-posix \
@@ -99,10 +101,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