X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=11ab6daf2d772ba3f39bcb4b91dcbecfca7e4dc6;hb=08ca1f72fd6e4d88c4f724452b9856d72173e7ef;hp=02d82f63be64d333b8d52c63a2ce1a0fdaa8dd79;hpb=122e78aa99219e121d4826c557152e164b202522;p=pspp

diff --git a/Smake b/Smake
index 02d82f63be..11ab6daf2d 100644
--- a/Smake
+++ b/Smake
@@ -27,16 +27,17 @@ GNULIB_MODULES = \
 	getopt \
 	gettext-h \
 	gettimeofday \
+	gitlog-to-changelog \
 	isfinite \
+	isinf \
+	isnan \
 	intprops \
 	inttostr \
-	linebreak \
 	localcharset \
         mbchar \
 	memcasecmp \
 	memchr \
 	memcmp \
-	memmem \
 	memmove \
 	mempcpy \
 	memset \
@@ -67,6 +68,7 @@ GNULIB_MODULES = \
 	tempname \
 	tmpfile \
 	trunc \
+	unilbrk/ulc-width-linebreaks \
 	unistd \
 	unlocked-io \
 	vasprintf-posix \
@@ -83,12 +85,13 @@ GNULIB_MODULES = \
 	xvasprintf
 
 all: po/POTFILES.in
+	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 --import $(GNULIB_MODULES)
+		--doc-base=gl/doc --aux-dir=. --import $(GNULIB_MODULES)
 	echo '*' > gl/.cvsignore
 	echo '*' > gl/m4/.cvsignore
 	libtoolize --force --automake