regen

1 files changed, 25 insertions, 46 deletions

diff --git a/xserver/test/xi2/Makefile.in b/xserver/test/xi2/Makefile.in
index 72f78d50d..d3dbc2d1c 100644
--- a/xserver/test/xi2/Makefile.in
+++ b/xserver/test/xi2/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.2 from Makefile.am.
+# Makefile.in generated by automake 1.12.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -67,10 +67,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/xorg-tls.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/xorg-tls.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -108,7 +105,7 @@ am__protocol_xigetclientpointer_SOURCES_DIST = protocol-common.h \
 protocol_xigetclientpointer_OBJECTS =  \
 	$(am_protocol_xigetclientpointer_OBJECTS)
 @ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@protocol_xigetclientpointer_DEPENDENCIES = $(am__DEPENDENCIES_3)
-protocol_xigetclientpointer_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+protocol_xigetclientpointer_LINK = $(LIBTOOL) $(AM_V_lt) \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(protocol_xigetclientpointer_LDFLAGS) \
 	$(LDFLAGS) -o $@
@@ -120,7 +117,7 @@ am__protocol_xigetselectedevents_SOURCES_DIST = protocol-common.h \
 protocol_xigetselectedevents_OBJECTS =  \
 	$(am_protocol_xigetselectedevents_OBJECTS)
 @ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@protocol_xigetselectedevents_DEPENDENCIES = $(am__DEPENDENCIES_3)
-protocol_xigetselectedevents_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+protocol_xigetselectedevents_LINK = $(LIBTOOL) $(AM_V_lt) \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(protocol_xigetselectedevents_LDFLAGS) \
 	$(LDFLAGS) -o $@
@@ -132,7 +129,7 @@ am__protocol_xipassivegrabdevice_SOURCES_DIST = protocol-common.h \
 protocol_xipassivegrabdevice_OBJECTS =  \
 	$(am_protocol_xipassivegrabdevice_OBJECTS)
 @ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@protocol_xipassivegrabdevice_DEPENDENCIES = $(am__DEPENDENCIES_3)
-protocol_xipassivegrabdevice_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+protocol_xipassivegrabdevice_LINK = $(LIBTOOL) $(AM_V_lt) \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(protocol_xipassivegrabdevice_LDFLAGS) \
 	$(LDFLAGS) -o $@
@@ -143,10 +140,9 @@ am__protocol_xiquerydevice_SOURCES_DIST = protocol-common.h \
 @ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@	protocol-xiquerydevice.$(OBJEXT)
 protocol_xiquerydevice_OBJECTS = $(am_protocol_xiquerydevice_OBJECTS)
 @ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@protocol_xiquerydevice_DEPENDENCIES = $(am__DEPENDENCIES_3)
-protocol_xiquerydevice_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(protocol_xiquerydevice_LDFLAGS) \
-	$(LDFLAGS) -o $@
+protocol_xiquerydevice_LINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(protocol_xiquerydevice_LDFLAGS) $(LDFLAGS) -o $@
 am__protocol_xiquerypointer_SOURCES_DIST = protocol-common.h \
 	protocol-common.c protocol-xiquerypointer.c
 @ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@am_protocol_xiquerypointer_OBJECTS =  \
@@ -155,7 +151,7 @@ am__protocol_xiquerypointer_SOURCES_DIST = protocol-common.h \
 protocol_xiquerypointer_OBJECTS =  \
 	$(am_protocol_xiquerypointer_OBJECTS)
 @ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@protocol_xiquerypointer_DEPENDENCIES = $(am__DEPENDENCIES_3)
-protocol_xiquerypointer_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+protocol_xiquerypointer_LINK = $(LIBTOOL) $(AM_V_lt) \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(protocol_xiquerypointer_LDFLAGS) \
 	$(LDFLAGS) -o $@
@@ -167,7 +163,7 @@ am__protocol_xiqueryversion_SOURCES_DIST = protocol-common.h \
 protocol_xiqueryversion_OBJECTS =  \
 	$(am_protocol_xiqueryversion_OBJECTS)
 @ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@protocol_xiqueryversion_DEPENDENCIES = $(am__DEPENDENCIES_3)
-protocol_xiqueryversion_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+protocol_xiqueryversion_LINK = $(LIBTOOL) $(AM_V_lt) \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(protocol_xiqueryversion_LDFLAGS) \
 	$(LDFLAGS) -o $@
@@ -179,7 +175,7 @@ am__protocol_xiselectevents_SOURCES_DIST = protocol-common.h \
 protocol_xiselectevents_OBJECTS =  \
 	$(am_protocol_xiselectevents_OBJECTS)
 @ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@protocol_xiselectevents_DEPENDENCIES = $(am__DEPENDENCIES_3)
