Various "make distcheck" and other fixes

Makefile.am:

* Use $(VAR), not @VAR@, as the former is the correct form for AC_SUBST'ed
   variables in Makefile.am files

* Touch these *.xml/*.syms files in the "dist-hook" target to prevent them
   from being regenerated, because the "make dist" process in itself
   updates the timestamps of the source files when it copies them into
   $(distdir)

* Add EXTRA_LIBS (-lrt on my system) to xsltConf.sh, as this is a required
   dependency when client applications link against -lxslt

   (note that the definition of EXTRA_LIBS has been changed; see below)

* Removed MAKEFLAGS+=--silent bits, as this is not compatible with non-GNU
   Make programs

autogen.sh:

* Add --warnings=all options to automake and autoconf invocations, to
   better catch potential problems (most of which I've fixed in this patch)

configure.in:

* Replaced obsolete macros with their current equivalents; for reference,
   see

     http://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.69/html_node/Obsolete-Macros.html

   (I removed AC_ISC_POSIX outright because the doc states it is no longer
   useful)

* test(1) uses "=" as an operator, not "=="

* Fixed quoting on an AC_LINK_IFELSE() invocation to quell Autoconf errors

* Don't add redundant libraries to EXTRA_LIBS, because (1) this variable
   already contains LibXSLT's own additional system-library deps, and is
   useful in that form, and (2) the LibXML2 deps are already handled by
   Libtool

* Don't delete files in srcdir, and don't create the symlink to
   "Copyright" there either

   (I don't understand why this is being symlinked in the first place...)

doc/Makefile.am:

* Can't use wildcards in EXTRA_DIST, because this breaks dependencies
   (e.g. you can't "make EXSLT/\*.html"), and they only work properly when
   building inside the source tree; these have been replaced with their
   expansions. Other entries have been added here in lieu of the wildcards
   in the dist-hook target, as well as opportunistic use of the $(*PAGES)
   variables.

* Don't define an "all" target, because this steps on Automake's toes; use
   "all-local" instead

* Define and use an "xsltproc" variable to reference an in-tree-built
   version of xsltproc, instead of e.g. $(bindir)/xsltproc

   NOTE: The makefile also uses $(XSLTPROC), which names an external
   instance of the program found at configure time. Some instances of this
   could probably be changed to $(xsltproc) to remove the dependency on an
   existing installed program.

* Qualified various filenames as appropriate with $(srcdir)

* Use $(XMLLINT) consistently instead of $(bindir)/xmllint

* In the "libxslt-api.xml ..." rule, cd into $(srcdir) before invoking
   apibuild.py as this script has to run in srcdir anyway

* In the "clean-local" rule, clear out some additional files to allow
   "make distcheck" to pass

* Eliminated the redundant "maintainer-clean-local" rule

* Added a "distclean-local" rule to clear out the build directory in an
   out-of-source build to allow "make distcheck" to pass

* Added a "check-extra-dist" target to make it easier to check that
   EXTRA_DIST isn't missing anything

* Use $(MKDIR_P), not $(mkinstalldirs), as the latter name is obsolete

* Use $(VAR) instead of @VAR@

* The "dist-hook" target didn't work (if any generated files were in
   builddir and not in srcdir), and is no longer needed thanks to the
   comprehensive EXTRA_DIST variable

* Added an "uninstall-local" rule to allow "make distcheck" to pass

* Updated the .PHONY target list, removed non-existent targets

doc/symbols.xml:

* Needed to add this bit to make the generation scripts shut up

libexslt/Makefile.am:

* AM_CPPFLAGS should be used instead of INCLUDES, as the latter is an
   obsolete name

* Moved $(LIBXML_CFLAGS) to AM_CFLAGS, to segregate CFLAGS from CPPFLAGS

   (Note that $(CFLAGS) need not be added to AM_CFLAGS, because Automake
   already references both in the build rules)

* Use $(VAR) instead of @VAR@

libxslt.pc.in:

* Add EXTRA_LIBS (-lrt on my system), as this is a required dependency
   when client applications link against -lxslt

libxslt/Makefile.am:

* AM_CPPFLAGS should be used instead of INCLUDES, as the latter is an
   obsolete name

* Moved $(LIBXML_CFLAGS) to AM_CFLAGS, to segregate CFLAGS from CPPFLAGS

* Use $(VAR) instead of @VAR@, $(MKDIR_P) instead of $(mkinstalldirs)

* Use $(MKDIR_P), not $(mkinstalldirs), as the latter name is obsolete

libxslt/xsltutils.c:

* Some systems don't know about CLOCK_MONOTONIC; older Solaris knows about
   CLOCK_HIGHRES. Some systems, alas, have no usable alternative to
   CLOCK_REALTIME.

python/Makefile.am:

* AM_CPPFLAGS should be used instead of INCLUDES, as the latter is an
   obsolete name

* Moved $(LIBXML_CFLAGS) to AM_CFLAGS, to segregate CFLAGS from CPPFLAGS

* Because libxslt-py.c is (presumably) supposed to be generated every time
   at build time, don't bundle it in the dist tarball

* Use $(VAR) instead of @VAR@

* libxsltclass.py is a generated file, so it doesn't get qualified with
   $(srcdir)

* Use $(MKDIR_P) instead of (mkinstalldirs)

* Added an uninstall-local rule so that "make distcheck" passes

* Removed the $(srcdir) qualifications in the GENERATED file list, as
   these files may exist in builddir

* In the gen_prog rule, qualify the script invocation with $(srcdir), and
   set the SRCDIR environment variable so that the script can find the
   files it needs when builddir != srcdir

* Don't define an "all" target, as this steps on Automake's toes

python/generator.py:

* Get the source directory from the SRCDIR environment variable, and use
   it appropriately

python/tests/Makefile.am:

* Set CLEANFILES instead of defining a "clean" rule

* Use $(VAR) instead of @VAR@, $(MKDIR_P) instead of $(mkinstalldirs)

tests/*/Makefile.am, tests/exslt/*/Makefile.am:

* Need to clean up .memdump files for "make distcheck" to pass

* Don't define an "all" target, as this steps on Automake's toes

tests/REC/Makefile.am:

* Added two missing *.stand.out files to EXTRA_DIST

tests/XSLTMark/Makefile.am:

* Replaced the GNU-Make-specific %.out bit with a more broadly compatible
   rule

   (the "dummy" bit shuts up Automake)

* Use "$(xsltproc)" instead of "$(top_builddir)/xsltproc/xsltproc"

* Use a less $(MAKE)-heavy invocation in the "tests" target

* Replaced a conflicting "clean" target with CLEANFILES

* Added a dependency on $(xsltproc) to all the test targets

* Added a .PHONY target list

tests/docbook/Makefile.am:

* Ditched the "echo -n" bit, because it wasn't working as advertised

* Create output directories for out-of-source builds

* "$(basename $$i)" is a typo in a makefile

* Don't embed $(srcdir) in $out/$html/$fo/$msg/$xhtml, so that we can
   refer to these files in builddir or srcdir

* Add a trailing "echo" to complete the "echo -n"

* Don't output files unconditionally to srcdir (it may be read-only, for
   starters)

tests/plugins/Makefile.am:

* AM_CPPFLAGS should be used instead of INCLUDES, as the latter is an
   obsolete name

   (Note that the "$(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)" bit that was here
   can be dropped entirely, because these already appear in
   xmlsoft_org_xslt_testplugin_la_CFLAGS)

* Use noinst_LTLIBRARIES inside the WITH_MODULES conditional instead of
   EXTRA_LTLIBRARIES, as this is cleaner (and disallows building the plugin
   if module support is disabled)

* Need to clean up *.res files for "make distcheck" to pass

* Use the abs_builddir variable conveniently provided to us by Automake
   instead of a GNU Make $(shell ...) construct

xslt-config.in:

* Add EXTRA_LIBS (-lrt on my system), as this is a required dependency
   when client applications link against -lxslt

xsltproc/Makefile.am:

* AM_CPPFLAGS should be used instead of INCLUDES, as the latter is an
   obsolete name

* Moved $(LIBXML_CFLAGS) into AM_CFLAGS

* Use $(VAR) instead of @VAR@

* Need to clean .memdump for "make distcheck" to pass

* Added rules to build lib[e]xslt.la if needed, which allows test
   makefiles to build xsltproc on the fly even if nothing else has been
   built already

* Create .memdump file in the "tests" target, as it's being grepped
   afterward

2 files changed, 225 insertions, 95 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index ff641656..83403d2e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -22,30 +22,124 @@ APIPAGES=APIconstructors.html APIfiles.html APIfunctions.html \
 EAPIPAGES=EXSLT/APIconstructors.html EXSLT/APIfiles.html \
 	 EXSLT/APIfunctions.html EXSLT/APIsymbols.html EXSLT/APIchunk0.html
 
-EXTRA_DIST =			\
-	api.xsl			\
-	apibuild.py		\
-	EXSLT/*.html		\
-	EXSLT/html/*.html	\
-	EXSLT/html/*.png	\
-	EXSLT/libexslt-api.xml	\
-	EXSLT/libexslt-refs.xml	\
-	libxslt-api.xml		\
-	libxslt-refs.xml	\
-	symbols.xml		\
-	checkapisym.xsl		\
-	syms.xsl		\
-	libxslt.xsa		\
-	newapi.xsl		\
-	news.xsl		\
-	search.xml		\
-	site.xsl		\
-	xslt.html		\
+EXTRA_DIST =				\
+	$(PAGES)			\
+	$(EPAGES)			\
+	$(EAPIPAGES)			\
+	APIchunk0.html			\
+	APIchunk1.html			\
+	APIchunk2.html			\
+	APIchunk3.html			\
+	APIchunk4.html			\
+	APIchunk5.html			\
+	APIchunk6.html			\
+	APIchunk7.html			\
+	APIchunk8.html			\
+	APIchunk9.html			\
+	APIchunk10.html			\
+	APIchunk11.html			\
+	APIchunk12.html			\
+	APIchunk13.html			\
+	APIconstructors.html		\
+	APIfiles.html			\
+	APIfunctions.html		\
+	APIsymbols.html			\
+	EXSLT/exslt.html		\
+	EXSLT/html/book1.html		\
+	EXSLT/html/home.png		\
+	EXSLT/html/index.html		\
+	EXSLT/html/left.png		\
+	EXSLT/html/libexslt-exslt.html	\
+	EXSLT/html/libexslt-exsltexports.html \
+	EXSLT/html/libexslt-lib.html	\
+	EXSLT/html/right.png		\
+	EXSLT/html/up.png		\
+	EXSLT/libexslt-api.xml		\
+	EXSLT/libexslt-refs.xml		\
+	Libxslt-Logo-180x168.gif	\
+	Libxslt-Logo-90x34.gif		\
+	api.xsl				\
+	apibuild.py			\
+	checkapisym.xsl			\
+	contexts.gif			\
+	docbook.html			\
+	duck.png			\
+	epatents.png			\
+	extensions.html			\
+	gnome2.png			\
+	html/book1.html			\
+	html/home.png			\
+	html/index.html			\
+	html/left.png			\
+	html/libxslt-attributes.html	\
+	html/libxslt-documents.html	\
+	html/libxslt-extensions.html	\
+	html/libxslt-extra.html		\
+	html/libxslt-functions.html	\
+	html/libxslt-imports.html	\
+	html/libxslt-keys.html		\
+	html/libxslt-lib.html		\
+	html/libxslt-namespaces.html	\
+	html/libxslt-numbersInternals.html \
+	html/libxslt-pattern.html	\
+	html/libxslt-preproc.html	\
+	html/libxslt-security.html	\
+	html/libxslt-templates.html	\
+	html/libxslt-transform.html	\
+	html/libxslt-variables.html	\
+	html/libxslt-xslt.html		\
+	html/libxslt-xsltInternals.html	\
+	html/libxslt-xsltexports.html	\
+	html/libxslt-xsltlocale.html	\
+	html/libxslt-xsltutils.html	\
+	html/right.png			\
+	html/up.png			\
+	images/callouts/1.png		\
+	images/callouts/10.png		\
+	images/callouts/2.png		\
+	images/callouts/3.png		\
+	images/callouts/4.png		\
+	images/callouts/5.png		\
+	images/callouts/6.png		\
+	images/callouts/7.png		\
+	images/callouts/8.png		\
+	images/callouts/9.png		\
+	internals.html			\
+	libxslt-api.xml			\
+	libxslt-refs.xml		\
+	libxslt.xsa			\
+	newapi.xsl			\
+	news.xsl			\
+	node.gif			\
+	object.gif			\
+	processing.gif			\
+	python.html			\
+	redhat.gif			\
+	search.xml			\
+	site.xsl			\
+	smallfootonly.gif		\
+	stylesheet.gif			\
+	symbols.xml			\
+	syms.xsl			\
+	templates.gif			\
+	tutorial/libxslt_tutorial.c	\
+	tutorial/libxslttutorial.html	\
+	tutorial/libxslttutorial.xml	\
+	tutorial2/libxslt_pipes.c	\
+	tutorial2/libxslt_pipes.html	\
+	tutorial2/libxslt_pipes.xml	\
+	w3c.png				\
+	xsa.xsl				\
+	xslt.html			\
+	xsltproc.1			\
+	xsltproc.html			\
 	xsltproc.xml
 
 man_MANS = xsltproc.1
 
-all:	web ../NEWS libxslt.xsa $(man_MANS)
+xsltproc = $(top_builddir)/xsltproc/xsltproc
+
+all-local:	web ../NEWS libxslt.xsa $(man_MANS)
 
 api:	libxslt-api.xml libxslt-refs.xml $(APIPAGES) search.php \
         html/index.html $(WIN32_DIR)/libxslt.def.src
@@ -55,147 +149,180 @@ eapi:	EXSLT/libexslt-api.xml EXSLT/libexslt-refs.xml $(EAPIPAGES) \
 
 web: $(PAGES) $(EPAGES)
 
-$(PAGES): xslt.html $(srcdir)/site.xsl
-	-@(if [ -x $(bindir)/xsltproc ] ; then \
+$(PAGES): $(srcdir)/xslt.html $(srcdir)/site.xsl
+	-@(if [ -x $(xsltproc) ] ; then \
 	  echo "Rebuilding the HTML Web pages from xslt.html" ; \
-	  $(bindir)/xsltproc --nonet --html $(srcdir)/site.xsl \
-	    xslt.html > index.html ; fi )
-	-@(if [ -x $(bindir)/xmllint ] ; then \
+	  $(xsltproc) --nonet --html $(srcdir)/site.xsl \
+	    $(srcdir)/xslt.html > index.html ; fi )
+	-@(if [ -x $(XMLLINT) ] ; then \
 	  echo "Validating the HTML Web pages" ; \
-	  $(bindir)/xmllint --nonet --valid --noout $(PAGES) ; fi );
+	  $(XMLLINT) --nonet --valid --noout $(PAGES) ; fi );
 
-$(EPAGES): EXSLT/exslt.html $(srcdir)/site.xsl
+$(EPAGES): $(srcdir)/EXSLT/exslt.html $(srcdir)/site.xsl
 	 -@(if [ ! -d EXSLT/html ] ; then \
 	   mkdir -p EXSLT/html ; fi )
-	 -@(if [ -x $(bindir)/xsltproc ] ; then \
+	 -@(if [ -x $(xsltproc) ] ; then \
 	   echo "Rebuilding the HTML Web pages from exslt.html" ; \
-	   $(bindir)/xsltproc --nonet --html \
+	   $(xsltproc) --nonet --html \
 		--stringparam dirname EXSLT/ \
 		--stringparam libname libexslt \
 		--stringparam logo_base ../ \
 		$(srcdir)/site.xsl \
-		EXSLT/exslt.html > EXSLT/index.html ; fi )
-	 -@(if [ -x $(bindir)/xmllint ] ; then \
+		$(srcdir)/EXSLT/exslt.html > EXSLT/index.html ; fi )
+	 -@(if [ -x $(XMLLINT) ] ; then \
 	   echo "Validating the HTML Web pages" ; \
-	   $(bindir)/xmllint --nonet --valid --noout $(EPAGES) ; fi );
+	   $(XMLLINT) --nonet --valid --noout $(EPAGES) ; fi );
 
-../NEWS: $(srcdir)/news.xsl news.html
-	-@(if [ -x $(bindir)/xsltproc ] ; then \
-	  $(bindir)/xsltproc --nonet $(srcdir)/news.xsl \
-	    news.html > ../NEWS ; fi );
+../NEWS: $(srcdir)/news.xsl $(srcdir)/news.html
+	-@(if [ -x $(xsltproc) ] ; then \
+	  $(xsltproc) --nonet $(srcdir)/news.xsl \
+	    $(srcdir)/news.html > ../NEWS ; fi );
 
-libxslt.xsa: $(srcdir)/xsa.xsl news.html
-	-@(if [ -x $(bindir)/xsltproc ] ; then \
-	  $(bindir)/xsltproc --nonet $(srcdir)/xsa.xsl \
+libxslt.xsa: $(srcdir)/xsa.xsl $(srcdir)/news.html
+	-@(if [ -x $(xsltproc) ] ; then \
+	  $(xsltproc) --nonet $(srcdir)/xsa.xsl \
 	    news.html > libxslt.xsa ; fi );
 
 $(APIPAGES): libxslt-refs.xml site.xsl api.xsl $(srcdir)/site.xsl \
 	     $(srcdir)/api.xsl
-	-@(if [ -x $(bindir)/xsltproc ] ; then \
+	-@(if [ -x $(xsltproc) ] ; then \
 	  echo "Rebuilding the HTML API pages from libxslt-refs.xml" ; \
-	  $(bindir)/xsltproc --nonet --html \
+	  $(xsltproc) --nonet --html \
 			     $(srcdir)/api.xsl \
-			     xslt.html ; fi );
-	-@(if [ -x $(bindir)/xmllint ] ; then \
+			     $(srcdir)/xslt.html ; fi );
+	-@(if [ -x $(XMLLINT) ] ; then \
 	  echo "Validating the HTML API pages" ; \
-	  $(bindir)/xmllint --nonet --valid --noout API*.html; fi );
+	  $(XMLLINT) --nonet --valid --noout API*.html; fi );
 
 $(EAPIPAGES): EXSLT/libexslt-refs.xml site.xsl api.xsl
-	-@(if [ -x $(bindir)/xsltproc ] ; then \
+	-@(if [ -x $(xsltproc) ] ; then \
 	  echo "Rebuilding the HTML API pages from libexslt-refs.xml" ; \
-	  $(bindir)/xsltproc --nonet --html --output EXSLT/ \
+	  $(xsltproc) --nonet --html --output EXSLT/ \
 			     --stringparam libname libexslt \
 			     --stringparam dirname EXSLT/ \
 			     --stringparam logo_base ../ \
 			     $(srcdir)/api.xsl \
-			     EXSLT/exslt.html ; fi );
+			     $(srcdir)/EXSLT/exslt.html ; fi );
 
 html/index.html: libxslt-api.xml $(srcdir)/newapi.xsl
-	-@(if [ -x $(bindir)/xsltproc ] ; then \
+	-@(if [ -x $(xsltproc) ] ; then \
 	  echo "Rebuilding the HTML pages from the XSLT API" ; \
-	  $(bindir)/xsltproc --nonet \
-			     $(srcdir)/newapi.xsl libxslt-api.xml ; fi );
-	-@(if [ -x $(bindir)/xmllint ] ; then \
+	  $(xsltproc) --nonet \
+			     $(srcdir)/newapi.xsl $(srcdir)/libxslt-api.xml ; fi );
+	-@(if [ -x $(XMLLINT) ] ; then \
 	  echo "Validating the resulting XHTML pages" ; \
-	  $(bindir)/xmllint --nonet --valid --noout html/*.html ; fi );
+	  $(XMLLINT) --nonet --valid --noout html/*.html ; fi );
 
 wiki: libxslt-api.xml $(srcdir)/wiki.xsl
-	-@(if [ -x $(bindir)/xsltproc ] ; then \
+	-@(if [ -x $(xsltproc) ] ; then \
 		echo "Rebuilding the wiki HTML pages from the XSLT API" ; \
-		$(bindir)/xsltproc --nonet $(srcdir)/wiki.xsl libxslt-api.xml; fi )
+		$(xsltproc) --nonet $(srcdir)/wiki.xsl $(srcdir)/libxslt-api.xml; fi )
 
 EXSLT/html/index.html: EXSLT/libexslt-api.xml \
 	$(srcdir)/newapi.xsl
-	-@(if [ -x $(bindir)/xsltproc ] ; then \
+	-@(if [ -x $(xsltproc) ] ; then \
 	  echo "Rebuilding the HTML pages from the EXSLT API" ; \
-	  $(bindir)/xsltproc --nonet --output EXSLT/ \
+	  $(xsltproc) --nonet --output EXSLT/ \
 			     --stringparam libname libexslt \
 			     --stringparam dirname EXSLT/ \
 			     --stringparam logo_base ../../ \
 			     $(srcdir)/newapi.xsl \
-			     EXSLT/libexslt-api.xml ; fi );
-	-@(if [ -x $(bindir)/xmllint ] ; then \
+			     $(srcdir)/EXSLT/libexslt-api.xml ; fi );
+	-@(if [ -x $(XMLLINT) ] ; then \
 	  echo "Validating the resulting XHTML pages" ; \
-	  $(bindir)/xmllint --nonet --valid --noout EXSLT/html/*.html ; fi );
+	  $(XMLLINT) --nonet --valid --noout EXSLT/html/*.html ; fi );
 
 
 libxslt-api.xml libxslt-refs.xml EXSLT/libexslt-api.xml \
   EXSLT/libexslt-refs.xml ../libxslt/libxslt.syms : $(srcdir)/apibuild.py $(top_srcdir)/libxslt/*.h \
 		$(top_srcdir)/libxslt/*.c $(top_srcdir)/libexslt/*.h \
 		$(top_srcdir)/libexslt/*.c
-	-($(srcdir)/apibuild.py)
-	($(XSLTPROC) checkapisym.xsl libxslt-api.xml)
-	($(XSLTPROC) -o ../libxslt/libxslt.syms syms.xsl symbols.xml)
+	-(cd $(srcdir) && ./apibuild.py)
+	($(XSLTPROC) $(srcdir)/checkapisym.xsl $(srcdir)/libxslt-api.xml)
+	($(XSLTPROC) -o ../libxslt/libxslt.syms $(srcdir)/syms.xsl $(srcdir)/symbols.xml)
 
-xsltproc.1: xsltproc.xml
-	-@(xsltproc --nonet xsltproc.xml)
+xsltproc.1: $(srcdir)/xsltproc.xml
+	-@(xsltproc --nonet $(srcdir)/xsltproc.xml)
 
 # Note that in the following, xmllint output is piped to xsltproc
 search.php: $(srcdir)/api.xsl $(srcdir)/site.xsl $(srcdir)/search.templ \
             $(srcdir)/search.xml $(srcdir)/search.php.inc
-	-@(if test -x $(bindir)/xmllint -a -x $(bindir)/xsltproc; then \
+	-@(if test -x $(XMLLINT) -a -x $(xsltproc); then \
 	   echo "Rebuilding search.php" ; \
-	   $(bindir)/xmllint --xinclude --nonet \
+	   $(XMLLINT) --xinclude --nonet \
 	                      $(srcdir)/search.xml | \
-	   $(bindir)/xsltproc --nonet - search.templ \
+	   $(xsltproc) --nonet - search.templ \
 			      > search.php ; else \
 	   echo "Unable to find xmllint or xsltproc in $(bindir)" ; fi)
 
 $(WIN32_DIR)/libxslt.def.src: libxslt-api.xml
-	-@(if [ -x $(bindir)/xsltproc ] ; then \
-	  $(bindir)/xsltproc -o $(WIN32_DIR)/libxslt.def.src \
-	  --nonet $(WIN32_DIR)/defgen.xsl libxslt-api.xml ; fi )
+	-@(if [ -x $(xsltproc) ] ; then \
+	  $(xsltproc) -o $(WIN32_DIR)/libxslt.def.src \
+	  --nonet $(WIN32_DIR)/defgen.xsl $(srcdir)/libxslt-api.xml ; fi )
 
 $(WIN32_DIR)/libexslt.def.src: EXSLT/libexslt-api.xml
-	-@(if [ -x $(bindir)/xsltproc ] ; then \
-	  $(bindir)/xsltproc -o $(WIN32_DIR)/libexslt.def.src \
-	  --nonet $(WIN32_DIR)/defgen.xsl EXSLT/libexslt-api.xml ; fi )
+	-@(if [ -x $(xsltproc) ] ; then \
+	  $(xsltproc) -o $(WIN32_DIR)/libexslt.def.src \
+	  --nonet $(WIN32_DIR)/defgen.xsl $(srcdir)/EXSLT/libexslt-api.xml ; fi )
 
 clean-local:
-	rm -f *~ *.bak *.hierarchy *.signals *-unused.txt
+	rm -f *~ *.1 *.bak *.hierarchy *.signals *-unused.txt
 
-maintainer-clean-local: clean
+distclean-local:
+	if test ! -r Makefile.am ; then \
+		rm -f *.html *.templ *.xsa ; \
+		rm -rf EXSLT html ; \
+	fi
 
 rebuild: api eapi all
 
+wildcards =			\
+	*.1			\
+	*.gif			\
+	*.html			\
+	*.png			\
+	*.xsl			\
+	EXSLT/*.html		\
+	EXSLT/html/*.html	\
+	EXSLT/html/*.png	\
+	html/*.html		\
+	html/*.png		\
+	images/callouts/*.png	\
+	tutorial*/libxslt*
+
+# This target verifies that EXTRA_DIST contains all the files matched by
+# the above list of wildcards. Note that this will only work properly when
+# srcdir = builddir.
+#
+check-extra-dist:
+	@for a in $(wildcards) ; do \
+		if test ! -f "$$a" ; then \
+			echo "not found: $$a" ; \
+			continue ; \
+		fi ; \
+		present= ; \
+		for b in $(EXTRA_DIST) ; do \
+			test "$$a" = "$$b" && present=1 && break ; \
+		done ; \
+		test -n "$$present" || echo "not in EXTRA_DIST: $$a" ; \
+	done
+
 install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(HTML_DIR)
