X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=8956a743a6569213b6c9308df99d1b844438f82a;hb=8b5eeea8fa0ed31ab3f174647ef111db39c1e177;hp=6fdba19dea5347ca61296ae09ce6452d275e116a;hpb=8a7f5c28b68af3cd03a524329c1d6e7eba355158;p=pspp-builds.git

diff --git a/Smake b/Smake
index 6fdba19d..8956a743 100644
--- a/Smake
+++ b/Smake
@@ -11,6 +11,7 @@ GNULIB_MODULES = \
 	byteswap \
 	c-ctype \
 	c-strtod \
+	dirname \
 	exit \
 	full-read \
 	full-write \
@@ -18,11 +19,12 @@ GNULIB_MODULES = \
 	getline \
 	getlogin_r \
 	getopt \
-	gettext \
+	gettext-h \
 	intprops \
 	inttostr \
 	linebreak \
 	localcharset \
+        mbchar \
 	memcasecmp \
 	memchr \
 	memcmp \
@@ -30,10 +32,11 @@ GNULIB_MODULES = \
 	memmove \
 	mempcpy \
 	memset \
+	minmax \
+	mkstemp \
 	progname \
-	readlink \
+	relocatable-prog \
 	snprintf \
-	stat-macros \
 	stdarg \
 	stdbool \
 	stdint \
@@ -43,27 +46,31 @@ GNULIB_MODULES = \
 	strerror \
 	strftime \
 	strsep \
-	strstr \
 	strtod \
 	strtok_r \
 	strtol \
 	strtoul \
+	sys_stat \
+	tmpfile \
 	unistd \
 	unlocked-io \
 	vsnprintf \
 	xalloc \
 	xalloc-die \
-	xreadlink \
 	xsize \
 	xstrndup \
 	xvasprintf
 
 all: po/POTFILES.in
 	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 --import $(GNULIB_MODULES)
+	echo '*' > gl/.cvsignore
+	echo '*' > gl/m4/.cvsignore
+	libtoolize --force --automake
 	autopoint --force
 	aclocal -I m4 -I gl/m4
 	autoconf
@@ -73,7 +80,7 @@ all: po/POTFILES.in
 gettextize:
 	test -d m4 || mkdir m4
 	touch m4/Makefile.am
-	gettextize -f -c --intl --no-changelog
+	gettextize --force --no-changelog
 
 po/POTFILES.in:
 	for f in `find src \( -name \*.[qc] -o -name \*.glade \) ! -name .\* -print` ; do \
@@ -95,6 +102,10 @@ _build: all
 	test -d _build || mkdir _build
 	cd _build && ../configure $(CONFIGUREFLAGS)
 
+_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/cat-id-tbl.c po/en@boldquot.header po/en@quot.header			\
@@ -116,7 +127,9 @@ clean:
 	rm -f mdate-sh texinfo.tex
 	rm -f doc/stamp-vti
 	rm -f config.h.in~
+	rm -f config.h.in
 	find . -name Makefile.in -exec rm -f {} \; 
 	rm -f compile
+	rm -f ltmain.sh
 
 .PHONY: all gettextize potfiles clean