X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=176715bf4a94324abfe7788bbbd9f7d2fb7161f2;hb=b5249f4441110eaf24223166a5a6c9f7bf71faa7;hp=fd936cd1505477a87b1718205ca4b7e2bcbc8d31;hpb=e59bf0b7b753079089d6bc4b13798216b2cb6809;p=pspp

diff --git a/Smake b/Smake
index fd936cd150..176715bf4a 100644
--- a/Smake
+++ b/Smake
@@ -5,13 +5,14 @@ GNULIB = ../gnulib
 GNULIB_TOOL = $(GNULIB)/gnulib-tool
 
 GNULIB_MODULES = \
-	argp \
 	assert \
 	byteswap \
 	c-ctype \
 	c-strtod \
 	close \
+	configmake \
 	count-one-bits \
+	crc \
 	crypto/md4 \
 	dirname \
 	environ \
@@ -25,9 +26,7 @@ GNULIB_MODULES = \
         fseeko \
         ftello \
 	fwriteerror \
-	gethostname \
 	getline \
-	getlogin_r \
 	getopt \
 	gettext-h \
 	gettimeofday \
@@ -46,6 +45,7 @@ GNULIB_MODULES = \
 	mempcpy \
 	memset \
 	minmax \
+	mkdtemp \
 	mkstemp \
 	printf-posix \
 	printf-safe \
@@ -65,7 +65,6 @@ GNULIB_MODULES = \
 	strcspn \
 	strerror \
 	strftime \
-	strsep \
 	strtod \
 	strtok_r \
 	strtol \
@@ -81,6 +80,8 @@ GNULIB_MODULES = \
 	unistr/u8-strncat \
 	unlocked-io \
 	vasprintf-posix \
+	version-etc \
+	version-etc-fsf \
 	vfprintf-posix \
 	vprintf-posix \
 	vsnprintf \
@@ -101,11 +102,11 @@ all:
 	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=. --import $(GNULIB_MODULES)
+		--doc-base=gl/doc --aux-dir=build-aux --import \
+		$(GNULIB_MODULES)
 	echo '*' > gl/.cvsignore
 	echo '*' > gl/m4/.cvsignore
 	libtoolize --force --automake
-	autopoint --force
 	aclocal -I m4 -I gl/m4
 	autoconf
 	autoheader
@@ -139,7 +140,6 @@ po/Makevars.template po/pspp.pot
 
 clean:
 	rm -f config.sub config.guess config.rpath
-	rm -f ABOUT-NLS
 	rm -fr autom4te.cache
 	rm -f aclocal.m4
 	rm -f missing mkinstalldirs