X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp-builds.git;a=blobdiff_plain;f=Smake;h=e8ffdd5705b2802df79ef79b6ccf90b075a521c0;hp=686212e401b29abdcc42c5f17a97ae2e0b29e8f9;hb=HEAD;hpb=cbf39004f714c8fe8cb395a8ea7fc04814e72d67

diff --git a/Smake b/Smake
index 686212e4..e8ffdd57 100644
--- a/Smake
+++ b/Smake
@@ -5,31 +5,59 @@ GNULIB = ../gnulib
 GNULIB_TOOL = $(GNULIB)/gnulib-tool
 
 GNULIB_MODULES = \
-	alloca \
-	alloca-opt \
+	argp \
 	assert \
+	byteswap \
 	c-ctype \
 	c-strtod \
+	close \
+	count-one-bits \
+	crypto/md4 \
+	dirname \
+	environ \
+	exit \
+	fatal-signal \
+	fcntl \
+	fpieee \
+	fprintf-posix \
 	full-read \
 	full-write \
+        fseeko \
+        ftello \
+	fwriteerror \
 	gethostname \
 	getline \
 	getlogin_r \
 	getopt \
-	gettext \
+	gettext-h \
+	gettimeofday \
+	gitlog-to-changelog \
+	isfinite \
+	isinf \
+	isnan \
 	intprops \
-	linebreak \
+	inttostr \
+	localcharset \
+        mbchar \
 	memcasecmp \
 	memchr \
 	memcmp \
-	memmem \
 	memmove \
+	mempcpy \
 	memset \
+	minmax \
+	mkstemp \
+	printf-posix \
+	printf-safe \
 	progname \
-	readlink \
-	restrict \
+	regex \
+	relocatable-prog \
+	rename \
+	round \
 	snprintf \
-	stat-macros \
+	snprintf-posix \
+	sprintf-posix \
+	stdarg \
 	stdbool \
 	stdint \
 	stpcpy \
@@ -38,39 +66,54 @@ GNULIB_MODULES = \
 	strerror \
 	strftime \
 	strsep \
-	strstr \
 	strtod \
 	strtok_r \
 	strtol \
 	strtoul \
+	sys_stat \
+	tempname \
+	tmpfile \
+	trunc \
+	unilbrk/ulc-width-linebreaks \
 	unistd \
+	unistr/u8-cpy \
+	unistr/u8-strlen \
+	unistr/u8-strncat \
+	unlocked-io \
+	vasprintf-posix \
+	vfprintf-posix \
+	vprintf-posix \
 	vsnprintf \
+	vsnprintf-posix \
+	vsprintf-posix \
 	xalloc \
 	xalloc-die \
-	xreadlink \
+	xmalloca \
+	xmemdup0 \
+	xsize \
+	xstrndup \
 	xvasprintf
 
-all: po/POTFILES.in
+all: 
+	test -e ChangeLog || touch ChangeLog
 	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)
-	autoreconf --install
+		--doc-base=gl/doc --aux-dir=. --import $(GNULIB_MODULES)
+	echo '*' > gl/.cvsignore
+	echo '*' > gl/m4/.cvsignore
+	libtoolize --force --automake
+	aclocal -I m4 -I gl/m4
+	autoconf
+	autoheader
+	automake --add-missing --copy --no-force
 
 gettextize:
 	test -d m4 || mkdir m4
 	touch m4/Makefile.am
-	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	  \
-	done | sort | uniq > $@.tmp
-	if test ! -e $@ || ! cmp -s $@.tmp $@; then mv $@.tmp $@; fi
-	rm -f $@.tmp
+	gettextize --force --no-changelog
 
 check: all
 	rm -rf _check
@@ -83,11 +126,15 @@ _build: all
 	test -d _build || mkdir _build
 	cd _build && ../configure $(CONFIGUREFLAGS)
 
-PO_FILES = po/ChangeLog po/Makefile po/Makefile.in po/Makefile.in.in	\
-po/POTFILES po/POTFILES.in po/Rules-quot po/boldquot.sed		\
+_debug: all
+	test -d _debug || mkdir _debug
+	cd _debug && ../configure $(CONFIGUREFLAGS) --enable-debug
+
+PO_FILES = po/ChangeLog \
+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
@@ -100,11 +147,14 @@ 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~
+	rm -f config.h.in
 	find . -name Makefile.in -exec rm -f {} \; 
 	rm -f compile
+	rm -f ltmain.sh
+	rm -f reloc-ldflags install-reloc
 
-.PHONY: all gettextize potfiles clean
+.PHONY: all gettextize clean