X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=bc33100712772bc19e6af9b0de4ae9753f1e9b4d;hb=e40c90b1b6dbd03ce58046ada7f4ddb5a6b4b354;hp=744bb0513d85229425ccb1fcfdc9230fdaf76a78;hpb=2048ef1bcb81fa766ccff3bb1cf30a886316983c;p=pspp-builds.git

diff --git a/Smake b/Smake
index 744bb051..bc331007 100644
--- a/Smake
+++ b/Smake
@@ -1,22 +1,71 @@
 # -*- makefile -*-
 
+# Adjust these to reflect where you've installed gnulib.
 GNULIB = ../gnulib
 GNULIB_TOOL = $(GNULIB)/gnulib-tool
 
-GNULIB_MODULES = alloca alloca-opt assert full-read full-write		\
-gethostname getline getlogin_r getopt gettext intprops memcasecmp	\
-memchr memcmp memmem memmove memset progname readlink restrict		\
-snprintf stat-macros stdbool stpcpy strcase strcspn strerror strftime	\
-strstr strtod strtok_r strtol strtoul vsnprintf xalloc xalloc-die	\
-xreadlink xvasprintf
+GNULIB_MODULES = \
+	alloca \
+	alloca-opt \
+	assert \
+	c-ctype \
+	c-strtod \
+	exit \
+	full-read \
+	full-write \
+	gethostname \
+	getline \
+	getlogin_r \
+	getopt \
+	gettext \
+	intprops \
+	linebreak \
+	localcharset \
+	memcasecmp \
+	memchr \
+	memcmp \
+	memmem \
+	memmove \
+	memset \
+	progname \
+	readlink \
+	restrict \
+	snprintf \
+	stat-macros \
+	stdarg \
+	stdbool \
+	stdint \
+	stpcpy \
+	strcase \
+	strcspn \
+	strerror \
+	strftime \
+	strsep \
+	strstr \
+	strtod \
+	strtok_r \
+	strtol \
+	strtoul \
+	unistd \
+	vsnprintf \
+	xalloc \
+	xalloc-die \
+	xreadlink \
+	xsize \
+	xstrndup \
+	xvasprintf
 
 all: po/POTFILES.in
 	test -d m4 || mkdir m4
 	touch m4/Makefile.am
 	$(GNULIB_TOOL) --import --no-changelog --m4-base=gl/m4 \
 		--source-base=gl --lib=libgl --tests-base=tests \
-		--import $(GNULIB_MODULES)
-	autoreconf --install
+		--doc-base=gl/doc --import $(GNULIB_MODULES)
+	autopoint --force
+	aclocal -I m4 -I gl/m4
+	autoconf
+	autoheader
+	automake --add-missing --copy --no-force
 
 gettextize:
 	test -d m4 || mkdir m4
@@ -24,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.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
@@ -47,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
@@ -60,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~