Updated to:

  libX11-1.3.3
  pixman-0.17.4

1 files changed, 15 insertions, 8 deletions

diff --git a/libX11/man/Makefile.in b/libX11/man/Makefile.in
index 2032f55bb..536f22835 100644
--- a/libX11/man/Makefile.in
+++ b/libX11/man/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -173,6 +173,7 @@ GREP = @GREP@
 GROFF = @GROFF@
 I18N_MODULE_LIBS = @I18N_MODULE_LIBS@
 INSTALL = @INSTALL@
+INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -205,6 +206,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
@@ -230,16 +232,12 @@ X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
 XDMCP_CFLAGS = @XDMCP_CFLAGS@
 XDMCP_LIBS = @XDMCP_LIBS@
 XERRORDB = @XERRORDB@
-XKBPROTO_CFLAGS = @XKBPROTO_CFLAGS@
-XKBPROTO_LIBS = @XKBPROTO_LIBS@
 XKBPROTO_REQUIRES = @XKBPROTO_REQUIRES@
 XKEYSYMDB = @XKEYSYMDB@
 XLOCALEDATADIR = @XLOCALEDATADIR@
 XLOCALEDIR = @XLOCALEDIR@
 XLOCALELIBDIR = @XLOCALELIBDIR@
 XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
-XPROTO_CFLAGS = @XPROTO_CFLAGS@
-XPROTO_LIBS = @XPROTO_LIBS@
 XTHREADLIB = @XTHREADLIB@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
@@ -264,7 +262,6 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -1527,6 +1524,13 @@ XmbResetIC_shadowmen = $(XmbResetIC_shadows:=.@LIB_MAN_SUFFIX@)
 XmbTextEscapement_shadowmen = $(XmbTextEscapement_shadows:=.@LIB_MAN_SUFFIX@)
 XmbTextExtents_shadowmen = $(XmbTextExtents_shadows:=.@LIB_MAN_SUFFIX@)
 XmbTextPerCharExtents_shadowmen = $(XmbTextPerCharExtents_shadows:=.@LIB_MAN_SUFFIX@)
+file_shadows = \
+    $(Compose_shadows)
+
+Compose_shadows = \
+    XCompose
+
+Compose_shadowmen = $(Compose_shadows:=.@FILE_MAN_SUFFIX@)
 all: all-recursive
 
 .SUFFIXES:
@@ -1615,7 +1619,7 @@ uninstall-libmanDATA:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -1640,7 +1644,7 @@ $(RECURSIVE_TARGETS):
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -1920,6 +1924,7 @@ uninstall-am: uninstall-filemanDATA uninstall-libmanDATA
 	uninstall uninstall-am uninstall-filemanDATA \
 	uninstall-libmanDATA
 
+@MANPAGES_TRUE@	       $(file_shadows:=.@FILE_MAN_SUFFIX@)
 
 .pre:
 	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
@@ -2210,6 +2215,8 @@ $(XmbTextExtents_shadowmen):
 	$(AM_V_GEN)echo ".so man$(LIB_MAN_DIR_SUFFIX)/XmbTextExtents.$(LIB_MAN_SUFFIX)" > $@
 $(XmbTextPerCharExtents_shadowmen):
 	$(AM_V_GEN)echo ".so man$(LIB_MAN_DIR_SUFFIX)/XmbTextPerCharExtents.$(LIB_MAN_SUFFIX)" > $@
+$(Compose_shadowmen):
+	$(AM_V_GEN)echo ".so man$(FILE_MAN_DIR_SUFFIX)/Compose.$(FILE_MAN_SUFFIX)" > $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.