X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=74202e999efb4e2302890cbc94c54bb017a8a8f3;hb=c246143823df29e9ce4c5115c647a47954dea883;hp=a020ee86087cabf59342ae0da03ea76365608ba4;hpb=f89de8c330e8f82f0e7195c4d35588cfcbdd02fc;p=pspp

diff --git a/Smake b/Smake
index a020ee8608..74202e999e 100644
--- a/Smake
+++ b/Smake
@@ -20,6 +20,7 @@ GNULIB_MODULES = \
 	getopt \
 	gettext \
 	intprops \
+	inttostr \
 	linebreak \
 	localcharset \
 	memcasecmp \
@@ -27,10 +28,10 @@ GNULIB_MODULES = \
 	memcmp \
 	memmem \
 	memmove \
+	mempcpy \
 	memset \
 	progname \
 	readlink \
-	restrict \
 	snprintf \
 	stat-macros \
 	stdarg \
@@ -48,6 +49,7 @@ GNULIB_MODULES = \
 	strtol \
 	strtoul \
 	unistd \
+	unlocked-io \
 	vsnprintf \
 	xalloc \
 	xalloc-die \
@@ -58,10 +60,16 @@ GNULIB_MODULES = \
 
 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
+	test -d intl || mkdir intl
+	echo '*' > intl/.cvsignore
+	libtoolize --force --automake
 	autopoint --force
 	aclocal -I m4 -I gl/m4
 	autoconf
@@ -93,6 +101,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,5 +128,6 @@ clean:
 	rm -f config.h.in~
 	find . -name Makefile.in -exec rm -f {} \; 
 	rm -f compile
+	rm -f ltmain.sh
 
 .PHONY: all gettextize potfiles clean