X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=70385708ea9b5b25b379c27bec07dd232bcebc1c;hb=3c5121dc68726f596565894f831e4fa311c99c64;hp=a13ce6b5bb36e3ec60105a29611a6602e06c1652;hpb=a41320734db91e05381eb4235e92ed0131bb776c;p=pspp-builds.git

diff --git a/Smake b/Smake
index a13ce6b5..70385708 100644
--- a/Smake
+++ b/Smake
@@ -8,6 +8,7 @@ GNULIB_MODULES = \
 	alloca \
 	alloca-opt \
 	assert \
+	byteswap \
 	c-ctype \
 	c-strtod \
 	exit \
@@ -20,6 +21,7 @@ GNULIB_MODULES = \
 	gettext \
 	intprops \
 	linebreak \
+	localcharset \
 	memcasecmp \
 	memchr \
 	memcmp \
@@ -28,7 +30,6 @@ GNULIB_MODULES = \
 	memset \
 	progname \
 	readlink \
-	restrict \
 	snprintf \
 	stat-macros \
 	stdarg \
@@ -50,6 +51,8 @@ GNULIB_MODULES = \
 	xalloc \
 	xalloc-die \
 	xreadlink \
+	xsize \
+	xstrndup \
 	xvasprintf
 
 all: po/POTFILES.in
@@ -57,7 +60,7 @@ all: po/POTFILES.in
 	touch m4/Makefile.am
 	$(GNULIB_TOOL) --import --no-changelog --m4-base=gl/m4 \
 		--source-base=gl --lib=libgl --tests-base=tests \
-		--import $(GNULIB_MODULES)
+		--doc-base=gl/doc --import $(GNULIB_MODULES)
 	autopoint --force
 	aclocal -I m4 -I gl/m4
 	autoconf
@@ -70,10 +73,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
@@ -93,7 +96,7 @@ 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,7 +109,7 @@ 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~