X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=2210e662a2c8ec7bd746f30c4178f955d8ed09d6;hb=068a4cbf264102f4ede4c3805eecbacf15f0f2d8;hp=686fb756278834a9aafbce869972f97af42cedd0;hpb=9530bce28d817a0d106d34144289ba2b12d04c19;p=pspp-builds.git

diff --git a/Smake b/Smake
index 686fb756..2210e662 100644
--- a/Smake
+++ b/Smake
@@ -9,13 +9,16 @@ GNULIB_MODULES = \
 	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 \
@@ -26,9 +29,9 @@ GNULIB_MODULES = \
         ftello \
 	fwriteerror \
 	getline \
-	getopt \
 	gettext-h \
 	gettimeofday \
+        getopt-gnu \
 	gitlog-to-changelog \
 	isfinite \
 	isinf \
@@ -39,10 +42,7 @@ GNULIB_MODULES = \
         mbchar \
 	memcasecmp \
 	memchr \
-	memcmp \
-	memmove \
 	mempcpy \
-	memset \
 	minmax \
 	mkdtemp \
 	mkstemp \
@@ -61,7 +61,6 @@ GNULIB_MODULES = \
 	stdint \
 	stpcpy \
 	strcase \
-	strcspn \
 	strerror \
 	strftime \
 	strtod \
@@ -70,13 +69,17 @@ 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 \
+	uniwidth/u8-strwidth \
+	unitypes \
 	unlocked-io \
 	vasprintf-posix \
 	version-etc \
@@ -97,19 +100,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
@@ -138,7 +143,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