X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=47821265bce4796e052d8fe2789939fc4e0e7b8e;hb=7e413bbdf7b01f2ff0153c8cbf79c2e4fa71f4d5;hp=d6ebd795bf78db820bd6ceffe2e5d2516ef95979;hpb=2d1795bb0652c628d37d86b0cbd85628e9ff78b3;p=pspp

diff --git a/Smake b/Smake
index d6ebd795bf..47821265bc 100644
--- a/Smake
+++ b/Smake
@@ -7,16 +7,22 @@ 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 \
 	count-one-bits \
 	crc \
 	crypto/md4 \
+	crypto/md5 \
 	dirname \
+	dtoastr \
 	environ \
-	exit \
 	fatal-signal \
 	fcntl \
 	fpieee \
@@ -27,10 +33,11 @@ GNULIB_MODULES = \
         ftello \
 	fwriteerror \
 	getline \
-	getopt \
-	gettext-h \
+	gettext \
 	gettimeofday \
+        getopt-gnu \
 	gitlog-to-changelog \
+	include_next \
 	isfinite \
 	isinf \
 	isnan \
@@ -38,46 +45,62 @@ GNULIB_MODULES = \
 	inttostr \
 	localcharset \
         mbchar \
+        mbiter \
 	memcasecmp \
 	memchr \
-	memcmp \
-	memmove \
+	memchr2 \
 	mempcpy \
-	memset \
+	memrchr \
 	minmax \
 	mkdtemp \
 	mkstemp \
+	pipe2 \
 	printf-posix \
 	printf-safe \
 	progname \
+	rawmemchr \
+	read-file \
 	regex \
 	relocatable-prog \
 	rename \
 	round \
+	select \
 	snprintf \
 	snprintf-posix \
 	sprintf-posix \
 	stdarg \
 	stdbool \
 	stdint \
+	strcasestr \
 	stpcpy \
-	strcase \
-	strcspn \
 	strerror \
 	strftime \
 	strtod \
 	strtok_r \
-	strtol \
-	strtoul \
 	sys_stat \
 	tempname \
-	tmpfile \
 	trunc \
-	unilbrk/ulc-width-linebreaks \
+	unicase/u8-casecmp \
+	unicase/u8-casefold \
+	unicase/u8-tolower \
+	unicase/u8-toupper \
+	unictype/ctype-print \
+	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 \
 	vasprintf-posix \
 	version-etc \
@@ -95,19 +118,40 @@ 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
-	$(GNULIB_TOOL) --import --no-changelog --m4-base=gl/m4 \
+	$(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 \
-		$(GNULIB_MODULES)
-	libtoolize --force --automake
+		--doc-base=gl/doc --aux-dir=build-aux  \
+		--libtool $(GNULIB_MODULES)
+	if (glibtoolize --version) >/dev/null 2>&1; then	\
+		LIBTOOLIZE=glibtoolize;				\
+	elif (libtoolize --version) >/dev/null 2>&1; then	\
+		LIBTOOLIZE=libtoolize;				\
+	else							\
+		echo >&2 "libtoolize not found";		\
+		exit 1;						\
+	fi;							\
+	$$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
+
+Makefile.in: Makefile.am config.h.in aclocal.m4
+	automake --add-missing --copy --no-force --include-deps
+
 
 gettextize:
 	test -d m4 || mkdir m4