[PATCH test/xts v2 02/20] Re-enable the ShapeExt tests

[Peter Harris]

Signed-off-by: Peter Harris <pharris at opentext.com>
Reviewed-by: Aaron Plattner <aplattner at nvidia.com>
---
 configure.ac           |    1 +
 xts5/Makefile.am       |    2 +-
 xts5/SHAPE/.gitignore  |   11 +++++++++++
 xts5/SHAPE/Makefile.am |   31 +++++++++++++++++++++++++++++++
 4 files changed, 44 insertions(+), 1 deletions(-)
 create mode 100644 xts5/SHAPE/.gitignore
 create mode 100644 xts5/SHAPE/Makefile.am

diff --git a/configure.ac b/configure.ac
index aecdaa0..a1b4b75 100644
--- a/configure.ac
+++ b/configure.ac
@@ -182,6 +182,7 @@ xts5/Xlib14/Makefile
 xts5/Xlib15/Makefile
 xts5/Xlib16/Makefile
 xts5/Xlib17/Makefile
+xts5/SHAPE/Makefile
 xts5/XIproto/Makefile
 xts5/XI/Makefile
 ])
diff --git a/xts5/Makefile.am b/xts5/Makefile.am
index 746c634..0b75838 100644
--- a/xts5/Makefile.am
+++ b/xts5/Makefile.am
@@ -2,7 +2,7 @@ include common.mk
 
 SUBDIRS = . fonts src scenarios Xproto Xopen Xlib3 Xlib4 Xlib5 Xlib6 \
 	Xlib7 Xlib8 Xlib9 Xlib10 Xlib11 Xlib12 Xlib13 Xlib14 Xlib15 \
-	Xlib16 Xlib17 XIproto XI
+	Xlib16 Xlib17 SHAPE XIproto XI
 noinst_HEADERS = include
 
 CLEANFILES = */*/tet_lock bin/xts-config bin/xts-run tetexec.cfg
diff --git a/xts5/SHAPE/.gitignore b/xts5/SHAPE/.gitignore
new file mode 100644
index 0000000..a4c67a3
--- /dev/null
+++ b/xts5/SHAPE/.gitignore
@@ -0,0 +1,11 @@
+XShapeCombineMask
+XShapeCombineRectangles
+XShapeCombineRegion
+XShapeCombineShape
+XShapeGetRectangles
+XShapeInputSelected
+XShapeOffsetShape
+XShapeQueryExtension
+XShapeQueryExtents
+XShapeQueryVersion
+XShapeSelectInput
diff --git a/xts5/SHAPE/Makefile.am b/xts5/SHAPE/Makefile.am
new file mode 100644
index 0000000..8d07550
--- /dev/null
+++ b/xts5/SHAPE/Makefile.am
@@ -0,0 +1,31 @@
+include ../common.mk
+AUTOMAKE_OPTIONS = subdir-objects
+
+AM_CFLAGS = -I$(top_srcdir)/include \
+	-I$(top_srcdir)/src/tet3/inc \
+	-I$(top_srcdir)/xts5/include \
+	$(XTS_CFLAGS)
+LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
+	$(top_builddir)/xts5/src/libxts5.la \
+	$(top_builddir)/xts5/src/libXtTest/libXtTest.la \
+	$(top_builddir)/src/tet3/apilib/libapi.la \
+	$(top_builddir)/src/tet3/apilib/libapi_s.la \
+	$(XTS_LIBS)
+
+testprogdir = $(libexecdir)/$(subdir)
+nobase_testprog_PROGRAMS = $(tprogs)
+BUILT_SOURCES = $(tprogs:=.c)
+EXTRA_DIST = $(addsuffix .m,$(filter-out %_m,$(tprogs)))
+DISTCLEANFILES = $(BUILT_SOURCES)
+
+tprogs = XShapeCombineMask \
+	XShapeCombineRectangles \
+	XShapeCombineRegion \
+	XShapeCombineShape \
+	XShapeGetRectangles \
+	XShapeInputSelected \
+	XShapeOffsetShape \
+	XShapeQueryExtension \
+	XShapeQueryExtents \
+	XShapeQueryVersion \
+	XShapeSelectInput
-- 
1.7.2.5