X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=d6ebd795bf78db820bd6ceffe2e5d2516ef95979;hb=9bbff915873cc3f79236ade4f6ed4bde82af09c3;hp=e8ffdd5705b2802df79ef79b6ccf90b075a521c0;hpb=bd17d2af982332ee1791998361b1ac6731fe14fa;p=pspp

diff --git a/Smake b/Smake
index e8ffdd5705..d6ebd795bf 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 \
@@ -97,13 +98,11 @@ GNULIB_MODULES = \
 all: 
 	test -e ChangeLog || touch ChangeLog
 	test -d m4 || mkdir m4
-	echo '*' > m4/.cvsignore
 	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)
-	echo '*' > gl/.cvsignore
-	echo '*' > gl/m4/.cvsignore
+		--doc-base=gl/doc --aux-dir=build-aux --import \
+		$(GNULIB_MODULES)
 	libtoolize --force --automake
 	aclocal -I m4 -I gl/m4
 	autoconf
@@ -138,7 +137,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