X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=5e05933dfafd9a4d85f1439d64d72d0cfa30179d;hb=8b42eb7dfd30afe72c307f91c298abe811befc60;hp=d70093247eb150a4b9bd95e79f5c487b043c90f3;hpb=7acb13b811a5c727ef7421e6f44cb5ddcad0df23;p=pspp-builds.git

diff --git a/Smake b/Smake
index d7009324..5e05933d 100644
--- a/Smake
+++ b/Smake
@@ -9,12 +9,15 @@ GNULIB_MODULES = \
 	byteswap \
 	c-ctype \
 	c-strtod \
+	clean-temp \
 	close \
+	configmake \
 	count-one-bits \
+	crc \
 	crypto/md4 \
+	crypto/md5 \
 	dirname \
 	environ \
-	exit \
 	fatal-signal \
 	fcntl \
 	fpieee \
@@ -25,9 +28,9 @@ GNULIB_MODULES = \
         ftello \
 	fwriteerror \
 	getline \
-	getopt \
 	gettext-h \
 	gettimeofday \
+        getopt-gnu \
 	gitlog-to-changelog \
 	isfinite \
 	isinf \
@@ -38,11 +41,9 @@ GNULIB_MODULES = \
         mbchar \
 	memcasecmp \
 	memchr \
-	memcmp \
-	memmove \
 	mempcpy \
-	memset \
 	minmax \
+	mkdtemp \
 	mkstemp \
 	printf-posix \
 	printf-safe \
@@ -59,7 +60,6 @@ GNULIB_MODULES = \
 	stdint \
 	stpcpy \
 	strcase \
-	strcspn \
 	strerror \
 	strftime \
 	strtod \
@@ -68,13 +68,16 @@ GNULIB_MODULES = \
 	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 \
+	unitypes \
 	unlocked-io \
 	vasprintf-posix \
 	version-etc \
@@ -95,19 +98,21 @@ GNULIB_MODULES = \
 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
 	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
@@ -136,7 +141,6 @@ 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