X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=a118607cb66498a13a2bfcd8fa9c1e8f2778f163;hb=b54a5702b6200871c8278a55d37a87e924f04eb1;hp=7855ce1e9826e92c66de497f0b3d4b72edadcbb6;hpb=944f383430e291f13aa73ab48ea736c96b944ef7;p=pspp

diff --git a/Smake b/Smake
index 7855ce1e98..a118607cb6 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 \
@@ -15,7 +16,9 @@ GNULIB_MODULES = \
 	count-one-bits \
 	crc \
 	crypto/md4 \
+	crypto/md5 \
 	dirname \
+	dtoastr \
 	environ \
 	fatal-signal \
 	fcntl \
@@ -27,7 +30,7 @@ GNULIB_MODULES = \
         ftello \
 	fwriteerror \
 	getline \
-	gettext-h \
+	gettext \
 	gettimeofday \
         getopt-gnu \
 	gitlog-to-changelog \
@@ -47,6 +50,8 @@ GNULIB_MODULES = \
 	printf-posix \
 	printf-safe \
 	progname \
+	rawmemchr \
+	read-file \
 	regex \
 	relocatable-prog \
 	rename \
@@ -68,11 +73,22 @@ GNULIB_MODULES = \
 	sys_stat \
 	tempname \
 	trunc \
-	unilbrk/ulc-width-linebreaks \
+	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 \
 	version-etc \
@@ -94,10 +110,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