X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp-builds.git;a=blobdiff_plain;f=Smake;h=e8ffdd5705b2802df79ef79b6ccf90b075a521c0;hp=aaf1ff90da4cf66ba579a0082e8a6db0aa473de0;hb=HEAD;hpb=8a55f06f1878e987d1b3d0b09a74d58291c33887

diff --git a/Smake b/Smake
index aaf1ff90..e8ffdd57 100644
--- a/Smake
+++ b/Smake
@@ -5,18 +5,25 @@ GNULIB = ../gnulib
 GNULIB_TOOL = $(GNULIB)/gnulib-tool
 
 GNULIB_MODULES = \
+	argp \
 	assert \
 	byteswap \
 	c-ctype \
 	c-strtod \
+	close \
+	count-one-bits \
 	crypto/md4 \
 	dirname \
+	environ \
 	exit \
+	fatal-signal \
+	fcntl \
 	fpieee \
 	fprintf-posix \
 	full-read \
 	full-write \
         fseeko \
+        ftello \
 	fwriteerror \
 	gethostname \
 	getline \
@@ -24,16 +31,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 \
@@ -42,7 +50,9 @@ GNULIB_MODULES = \
 	printf-posix \
 	printf-safe \
 	progname \
+	regex \
 	relocatable-prog \
+	rename \
 	round \
 	snprintf \
 	snprintf-posix \
@@ -61,9 +71,14 @@ GNULIB_MODULES = \
 	strtol \
 	strtoul \
 	sys_stat \
+	tempname \
 	tmpfile \
 	trunc \
+	unilbrk/ulc-width-linebreaks \
 	unistd \
+	unistr/u8-cpy \
+	unistr/u8-strlen \
+	unistr/u8-strncat \
 	unlocked-io \
 	vasprintf-posix \
 	vfprintf-posix \
@@ -74,21 +89,22 @@ GNULIB_MODULES = \
 	xalloc \
 	xalloc-die \
 	xmalloca \
+	xmemdup0 \
 	xsize \
 	xstrndup \
 	xvasprintf
 
-all: po/POTFILES.in
+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 --import $(GNULIB_MODULES)
+		--doc-base=gl/doc --aux-dir=. --import $(GNULIB_MODULES)
 	echo '*' > gl/.cvsignore
 	echo '*' > gl/m4/.cvsignore
 	libtoolize --force --automake
-	autopoint --force
 	aclocal -I m4 -I gl/m4
 	autoconf
 	autoheader
@@ -99,15 +115,6 @@ gettextize:
 	touch m4/Makefile.am
 	gettextize --force --no-changelog
 
-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 -e `dirname $$f`/`basename $$f .c`.q ; then continue; fi; \
-		echo $$f ; \
-	done | sort | uniq > $@.tmp
-	if test ! -e $@ || ! cmp -s $@.tmp $@; then mv $@.tmp $@; fi
-	rm -f $@.tmp
-
 check: all
 	rm -rf _check
 	mkdir _check
@@ -123,8 +130,8 @@ _debug: all
 	test -d _debug || mkdir _debug
 	cd _debug && ../configure $(CONFIGUREFLAGS) --enable-debug
 
-PO_FILES = po/ChangeLog po/Makefile po/Makefile.in po/Makefile.in.in	\
-po/POTFILES po/POTFILES.in po/Rules-quot po/boldquot.sed		\
+PO_FILES = po/ChangeLog \
+po/Rules-quot po/boldquot.sed		\
 po/cat-id-tbl.c po/en@boldquot.header po/en@quot.header			\
 po/insert-header.sin po/quot.sed po/remove-potcdate.sin po/stamp-po	\
 po/Makevars.template po/pspp.pot
@@ -150,4 +157,4 @@ clean:
 	rm -f ltmain.sh
 	rm -f reloc-ldflags install-reloc
 
-.PHONY: all gettextize potfiles clean
+.PHONY: all gettextize clean