-	-@INSTALL@ -m 0644 $(srcdir)/*.html $(DESTDIR)$(HTML_DIR)
-	-@INSTALL@ -m 0644 $(srcdir)/*.gif $(DESTDIR)$(HTML_DIR)
-	$(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/html
-	-@INSTALL@ -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(HTML_DIR)/html
-	-@INSTALL@ -m 0644 $(srcdir)/html/*.png $(DESTDIR)$(HTML_DIR)/html
-	-@INSTALL@ -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(HTML_DIR)/html
-	$(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/EXSLT
-	-@INSTALL@ -m 0644 $(srcdir)/EXSLT/*.html $(DESTDIR)$(HTML_DIR)/EXSLT
-	$(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/tutorial
-	-@INSTALL@ -m 0644 $(srcdir)/tutorial/* $(DESTDIR)$(HTML_DIR)/tutorial
-	$(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/tutorial2
-	-@INSTALL@ -m 0644 $(srcdir)/tutorial2/* $(DESTDIR)$(HTML_DIR)/tutorial2
-
-dist-hook:
-	(cd $(srcdir) ; tar cvf - *.1 *.html site.xsl news.xsl xsa.xsl \
-	  *.gif *.png images html/*.html html/*.png tutorial*/libxslt*) | \
-	  (cd $(distdir); tar xf -)
-
-.PHONY : html EXSLT EXSLT/html
+	$(MKDIR_P) $(DESTDIR)$(HTML_DIR)
+	-$(INSTALL) -m 0644 $(srcdir)/*.html $(DESTDIR)$(HTML_DIR)
+	-$(INSTALL) -m 0644 $(srcdir)/*.gif $(DESTDIR)$(HTML_DIR)
+	$(MKDIR_P) $(DESTDIR)$(HTML_DIR)/html
+	-$(INSTALL) -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(HTML_DIR)/html
+	-$(INSTALL) -m 0644 $(srcdir)/html/*.png $(DESTDIR)$(HTML_DIR)/html
+	-$(INSTALL) -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(HTML_DIR)/html
+	$(MKDIR_P) $(DESTDIR)$(HTML_DIR)/EXSLT
+	-$(INSTALL) -m 0644 $(srcdir)/EXSLT/*.html $(DESTDIR)$(HTML_DIR)/EXSLT
+	$(MKDIR_P) $(DESTDIR)$(HTML_DIR)/tutorial
+	-$(INSTALL) -m 0644 $(srcdir)/tutorial/* $(DESTDIR)$(HTML_DIR)/tutorial
+	$(MKDIR_P) $(DESTDIR)$(HTML_DIR)/tutorial2
+	-$(INSTALL) -m 0644 $(srcdir)/tutorial2/* $(DESTDIR)$(HTML_DIR)/tutorial2
+
+uninstall-local:
+	rm -rf $(DESTDIR)$(HTML_DIR)
+
+.PHONY : api eapi web wiki rebuild check-extra-dist
diff --git a/doc/symbols.xml b/doc/symbols.xml
index 9e199e86..d808c0ae 100644
--- a/doc/symbols.xml
+++ b/doc/symbols.xml
@@ -310,4 +310,7 @@
     <!-- lxml was using it even if not pusblished -->
     <symbol file="transform">xsltProcessOneNode</symbol>
   </release>
+  <release version="1.1.27">
+    <symbol file="xsltlocale">xsltFreeLocales</symbol>
+  </release>
 </symbols>