X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=a13ce6b5bb36e3ec60105a29611a6602e06c1652;hb=9368d05aae3a64fd81b237dcf77fb1376af2fefd;hp=b4ed61a8280670fdd1c1931b2449d52ef5b75457;hpb=009350385d97d9fba2b33ea68cfe8b1aeebf1529;p=pspp-builds.git

diff --git a/Smake b/Smake
index b4ed61a8..a13ce6b5 100644
--- a/Smake
+++ b/Smake
@@ -1,14 +1,56 @@
 # -*- makefile -*-
 
+# Adjust these to reflect where you've installed gnulib.
 GNULIB = ../gnulib
 GNULIB_TOOL = $(GNULIB)/gnulib-tool
 
-GNULIB_MODULES = alloca alloca-opt assert full-read full-write		\
-gethostname getline getlogin_r getopt gettext memcasecmp memchr memcmp	\
-memmem memmove memset progname readlink restrict snprintf stat-macros	\
-stdbool stpcpy strcase strcspn strerror strftime strstr strtod		\
-strtok_r strtol strtoul vsnprintf xalloc xalloc-die xreadlink		\
-xvasprintf
+GNULIB_MODULES = \
+	alloca \
+	alloca-opt \
+	assert \
+	c-ctype \
+	c-strtod \
+	exit \
+	full-read \
+	full-write \
+	gethostname \
+	getline \
+	getlogin_r \
+	getopt \
+	gettext \
+	intprops \
+	linebreak \
+	memcasecmp \
+	memchr \
+	memcmp \
+	memmem \
+	memmove \
+	memset \
+	progname \
+	readlink \
+	restrict \
+	snprintf \
+	stat-macros \
+	stdarg \
+	stdbool \
+	stdint \
+	stpcpy \
+	strcase \
+	strcspn \
+	strerror \
+	strftime \
+	strsep \
+	strstr \
+	strtod \
+	strtok_r \
+	strtol \
+	strtoul \
+	unistd \
+	vsnprintf \
+	xalloc \
+	xalloc-die \
+	xreadlink \
+	xvasprintf
 
 all: po/POTFILES.in
 	test -d m4 || mkdir m4
@@ -16,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
@@ -26,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