X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=d061973d12a1271476b40cee9cb4de70463dcce6;hb=986e9ad4ebb80ebff32f1fda7a2fcb5a31a28869;hp=a1a81651309b0cea35e0109cec80803e0d0ebd79;hpb=9ade26c8349b4434008c46cf09bc7473ec743972;p=pspp

diff --git a/Smake b/Smake
index a1a8165130..d061973d12 100644
--- a/Smake
+++ b/Smake
@@ -7,8 +7,12 @@ GNULIB_TOOL = $(GNULIB)/gnulib-tool
 GNULIB_MODULES = \
 	assert \
 	byteswap \
+	c-snprintf \
+	c-strcase \
+	c-strcasestr \
 	c-ctype \
 	c-strtod \
+	c-xvasprintf \
 	clean-temp \
 	close \
 	configmake \
@@ -29,10 +33,11 @@ GNULIB_MODULES = \
         ftello \
 	fwriteerror \
 	getline \
-	gettext-h \
+	gettext \
 	gettimeofday \
         getopt-gnu \
 	gitlog-to-changelog \
+	include_next \
 	isfinite \
 	isinf \
 	isnan \
@@ -40,12 +45,16 @@ GNULIB_MODULES = \
 	inttostr \
 	localcharset \
         mbchar \
+        mbiter \
 	memcasecmp \
 	memchr \
+	memchr2 \
 	mempcpy \
+	memrchr \
 	minmax \
 	mkdtemp \
 	mkstemp \
+	pipe2 \
 	printf-posix \
 	printf-safe \
 	progname \
@@ -55,34 +64,41 @@ GNULIB_MODULES = \
 	relocatable-prog \
 	rename \
 	round \
+	select \
 	snprintf \
 	snprintf-posix \
 	sprintf-posix \
 	stdarg \
 	stdbool \
 	stdint \
+	strcasestr \
 	stpcpy \
-	strcase \
 	strerror \
 	strftime \
 	strtod \
 	strtok_r \
-	strtol \
-	strtoul \
 	sys_stat \
 	tempname \
 	trunc \
+	unicase/u8-casecmp \
+	unicase/u8-casefold \
+	unicase/u8-tolower \
+	unicase/u8-toupper \
 	unictype/ctype-print \
-	unictype/property-id-continue \
-	unictype/property-id-start \
+	unictype/category-of \
 	unigbrk/uc-is-grapheme-break \
+	unilbrk/u8-possible-linebreaks \
+	uninorm/nfkd \
 	unistd \
 	unistr/u8-check \
 	unistr/u8-cpy \
+	unistr/u8-mblen \
 	unistr/u8-mbtouc \
+	unistr/u8-mbtoucr \
 	unistr/u8-strlen \
 	unistr/u8-strmbtouc \
 	unistr/u8-strncat \
+	unistr/u8-uctomb \
 	uniwidth/u8-strwidth \
 	unitypes \
 	unlocked-io \
@@ -102,22 +118,31 @@ GNULIB_MODULES = \
 	xstrndup \
 	xvasprintf
 
-all: 
+all: prep_ph
+	$(MAKE) -f Smake Makefile.in configure
+
+.PHONY: prep_ph
+prep_ph: 
 	test -e ChangeLog || touch ChangeLog
 	test -d m4 || mkdir m4
 	touch m4/Makefile.am
-	$(MAKE) -f Smake 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  \
+		--libtool $(GNULIB_MODULES)
 	libtoolize --force --automake
+
+aclocal.m4:
 	aclocal -I m4 -I gl/m4
+
+configure: configure.ac aclocal.m4
 	autoconf
+
+config.h.in: configure.ac
 	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)
+Makefile.in: Makefile.am config.h.in aclocal.m4
+	automake --add-missing --copy --no-force --include-deps
 
 
 gettextize: