X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=74202e999efb4e2302890cbc94c54bb017a8a8f3;hb=67047828d9e0c46f83f800602e36ffe62584c546;hp=764044cb82b162db076039bb0a1542fdbf018157;hpb=6a28b70283f37b5cd08423098c9d39cef9f6add5;p=pspp-builds.git

diff --git a/Smake b/Smake
index 764044cb..74202e99 100644
--- a/Smake
+++ b/Smake
@@ -8,6 +8,7 @@ GNULIB_MODULES = \
 	alloca \
 	alloca-opt \
 	assert \
+	byteswap \
 	c-ctype \
 	c-strtod \
 	exit \
@@ -19,16 +20,18 @@ GNULIB_MODULES = \
 	getopt \
 	gettext \
 	intprops \
+	inttostr \
 	linebreak \
+	localcharset \
 	memcasecmp \
 	memchr \
 	memcmp \
 	memmem \
 	memmove \
+	mempcpy \
 	memset \
 	progname \
 	readlink \
-	restrict \
 	snprintf \
 	stat-macros \
 	stdarg \
@@ -46,19 +49,28 @@ GNULIB_MODULES = \
 	strtol \
 	strtoul \
 	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 \
-		--import $(GNULIB_MODULES)
-	autopoint
+		--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
 	autoheader
@@ -70,10 +82,10 @@ gettextize:
 	gettextize -f -c --intl --no-changelog
 
 po/POTFILES.in:
-	for f in `find src -name \*.[qc] ! -name .\* -print \
-		  | sed 's/\.[qc]$$//'`; do \
-		if test $$f = src/libpspp/version; then continue; fi;	  \
-		if test -e $$f.q; then echo $$f.q; else echo $$f.c; fi	  \
+	for f in `find src \( -name \*.[qc] -o -name \*.glade \) ! -name .\* -print` ; do \
+		if test $$f = src/libpspp/version.c; then continue; fi;	  \
+		if test -e `dirname $$f`/`basename $$f .c`.q ; then continue; fi; \
+		echo $$f ; \
 	done | sort | uniq > $@.tmp
 	if test ! -e $@ || ! cmp -s $@.tmp $@; then mv $@.tmp $@; fi
 	rm -f $@.tmp
@@ -89,11 +101,15 @@ _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			\
 po/insert-header.sin po/quot.sed po/remove-potcdate.sin po/stamp-po	\
-po/Makevars.template
+po/Makevars.template po/pspp.pot
 
 clean:
 	rm -f config.sub config.guess config.rpath
@@ -106,11 +122,12 @@ clean:
 	rm -f depcomp
 	rm -rf intl gl
 	rm -f m4/*.m4
-	rm -f $(PO_FILES)
+	rm -f $(PO_FILES) po/*.gmo 
 	rm -f mdate-sh texinfo.tex
 	rm -f doc/stamp-vti
 	rm -f config.h.in~
 	find . -name Makefile.in -exec rm -f {} \; 
 	rm -f compile
+	rm -f ltmain.sh
 
 .PHONY: all gettextize potfiles clean