X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=a13ce6b5bb36e3ec60105a29611a6602e06c1652;hb=945fd370f9fb880b310fb88f868ad47c2ae84533;hp=49a72f32ba21c8878bb94f83fbb30831e9e291f1;hpb=352d48a9cf76667dd4824326c7151df70e90d7a1;p=pspp-builds.git

diff --git a/Smake b/Smake
index 49a72f32..a13ce6b5 100644
--- a/Smake
+++ b/Smake
@@ -10,6 +10,7 @@ GNULIB_MODULES = \
 	assert \
 	c-ctype \
 	c-strtod \
+	exit \
 	full-read \
 	full-write \
 	gethostname \
@@ -18,6 +19,7 @@ GNULIB_MODULES = \
 	getopt \
 	gettext \
 	intprops \
+	linebreak \
 	memcasecmp \
 	memchr \
 	memcmp \
@@ -29,12 +31,15 @@ GNULIB_MODULES = \
 	restrict \
 	snprintf \
 	stat-macros \
+	stdarg \
 	stdbool \
+	stdint \
 	stpcpy \
 	strcase \
 	strcspn \
 	strerror \
 	strftime \
+	strsep \
 	strstr \
 	strtod \
 	strtok_r \
@@ -53,7 +58,11 @@ all: po/POTFILES.in
 	$(GNULIB_TOOL) --import --no-changelog --m4-base=gl/m4 \
 		--source-base=gl --lib=libgl --tests-base=tests \
 		--import $(GNULIB_MODULES)
-	autoreconf --install
+	autopoint --force
+	aclocal -I m4 -I gl/m4
+	autoconf
+	autoheader
+	automake --add-missing --copy --no-force
 
 gettextize:
 	test -d m4 || mkdir m4
@@ -63,7 +72,7 @@ gettextize:
 po/POTFILES.in:
 	for f in `find src -name \*.[qc] ! -name .\* -print \
 		  | sed 's/\.[qc]$$//'`; do \
-		if test $$f = src/libpspp/version.c; then break; fi;		  \
+		if test $$f = src/libpspp/version; then continue; fi;	  \
 		if test -e $$f.q; then echo $$f.q; else echo $$f.c; fi	  \
 	done | sort | uniq > $@.tmp
 	if test ! -e $@ || ! cmp -s $@.tmp $@; then mv $@.tmp $@; fi