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

diff --git a/Smake b/Smake
index 492fa797..e8ffdd57 100644
--- a/Smake
+++ b/Smake
@@ -1,34 +1,119 @@
 # -*- 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 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
+GNULIB_MODULES = \
+	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-h \
+	gettimeofday \
+	gitlog-to-changelog \
+	isfinite \
+	isinf \
+	isnan \
+	intprops \
+	inttostr \
+	localcharset \
+        mbchar \
+	memcasecmp \
+	memchr \
+	memcmp \
+	memmove \
+	mempcpy \
+	memset \
+	minmax \
+	mkstemp \
+	printf-posix \
+	printf-safe \
+	progname \
+	regex \
+	relocatable-prog \
+	rename \
+	round \
+	snprintf \
+	snprintf-posix \
+	sprintf-posix \
+	stdarg \
+	stdbool \
+	stdint \
+	stpcpy \
+	strcase \
+	strcspn \
+	strerror \
+	strftime \
+	strsep \
+	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 \
+	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] -print | sed 's/\.[qc]$$//'`; do \
-		if test $$f = src/version.c; then break; 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
@@ -37,11 +122,19 @@ check: all
 	cd _check && make distcheck
 	rm -rf _check
 
-PO_FILES = po/ChangeLog po/Makefile po/Makefile.in po/Makefile.in.in	\
-po/POTFILES po/POTFILES.in po/Rules-quot po/boldquot.sed		\
+_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/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
@@ -50,10 +143,18 @@ clean:
 	rm -f aclocal.m4
 	rm -f missing mkinstalldirs
 	rm -f install-sh
-	rm -f configure Makefile Makefile.in
+	rm -f configure Makefile 
 	rm -f depcomp
-	rm -fr intl gl
+	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