X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=031e486186e047d488cded1f015759afd5fda6db;hb=4d95fcf5105d5f4641c34daae577e68ec986ffbd;hp=e363f418b6df65be040066a473912390c297fe86;hpb=19c82c5e8a0daa25d5fb90b2a0c3afdae36fa471;p=pspp-builds.git

diff --git a/Smake b/Smake
index e363f418..031e4861 100644
--- a/Smake
+++ b/Smake
@@ -1,73 +1,117 @@
-Makefile po/Makefile.in: Makefile.in configure install-sh config.h.in po/Makefile.in.in po/POTFILES.in
-	./configure
+# -*- makefile -*-
 
-configure:  configure.ac aclocal.m4
-	autoconf
-
-config.h.in: configure.ac
-	autoheader
-
-aclocal.m4:
-	aclocal -I m4
+# Adjust these to reflect where you've installed gnulib.
+GNULIB = ../gnulib
+GNULIB_TOOL = $(GNULIB)/gnulib-tool
 
-# We want all src/*.c files which do not have corresponding src/*.q
-
-src_q_files=$(wildcard src/*.q)
-src_c_files=$(wildcard src/*.c)
-src_cq_files=$(patsubst %.q, %.c, $(src_q_files))
-src_files=$(filter-out $(src_cq_files), $(src_c_files)) $(src_q_files)
+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 \
+	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)
+	autopoint --force
+	aclocal -I m4 -I gl/m4
+	autoconf
+	autoheader
+	automake --add-missing --copy --no-force
 
-.PHONY: po/POTFILES.in
-po/POTFILES.in: 
-	@$(RM) po/potfile-temp
-	for f in $(src_files) ; do \
-	if [ $$f = "src/version.c" ] ; then continue ; fi ; \
-	echo $$f >> po/potfile-temp ; done
-	@if ( ! test -e $@ ) || ( ! diff  -q po/potfile-temp $@ ) ; then  mv po/potfile-temp $@ ; else $(RM) po/potfile-temp ; fi
+gettextize:
+	test -d m4 || mkdir m4
+	touch m4/Makefile.am
+	gettextize -f -c --intl --no-changelog
 
-install-sh Makefile.in: intl Makefile.am aclocal.m4 config.h.in ABOUT-NLS
-	automake --add-missing
+po/POTFILES.in:
+	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
 
-po/Makefile.in.in intl ABOUT-NLS:
-	touch -f Makefile.am Makefile.am-stamp
-	touch -f configure.ac configure.ac-stamp
-	cp -pR configure.ac configure.ac-bak
-	cp -pR Makefile.am Makefile.am-bak
-	gettextize -f -c --no-changelog --intl
-	cp -pR Makefile.am-bak Makefile.am
-	touch -f Makefile.am-stamp Makefile.am
-	cp -pR 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
+check: all
+	rm -rf _check
+	mkdir _check
+	cd _check && ../configure $(CONFIGUREFLAGS)
+	cd _check && make distcheck
+	rm -rf _check
 
+_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		\
+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/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
+	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~
+	find . -name Makefile.in -exec rm -f {} \; 
+	rm -f compile
+
+.PHONY: all gettextize potfiles clean