X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=14c2a75f28fc1a482eed7e6e7d1c2f5e2027d789;hb=75a467ed2d32e1adb0c24cf89676cfb48845be98;hp=b90bdbe829d252f9474b4771876d58caf4751515;hpb=e99991940478d76062c4ab8e44a5747354e33259;p=pspp-builds.git

diff --git a/Smake b/Smake
index b90bdbe8..14c2a75f 100644
--- a/Smake
+++ b/Smake
@@ -15,9 +15,10 @@ GNULIB_MODULES = \
 	count-one-bits \
 	crc \
 	crypto/md4 \
+	crypto/md5 \
 	dirname \
+	dtoastr \
 	environ \
-	exit \
 	fatal-signal \
 	fcntl \
 	fpieee \
@@ -28,9 +29,9 @@ GNULIB_MODULES = \
         ftello \
 	fwriteerror \
 	getline \
-	getopt \
 	gettext-h \
 	gettimeofday \
+        getopt-gnu \
 	gitlog-to-changelog \
 	isfinite \
 	isinf \
@@ -41,16 +42,14 @@ GNULIB_MODULES = \
         mbchar \
 	memcasecmp \
 	memchr \
-	memcmp \
-	memmove \
 	mempcpy \
-	memset \
 	minmax \
 	mkdtemp \
 	mkstemp \
 	printf-posix \
 	printf-safe \
 	progname \
+	read-file \
 	regex \
 	relocatable-prog \
 	rename \
@@ -63,7 +62,6 @@ GNULIB_MODULES = \
 	stdint \
 	stpcpy \
 	strcase \
-	strcspn \
 	strerror \
 	strftime \
 	strtod \
@@ -73,11 +71,17 @@ GNULIB_MODULES = \
 	sys_stat \
 	tempname \
 	trunc \
-	unilbrk/ulc-width-linebreaks \
+	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 \
 	version-etc \
@@ -99,16 +103,20 @@ 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 \
-		$(GNULIB_MODULES)
+	$(MAKE) -f Smake gnulib
 	libtoolize --force --automake
 	aclocal -I m4 -I gl/m4
 	autoconf
 	autoheader
 	automake --add-missing --copy --no-force
 
+gnulib:
+	$(GNULIB_TOOL) --add-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)
+
+
 gettextize:
 	test -d m4 || mkdir m4
 	touch m4/Makefile.am