xserver xkeyboard-config mesa git update 28 Mar 2011

2 files changed, 101 insertions, 101 deletions

diff --git a/xorg-server/test/Makefile.am b/xorg-server/test/Makefile.am
index ea886a961..f3265b788 100644
--- a/xorg-server/test/Makefile.am
+++ b/xorg-server/test/Makefile.am
@@ -1,46 +1,46 @@
-if ENABLE_UNIT_TESTS

-if HAVE_GLIB

-if HAVE_LD_WRAP

-SUBDIRS= . xi2

-check_PROGRAMS = xkb input xtest list

-check_LTLIBRARIES = libxservertest.la

-

-TESTS=$(check_PROGRAMS)

-

-AM_CFLAGS = $(DIX_CFLAGS) $(GLIB_CFLAGS) @XORG_CFLAGS@

-INCLUDES = @XORG_INCS@

-TEST_LDADD=libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLIB_LIBS)

-

-if SPECIAL_DTRACE_OBJECTS

-TEST_LDADD += $(OS_LIB) $(DIX_LIB)

-endif

-

-xkb_LDADD=$(TEST_LDADD)

-input_LDADD=$(TEST_LDADD)

-xtest_LDADD=$(TEST_LDADD)

-list_LDADD=$(TEST_LDADD)

-

-libxservertest_la_LIBADD = \

-            $(XSERVER_LIBS) \

-            $(top_builddir)/hw/xfree86/loader/libloader.la \

-            $(top_builddir)/hw/xfree86/os-support/libxorgos.la \

-            $(top_builddir)/hw/xfree86/common/libcommon.la \

-            $(top_builddir)/hw/xfree86/parser/libxf86config_internal.la \

-            $(top_builddir)/hw/xfree86/dixmods/libdixmods.la \

-            $(top_builddir)/hw/xfree86/modes/libxf86modes.la \

-            $(top_builddir)/hw/xfree86/ramdac/libramdac.la \

-            $(top_builddir)/hw/xfree86/ddc/libddc.la \

-            $(top_builddir)/hw/xfree86/i2c/libi2c.la \

-            $(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la \

-            $(top_builddir)/hw/xfree86/libxorg.la \

-            $(top_builddir)/mi/libmi.la \

-            $(top_builddir)/os/libos.la \

-            @XORG_LIBS@

-endif

-endif

-endif

-

-CLEANFILES=libxservertest.c

-

-libxservertest.c:

-	touch $@

+if ENABLE_UNIT_TESTS
+if HAVE_GLIB
+if HAVE_LD_WRAP
+SUBDIRS= . xi2
+noinst_PROGRAMS = xkb input xtest list
+check_LTLIBRARIES = libxservertest.la
+
+TESTS=$(noinst_PROGRAMS)
+
+AM_CFLAGS = $(DIX_CFLAGS) $(GLIB_CFLAGS) @XORG_CFLAGS@
+INCLUDES = @XORG_INCS@
+TEST_LDADD=libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLIB_LIBS)
+
+if SPECIAL_DTRACE_OBJECTS
+TEST_LDADD += $(OS_LIB) $(DIX_LIB)
+endif
+
+xkb_LDADD=$(TEST_LDADD)
+input_LDADD=$(TEST_LDADD)
+xtest_LDADD=$(TEST_LDADD)
+list_LDADD=$(TEST_LDADD)
+
+libxservertest_la_LIBADD = \
+            $(XSERVER_LIBS) \
+            $(top_builddir)/hw/xfree86/loader/libloader.la \
+            $(top_builddir)/hw/xfree86/os-support/libxorgos.la \
+            $(top_builddir)/hw/xfree86/common/libcommon.la \
+            $(top_builddir)/hw/xfree86/parser/libxf86config_internal.la \
+            $(top_builddir)/hw/xfree86/dixmods/libdixmods.la \
+            $(top_builddir)/hw/xfree86/modes/libxf86modes.la \
+            $(top_builddir)/hw/xfree86/ramdac/libramdac.la \
+            $(top_builddir)/hw/xfree86/ddc/libddc.la \
+            $(top_builddir)/hw/xfree86/i2c/libi2c.la \
+            $(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la \
+            $(top_builddir)/hw/xfree86/libxorg.la \
+            $(top_builddir)/mi/libmi.la \
+            $(top_builddir)/os/libos.la \
+            @XORG_LIBS@
+endif
+endif
+endif
+
+CLEANFILES=libxservertest.c
+
+libxservertest.c:
+	touch $@
diff --git a/xorg-server/test/xi2/Makefile.am b/xorg-server/test/xi2/Makefile.am
index b7948b151..1b9bfe08e 100644
--- a/xorg-server/test/xi2/Makefile.am
+++ b/xorg-server/test/xi2/Makefile.am
@@ -1,55 +1,55 @@
-if ENABLE_UNIT_TESTS

-if HAVE_GLIB

-if HAVE_LD_WRAP

-check_PROGRAMS =  \

-	protocol-xiqueryversion \

-	protocol-xiquerydevice \

-	protocol-xiselectevents \

-	protocol-xigetselectedevents \

-        protocol-xisetclientpointer \

-        protocol-xigetclientpointer \

-        protocol-xiquerypointer \

-        protocol-xiwarppointer \

-        protocol-eventconvert

-

-TESTS=$(check_PROGRAMS)

-

-AM_CFLAGS = $(DIX_CFLAGS) $(GLIB_CFLAGS) @XORG_CFLAGS@

-INCLUDES = @XORG_INCS@

-TEST_LDADD=../libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLIB_LIBS)

-COMMON_SOURCES=protocol-common.h protocol-common.c

-

-if SPECIAL_DTRACE_OBJECTS

