X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp-builds.git;a=blobdiff_plain;f=Smake;h=79b573b54962d6edec256ea1ddce8fda5c932c02;hp=1fe1b4c2cb57433a5b2bb2f900146169fa8d4152;hb=4eec17311c5d0e9db3853e1550b6c8c8d0829c2c;hpb=89cc65d7523e45ec0ecf40da1fe1e4ab5ad8eac8

diff --git a/Smake b/Smake
index 1fe1b4c2..79b573b5 100644
--- a/Smake
+++ b/Smake
@@ -5,35 +5,58 @@ GNULIB = ../gnulib
 GNULIB_TOOL = $(GNULIB)/gnulib-tool
 
 GNULIB_MODULES = \
-	alloca \
-	alloca-opt \
+	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 \
 	getlogin_r \
 	getopt \
-	gettext \
+	gettext-h \
+	gettimeofday \
+	gitlog-to-changelog \
+	isfinite \
+	isinf \
+	isnan \
 	intprops \
 	inttostr \
-	linebreak \
 	localcharset \
+        mbchar \
 	memcasecmp \
 	memchr \
 	memcmp \
-	memmem \
 	memmove \
 	mempcpy \
 	memset \
+	minmax \
 	mkstemp \
+	printf-posix \
+	printf-safe \
 	progname \
+	regex \
+	relocatable-prog \
+	rename \
+	round \
 	snprintf \
+	snprintf-posix \
+	sprintf-posix \
 	stdarg \
 	stdbool \
 	stdint \
@@ -48,27 +71,39 @@ 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 \
+	vprintf-posix \
 	vsnprintf \
+	vsnprintf-posix \
+	vsprintf-posix \
 	xalloc \
 	xalloc-die \
+	xmalloca \
+	xmemdup0 \
 	xsize \
 	xstrndup \
 	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
-	test -d intl || mkdir intl
-	echo '*' > intl/.cvsignore
 	libtoolize --force --automake
 	autopoint --force
 	aclocal -I m4 -I gl/m4
@@ -79,11 +114,12 @@ all: po/POTFILES.in
 gettextize:
 	test -d m4 || mkdir m4
 	touch m4/Makefile.am
-	gettextize -f -c --intl --no-changelog
+	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 $$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
@@ -126,8 +162,10 @@ clean:
 	rm -f mdate-sh texinfo.tex
 	rm -f doc/stamp-vti
 	rm -f config.h.in~
+	rm -f config.h.in
 	find . -name Makefile.in -exec rm -f {} \; 
 	rm -f compile
 	rm -f ltmain.sh
+	rm -f reloc-ldflags install-reloc
 
 .PHONY: all gettextize potfiles clean