X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=5362c276d723d4c1e41edda08b32fa308d8d0835;hb=4e8efdc4acb80fc1a3735228d29fca0cf86fee6d;hp=7ee5585c5e009d48b6d98cd391e9c2c0c96f53c6;hpb=28e36cf42e55d270c8304c79f8845bf5f8e54516;p=pspp

diff --git a/Smake b/Smake
index 7ee5585c5e..5362c276d7 100644
--- a/Smake
+++ b/Smake
@@ -9,13 +9,14 @@ GNULIB_MODULES = \
 	byteswap \
 	c-ctype \
 	c-strtod \
+	clean-temp \
 	close \
+	configmake \
 	count-one-bits \
 	crc \
 	crypto/md4 \
 	dirname \
 	environ \
-	exit \
 	fatal-signal \
 	fcntl \
 	fpieee \
@@ -26,9 +27,9 @@ GNULIB_MODULES = \
         ftello \
 	fwriteerror \
 	getline \
-	getopt \
 	gettext-h \
 	gettimeofday \
+        getopt-gnu \
 	gitlog-to-changelog \
 	isfinite \
 	isinf \
@@ -39,10 +40,7 @@ GNULIB_MODULES = \
         mbchar \
 	memcasecmp \
 	memchr \
-	memcmp \
-	memmove \
 	mempcpy \
-	memset \
 	minmax \
 	mkdtemp \
 	mkstemp \
@@ -61,7 +59,6 @@ GNULIB_MODULES = \
 	stdint \
 	stpcpy \
 	strcase \
-	strcspn \
 	strerror \
 	strftime \
 	strtod \
@@ -70,7 +67,6 @@ GNULIB_MODULES = \
 	strtoul \
 	sys_stat \
 	tempname \
-	tmpfile \
 	trunc \
 	unilbrk/ulc-width-linebreaks \
 	unistd \
@@ -97,13 +93,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