X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=22c0f692de0638be8e8d5405da76d573837086e2;hb=refs%2Fheads%2Fpivot-table;hp=7905c430fe28401c4e5f454a0e4c3218d3a8f283;hpb=fe76b9c2c49a0dd33aad5dfe3f03a056e6f96c21;p=pspp

diff --git a/Smake b/Smake
index 7905c430fe..22c0f692de 100644
--- a/Smake
+++ b/Smake
@@ -5,16 +5,20 @@ GNULIB = ../gnulib
 GNULIB_TOOL = $(GNULIB)/gnulib-tool
 
 GNULIB_MODULES = \
-	argp \
 	assert \
 	byteswap \
 	c-ctype \
 	c-strtod \
+	close \
+	configmake \
+	count-one-bits \
+	crc \
 	crypto/md4 \
 	dirname \
 	environ \
 	exit \
 	fatal-signal \
+	fcntl \
 	fpieee \
 	fprintf-posix \
 	full-read \
@@ -22,9 +26,7 @@ GNULIB_MODULES = \
         fseeko \
         ftello \
 	fwriteerror \
-	gethostname \
 	getline \
-	getlogin_r \
 	getopt \
 	gettext-h \
 	gettimeofday \
@@ -43,12 +45,14 @@ GNULIB_MODULES = \
 	mempcpy \
 	memset \
 	minmax \
+	mkdtemp \
 	mkstemp \
 	printf-posix \
 	printf-safe \
 	progname \
 	regex \
 	relocatable-prog \
+	rename \
 	round \
 	snprintf \
 	snprintf-posix \
@@ -61,7 +65,6 @@ GNULIB_MODULES = \
 	strcspn \
 	strerror \
 	strftime \
-	strsep \
 	strtod \
 	strtok_r \
 	strtol \
@@ -72,8 +75,13 @@ GNULIB_MODULES = \
 	trunc \
 	unilbrk/ulc-width-linebreaks \
 	unistd \
+	unistr/u8-cpy \
+	unistr/u8-strlen \
+	unistr/u8-strncat \
 	unlocked-io \
 	vasprintf-posix \
+	version-etc \
+	version-etc-fsf \
 	vfprintf-posix \
 	vprintf-posix \
 	vsnprintf \
@@ -82,11 +90,12 @@ 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
@@ -97,7 +106,6 @@ all: po/POTFILES.in
 	echo '*' > gl/.cvsignore
 	echo '*' > gl/m4/.cvsignore
 	libtoolize --force --automake
-	autopoint --force
 	aclocal -I m4 -I gl/m4
 	autoconf
 	autoheader
@@ -108,15 +116,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
@@ -132,15 +131,14 @@ _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
 
 clean:
 	rm -f config.sub config.guess config.rpath
-	rm -f ABOUT-NLS
 	rm -fr autom4te.cache
 	rm -f aclocal.m4
 	rm -f missing mkinstalldirs
@@ -159,4 +157,4 @@ clean:
 	rm -f ltmain.sh
 	rm -f reloc-ldflags install-reloc
 
-.PHONY: all gettextize potfiles clean
+.PHONY: all gettextize clean