X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=8c6669d0d1ad2335a8e3b5849823f2f29d8deae4;hb=c831ad10d7e9d494e5e22ab30306057e81bc52cd;hp=f6ab964c014f348828da4a8f6c44fb80abe9e198;hpb=05f7ed34b0518cdf5abe6995c3f5436a97663938;p=pspp-builds.git

diff --git a/Smake b/Smake
index f6ab964c..8c6669d0 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 \
+	clean-temp \
 	close \
+	configmake \
+	count-one-bits \
+	crc \
 	crypto/md4 \
+	crypto/md5 \
 	dirname \
+	dtoastr \
 	environ \
-	exit \
 	fatal-signal \
 	fcntl \
 	fpieee \
@@ -24,12 +28,10 @@ GNULIB_MODULES = \
         fseeko \
         ftello \
 	fwriteerror \
-	gethostname \
 	getline \
-	getlogin_r \
-	getopt \
 	gettext-h \
 	gettimeofday \
+        getopt-gnu \
 	gitlog-to-changelog \
 	isfinite \
 	isinf \
@@ -40,11 +42,9 @@ GNULIB_MODULES = \
         mbchar \
 	memcasecmp \
 	memchr \
-	memcmp \
-	memmove \
 	mempcpy \
-	memset \
 	minmax \
+	mkdtemp \
 	mkstemp \
 	printf-posix \
 	printf-safe \
@@ -61,22 +61,28 @@ GNULIB_MODULES = \
 	stdint \
 	stpcpy \
 	strcase \
-	strcspn \
 	strerror \
 	strftime \
-	strsep \
 	strtod \
 	strtok_r \
 	strtol \
 	strtoul \
 	sys_stat \
 	tempname \
-	tmpfile \
 	trunc \
-	unilbrk/ulc-width-linebreaks \
 	unistd \
+	unictype/property-id-continue \
+	unictype/property-id-start \
+	unistr/u8-cpy \
+	unistr/u8-mbtouc \
+	unistr/u8-strlen \
+	unistr/u8-strncat \
+	uniwidth/u8-strwidth \
+	unitypes \
 	unlocked-io \
 	vasprintf-posix \
+	version-etc \
+	version-etc-fsf \
 	vfprintf-posix \
 	vprintf-posix \
 	vsnprintf \
@@ -85,42 +91,34 @@ 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 --aux-dir=. --import $(GNULIB_MODULES)
-	echo '*' > gl/.cvsignore
-	echo '*' > gl/m4/.cvsignore
+	$(MAKE) -f Smake gnulib
 	libtoolize --force --automake
-	autopoint --force
 	aclocal -I m4 -I gl/m4
 	autoconf
 	autoheader
 	automake --add-missing --copy --no-force
 
+gnulib:
+	$(GNULIB_TOOL) --add-import --no-changelog --m4-base=gl/m4 \
+		--source-base=gl --lib=libgl --tests-base=tests \
+		--doc-base=gl/doc --aux-dir=build-aux --import \
+		--libtool $(GNULIB_MODULES)
+
+
 gettextize:
 	test -d m4 || mkdir m4
 	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 $$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
-	if test ! -e $@ || ! cmp -s $@.tmp $@; then mv $@.tmp $@; fi
-	rm -f $@.tmp
-
 check: all
 	rm -rf _check
 	mkdir _check
@@ -136,15 +134,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
@@ -163,4 +160,4 @@ clean:
 	rm -f ltmain.sh
 	rm -f reloc-ldflags install-reloc
 
-.PHONY: all gettextize potfiles clean
+.PHONY: all gettextize clean