X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=d6ebd795bf78db820bd6ceffe2e5d2516ef95979;hb=25b9a7cc9bf681f7a6366ef03c08df82988d7e9d;hp=ad228ebaa255b8fbe85e9d116ce4734760a7cff0;hpb=d0b91eae59319ab2756d0d43b9cb15eb9cd3c234;p=pspp

diff --git a/Smake b/Smake
index ad228ebaa2..d6ebd795bf 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 \
@@ -24,9 +26,7 @@ GNULIB_MODULES = \
         fseeko \
         ftello \
 	fwriteerror \
-	gethostname \
 	getline \
-	getlogin_r \
 	getopt \
 	gettext-h \
 	gettimeofday \
@@ -45,6 +45,7 @@ GNULIB_MODULES = \
 	mempcpy \
 	memset \
 	minmax \
+	mkdtemp \
 	mkstemp \
 	printf-posix \
 	printf-safe \
@@ -64,7 +65,6 @@ GNULIB_MODULES = \
 	strcspn \
 	strerror \
 	strftime \
-	strsep \
 	strtod \
 	strtok_r \
 	strtol \
@@ -98,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
@@ -139,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