-protocol_xiselectevents_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+protocol_xiselectevents_LINK = $(LIBTOOL) $(AM_V_lt) \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(protocol_xiselectevents_LDFLAGS) \
 	$(LDFLAGS) -o $@
@@ -191,7 +187,7 @@ am__protocol_xisetclientpointer_SOURCES_DIST = protocol-common.h \
 protocol_xisetclientpointer_OBJECTS =  \
 	$(am_protocol_xisetclientpointer_OBJECTS)
 @ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@protocol_xisetclientpointer_DEPENDENCIES = $(am__DEPENDENCIES_3)
-protocol_xisetclientpointer_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+protocol_xisetclientpointer_LINK = $(LIBTOOL) $(AM_V_lt) \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(protocol_xisetclientpointer_LDFLAGS) \
 	$(LDFLAGS) -o $@
@@ -202,16 +198,15 @@ am__protocol_xiwarppointer_SOURCES_DIST = protocol-common.h \
 @ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@	protocol-xiwarppointer.$(OBJEXT)
 protocol_xiwarppointer_OBJECTS = $(am_protocol_xiwarppointer_OBJECTS)
 @ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@protocol_xiwarppointer_DEPENDENCIES = $(am__DEPENDENCIES_3)
-protocol_xiwarppointer_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(protocol_xiwarppointer_LDFLAGS) \
-	$(LDFLAGS) -o $@
+protocol_xiwarppointer_LINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(protocol_xiwarppointer_LDFLAGS) $(LDFLAGS) -o $@
 xi2_SOURCES = xi2.c
 xi2_OBJECTS = xi2.$(OBJEXT)
 @ENABLE_UNIT_TESTS_TRUE@@HAVE_LD_WRAP_TRUE@xi2_DEPENDENCIES = $(am__DEPENDENCIES_3)
-xi2_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(xi2_LDFLAGS) $(LDFLAGS) -o $@
+xi2_LINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(xi2_LDFLAGS) \
+	$(LDFLAGS) -o $@
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -230,18 +225,17 @@ am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC      " $@;
 am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
@@ -287,8 +281,6 @@ APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
 APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
-AR = @AR@
-AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -322,7 +314,6 @@ DGA_CFLAGS = @DGA_CFLAGS@
 DGA_LIBS = @DGA_LIBS@
 DIX_CFLAGS = @DIX_CFLAGS@
 DIX_LIB = @DIX_LIB@
-DLLTOOL = @DLLTOOL@
 DLOPEN_LIBS = @DLOPEN_LIBS@
 DMXEXAMPLES_DEP_CFLAGS = @DMXEXAMPLES_DEP_CFLAGS@
 DMXEXAMPLES_DEP_LIBS = @DMXEXAMPLES_DEP_LIBS@
@@ -342,15 +333,12 @@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DRI_CFLAGS = @DRI_CFLAGS@
 DRI_DRIVER_PATH = @DRI_DRIVER_PATH@
 DRI_LIBS = @DRI_LIBS@
-DSYMUTIL = @DSYMUTIL@
 DTRACE = @DTRACE@
-DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 FONT100DPIDIR = @FONT100DPIDIR@
@@ -384,7 +372,6 @@ KDRIVE_PURE_LIBS = @KDRIVE_PURE_LIBS@
 KHRONOS_OPENGL_REGISTRY_CFLAGS = @KHRONOS_OPENGL_REGISTRY_CFLAGS@
 KHRONOS_OPENGL_REGISTRY_LIBS = @KHRONOS_OPENGL_REGISTRY_LIBS@
 KHRONOS_SPEC_DIR = @KHRONOS_SPEC_DIR@
-LD = @LD@
 LDFLAGS = @LDFLAGS@
 LD_EXPORT_SYMBOLS_FLAG = @LD_EXPORT_SYMBOLS_FLAG@
 LEX = @LEX@
@@ -399,31 +386,25 @@ LIBSHA1_LIBS = @LIBSHA1_LIBS@
 LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
-LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_OPTS = @LT_OPTS@
 MAINT = @MAINT@
 MAIN_LIB = @MAIN_LIB@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MAN_SUBSTS = @MAN_SUBSTS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
 OBJC = @OBJC@
 OBJCCLD = @OBJCCLD@
 OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJCLINK = @OBJCLINK@
-OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
 OPENSSL_LIBS = @OPENSSL_LIBS@
 OS_LIB = @OS_LIB@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -545,9 +526,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@