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

diff --git a/Smake b/Smake
index 00ae6ca7..e8ffdd57 100644
--- a/Smake
+++ b/Smake
@@ -1,57 +1,160 @@
-Makefile po/Makefile.in: Makefile.in configure install-sh config.h.in po/Makefile.in.in
-	./configure
+# -*- makefile -*-
 
-configure:  configure.ac aclocal.m4
-	autoconf
+# Adjust these to reflect where you've installed gnulib.
+GNULIB = ../gnulib
+GNULIB_TOOL = $(GNULIB)/gnulib-tool
 
-config.h.in: configure.ac
-	autoheader
+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
 
-aclocal.m4:
-	aclocal -I m4
+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 \
+		--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 --force --no-changelog
 
-install-sh Makefile.in: intl Makefile.am aclocal.m4 config.h.in ABOUT-NLS
-	automake --add-missing
+check: all
+	rm -rf _check
+	mkdir _check
+	cd _check && ../configure $(CONFIGUREFLAGS)
+	cd _check && make distcheck
+	rm -rf _check
 
-po/Makefile.in.in intl ABOUT-NLS:
-	touch -f Makefile.am Makefile.am-stamp
-	touch -f configure.ac configure.ac-stamp
-	cp -a configure.ac configure.ac-bak
-	cp -a Makefile.am Makefile.am-bak
-	gettextize -f -c --no-changelog --intl
-	cp -a Makefile.am-bak Makefile.am
-	touch -f Makefile.am-stamp Makefile.am
-	cp -a configure.ac-bak configure.ac
-	touch -f configure.ac-stamp configure.ac
-	$(RM) configure.ac-bak configure.ac-stamp
-	$(RM) Makefile.am-bak Makefile.am-stamp
+_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/pspp.pot
 
-.PHONY: clean
 clean:
-	$(RM) config.sub config.guess
-	$(RM) ABOUT-NLS
-	$(RM) -r autom4te.cache
-	$(RM) aclocal.m4
-	$(RM) missing mkinstalldirs
-	$(RM) install-sh
-	$(RM) configure Makefile Makefile.in
-	$(RM) depcomp
-	$(RM) -r m4 intl
-	$(RM) po/ChangeLog \
-	po/Makefile \
-	po/Makefile.in \
-	po/Makefile.in.in \
-	po/POTFILES \
-	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
+	rm -f config.sub config.guess config.rpath
+	rm -f ABOUT-NLS
+	rm -fr autom4te.cache
+	rm -f aclocal.m4
+	rm -f missing mkinstalldirs
+	rm -f install-sh
+	rm -f configure Makefile 
+	rm -f depcomp
+	rm -rf intl gl
+	rm -f m4/*.m4
+	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 clean