X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=014208b25b5241390e8c2a775659bceacfaab0fb;hb=95b6394d56fe347634a207f2e65a3ef9cfe05ca8;hp=b90bdbe829d252f9474b4771876d58caf4751515;hpb=e99991940478d76062c4ab8e44a5747354e33259;p=pspp-builds.git

diff --git a/Smake b/Smake
index b90bdbe8..014208b2 100644
--- a/Smake
+++ b/Smake
@@ -17,7 +17,6 @@ GNULIB_MODULES = \
 	crypto/md4 \
 	dirname \
 	environ \
-	exit \
 	fatal-signal \
 	fcntl \
 	fpieee \
@@ -28,9 +27,9 @@ GNULIB_MODULES = \
         ftello \
 	fwriteerror \
 	getline \
-	getopt \
 	gettext-h \
 	gettimeofday \
+        getopt-gnu \
 	gitlog-to-changelog \
 	isfinite \
 	isinf \
@@ -41,10 +40,7 @@ GNULIB_MODULES = \
         mbchar \
 	memcasecmp \
 	memchr \
-	memcmp \
-	memmove \
 	mempcpy \
-	memset \
 	minmax \
 	mkdtemp \
 	mkstemp \
@@ -63,7 +59,6 @@ GNULIB_MODULES = \
 	stdint \
 	stpcpy \
 	strcase \
-	strcspn \
 	strerror \
 	strftime \
 	strtod \
@@ -75,9 +70,13 @@ GNULIB_MODULES = \
 	trunc \
 	unilbrk/ulc-width-linebreaks \
 	unistd \
+	unictype/property-id-continue \
+	unictype/property-id-start \
 	unistr/u8-cpy \
+	unistr/u8-mbtouc \
 	unistr/u8-strlen \
 	unistr/u8-strncat \
+	unitypes \
 	unlocked-io \
 	vasprintf-posix \
 	version-etc \
@@ -102,13 +101,20 @@ all:
 	$(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)
+		--libtool $(GNULIB_MODULES)
 	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