X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=176715bf4a94324abfe7788bbbd9f7d2fb7161f2;hb=6c75618f950e1c68790ff3193ca9ae97edb4a3c9;hp=d70093247eb150a4b9bd95e79f5c487b043c90f3;hpb=7acb13b811a5c727ef7421e6f44cb5ddcad0df23;p=pspp

diff --git a/Smake b/Smake
index d70093247e..176715bf4a 100644
--- a/Smake
+++ b/Smake
@@ -10,7 +10,9 @@ GNULIB_MODULES = \
 	c-ctype \
 	c-strtod \
 	close \
+	configmake \
 	count-one-bits \
+	crc \
 	crypto/md4 \
 	dirname \
 	environ \
@@ -43,6 +45,7 @@ GNULIB_MODULES = \
 	mempcpy \
 	memset \
 	minmax \
+	mkdtemp \
 	mkstemp \
 	printf-posix \
 	printf-safe \
@@ -99,7 +102,8 @@ 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
@@ -136,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