X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=4c8d83bc3bdae38f08560b305bb7a754a1220f42;hb=9a331fe64eb814ae5c1322e21717a04fb254bf65;hp=aa05962fb63a502bbfaf5ebbc11bcd48fb1cf4b6;hpb=06a34a11908066ab5949d4b36c7fc5b7f44e88bb;p=pspp-builds.git

diff --git a/Smake b/Smake
index aa05962f..4c8d83bc 100644
--- a/Smake
+++ b/Smake
@@ -5,15 +5,18 @@ GNULIB = ../gnulib
 GNULIB_TOOL = $(GNULIB)/gnulib-tool
 
 GNULIB_MODULES = \
+	argp \
 	assert \
 	byteswap \
 	c-ctype \
 	c-strtod \
+	close \
 	crypto/md4 \
 	dirname \
 	environ \
 	exit \
 	fatal-signal \
+	fcntl \
 	fpieee \
 	fprintf-posix \
 	full-read \
@@ -27,7 +30,10 @@ GNULIB_MODULES = \
 	getopt \
 	gettext-h \
 	gettimeofday \
+	gitlog-to-changelog \
 	isfinite \
+	isinf \
+	isnan \
 	intprops \
 	inttostr \
 	localcharset \
@@ -43,6 +49,7 @@ GNULIB_MODULES = \
 	printf-posix \
 	printf-safe \
 	progname \
+	regex \
 	relocatable-prog \
 	round \
 	snprintf \
@@ -82,12 +89,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
@@ -105,6 +113,7 @@ gettextize:
 po/POTFILES.in:
 	for f in `find src \( -name \*.[qc] -o -name \*.glade \) ! -name .\* -print` ; do \
 		if test $$f = src/libpspp/version.c; then continue; fi;	  \
+		if test $$f = src/ui/gui/psppire-marshal.c; then continue; fi; \
 		if test -e `dirname $$f`/`basename $$f .c`.q ; then continue; fi; \
 		echo $$f ; \
 	done | sort | uniq > $@.tmp