X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=031e486186e047d488cded1f015759afd5fda6db;hb=597402f4808b749094b3f90a96d96adf67e41c5b;hp=49a72f32ba21c8878bb94f83fbb30831e9e291f1;hpb=352d48a9cf76667dd4824326c7151df70e90d7a1;p=pspp-builds.git

diff --git a/Smake b/Smake
index 49a72f32..031e4861 100644
--- a/Smake
+++ b/Smake
@@ -10,6 +10,7 @@ GNULIB_MODULES = \
 	assert \
 	c-ctype \
 	c-strtod \
+	exit \
 	full-read \
 	full-write \
 	gethostname \
@@ -18,6 +19,8 @@ GNULIB_MODULES = \
 	getopt \
 	gettext \
 	intprops \
+	linebreak \
+	localcharset \
 	memcasecmp \
 	memchr \
 	memcmp \
@@ -29,12 +32,15 @@ GNULIB_MODULES = \
 	restrict \
 	snprintf \
 	stat-macros \
+	stdarg \
 	stdbool \
+	stdint \
 	stpcpy \
 	strcase \
 	strcspn \
 	strerror \
 	strftime \
+	strsep \
 	strstr \
 	strtod \
 	strtok_r \
@@ -53,7 +59,11 @@ all: po/POTFILES.in
 	$(GNULIB_TOOL) --import --no-changelog --m4-base=gl/m4 \
 		--source-base=gl --lib=libgl --tests-base=tests \
 		--import $(GNULIB_MODULES)
-	autoreconf --install
+	autopoint --force
+	aclocal -I m4 -I gl/m4
+	autoconf
+	autoheader
+	automake --add-missing --copy --no-force
 
 gettextize:
 	test -d m4 || mkdir m4
@@ -61,10 +71,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.c; then break; 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
@@ -84,7 +94,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
@@ -97,7 +107,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~