-TEST_LDADD += $(OS_LIB) $(DIX_LIB)

-endif

-

-protocol_xiqueryversion_LDADD=$(TEST_LDADD)

-protocol_xiquerydevice_LDADD=$(TEST_LDADD)

-protocol_xiselectevents_LDADD=$(TEST_LDADD)

-protocol_xigetselectedevents_LDADD=$(TEST_LDADD)

-protocol_xisetclientpointer_LDADD=$(TEST_LDADD)

-protocol_xigetclientpointer_LDADD=$(TEST_LDADD)

-protocol_xiquerypointer_LDADD=$(TEST_LDADD)

-protocol_xiwarppointer_LDADD=$(TEST_LDADD)

-protocol_eventconvert_LDADD=$(TEST_LDADD)

-

-protocol_xiqueryversion_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient

-protocol_xiquerydevice_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient

-protocol_xiselectevents_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,dixLookupWindow -Wl,-wrap,XISetEventMask

-protocol_xigetselectedevents_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient -Wl,-wrap,dixLookupWindow -Wl,-wrap,AddResource

-protocol_xisetclientpointer_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,dixLookupClient

-protocol_xigetclientpointer_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient -Wl,-wrap,dixLookupClient

-protocol_xiquerypointer_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient -Wl,-wrap,dixLookupWindow

-protocol_xiwarppointer_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient -Wl,-wrap,dixLookupWindow

-

-protocol_xiqueryversion_SOURCES=$(COMMON_SOURCES) protocol-xiqueryversion.c

-protocol_xiquerydevice_SOURCES=$(COMMON_SOURCES) protocol-xiquerydevice.c

-protocol_xiselectevents_SOURCES=$(COMMON_SOURCES) protocol-xiselectevents.c

-protocol_xigetselectedevents_SOURCES=$(COMMON_SOURCES) protocol-xigetselectedevents.c

-protocol_xisetclientpointer_SOURCES=$(COMMON_SOURCES) protocol-xisetclientpointer.c

-protocol_xigetclientpointer_SOURCES=$(COMMON_SOURCES) protocol-xigetclientpointer.c

-protocol_xiquerypointer_SOURCES=$(COMMON_SOURCES) protocol-xiquerypointer.c

-protocol_xiwarppointer_SOURCES=$(COMMON_SOURCES) protocol-xiwarppointer.c

-endif

-endif

-endif

+if ENABLE_UNIT_TESTS
+if HAVE_GLIB
+if HAVE_LD_WRAP
+noinst_PROGRAMS =  \
+	protocol-xiqueryversion \
+	protocol-xiquerydevice \
+	protocol-xiselectevents \
+	protocol-xigetselectedevents \
+        protocol-xisetclientpointer \
+        protocol-xigetclientpointer \
+        protocol-xiquerypointer \
+        protocol-xiwarppointer \
+        protocol-eventconvert
+
+TESTS=$(noinst_PROGRAMS)
+
+AM_CFLAGS = $(DIX_CFLAGS) $(GLIB_CFLAGS) @XORG_CFLAGS@
+INCLUDES = @XORG_INCS@
+TEST_LDADD=../libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLIB_LIBS)
+COMMON_SOURCES=protocol-common.h protocol-common.c
+
+if SPECIAL_DTRACE_OBJECTS
+TEST_LDADD += $(OS_LIB) $(DIX_LIB)
+endif
+
+protocol_xiqueryversion_LDADD=$(TEST_LDADD)
+protocol_xiquerydevice_LDADD=$(TEST_LDADD)
+protocol_xiselectevents_LDADD=$(TEST_LDADD)
+protocol_xigetselectedevents_LDADD=$(TEST_LDADD)
+protocol_xisetclientpointer_LDADD=$(TEST_LDADD)
+protocol_xigetclientpointer_LDADD=$(TEST_LDADD)
+protocol_xiquerypointer_LDADD=$(TEST_LDADD)
+protocol_xiwarppointer_LDADD=$(TEST_LDADD)
+protocol_eventconvert_LDADD=$(TEST_LDADD)
+
+protocol_xiqueryversion_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient
+protocol_xiquerydevice_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient
+protocol_xiselectevents_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,dixLookupWindow -Wl,-wrap,XISetEventMask
+protocol_xigetselectedevents_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient -Wl,-wrap,dixLookupWindow -Wl,-wrap,AddResource
+protocol_xisetclientpointer_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,dixLookupClient
+protocol_xigetclientpointer_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient -Wl,-wrap,dixLookupClient
+protocol_xiquerypointer_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient -Wl,-wrap,dixLookupWindow
+protocol_xiwarppointer_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient -Wl,-wrap,dixLookupWindow
+
+protocol_xiqueryversion_SOURCES=$(COMMON_SOURCES) protocol-xiqueryversion.c
+protocol_xiquerydevice_SOURCES=$(COMMON_SOURCES) protocol-xiquerydevice.c
+protocol_xiselectevents_SOURCES=$(COMMON_SOURCES) protocol-xiselectevents.c
+protocol_xigetselectedevents_SOURCES=$(COMMON_SOURCES) protocol-xigetselectedevents.c
+protocol_xisetclientpointer_SOURCES=$(COMMON_SOURCES) protocol-xisetclientpointer.c
+protocol_xigetclientpointer_SOURCES=$(COMMON_SOURCES) protocol-xigetclientpointer.c
+protocol_xiquerypointer_SOURCES=$(COMMON_SOURCES) protocol-xiquerypointer.c
+protocol_xiwarppointer_SOURCES=$(COMMON_SOURCES) protocol-xiwarppointer.c
+endif
+endif
+endif