X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=5362c276d723d4c1e41edda08b32fa308d8d0835;hb=131ca96f8e1b8675e80b37ad6cedca1b21b87e87;hp=ad228ebaa255b8fbe85e9d116ce4734760a7cff0;hpb=f51ecb48027e6b1eb46840ae25888a25b429f012;p=pspp

diff --git a/Smake b/Smake
index ad228ebaa2..5362c276d7 100644
--- a/Smake
+++ b/Smake
@@ -9,12 +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 \
@@ -24,12 +26,10 @@ GNULIB_MODULES = \
         fseeko \
         ftello \
 	fwriteerror \
-	gethostname \
 	getline \
-	getlogin_r \
-	getopt \
 	gettext-h \
 	gettimeofday \
+        getopt-gnu \
 	gitlog-to-changelog \
 	isfinite \
 	isinf \
@@ -40,11 +40,9 @@ GNULIB_MODULES = \
         mbchar \
 	memcasecmp \
 	memchr \
-	memcmp \
-	memmove \
 	mempcpy \
-	memset \
 	minmax \
+	mkdtemp \
 	mkstemp \
 	printf-posix \
 	printf-safe \
@@ -61,17 +59,14 @@ GNULIB_MODULES = \
 	stdint \
 	stpcpy \
 	strcase \
-	strcspn \
 	strerror \
 	strftime \
-	strsep \
 	strtod \
 	strtok_r \
 	strtol \
 	strtoul \
 	sys_stat \
 	tempname \
-	tmpfile \
 	trunc \
 	unilbrk/ulc-width-linebreaks \
 	unistd \
@@ -98,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
@@ -139,7 +132,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