xts: Actually wire up the xts shared libraries into the tests

Commit a2826324 only actually changed the Xproto tests to use the xts
shared libraries. This does it for the rest of the tests. On my x86_64
linux box compiling at the default -g -O2, the installed size has gone
from 237MB to 72MB. Yay.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>

18 files changed, 18 insertions, 54 deletions

diff --git a/xts5/XI/Makefile.am b/xts5/XI/Makefile.am
index fd26d149..000bbc24 100644
--- a/xts5/XI/Makefile.am
+++ b/xts5/XI/Makefile.am
@@ -6,9 +6,7 @@ AM_CFLAGS = -I$(top_srcdir)/include \
 	-I$(top_srcdir)/xts5/include \
 	$(XTS_CFLAGS)
 LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
-	$(top_builddir)/xts5/src/xim/libximtest.la \
-	$(top_builddir)/xts5/src/lib/libxtest.la \
-	$(top_builddir)/xts5/fonts/libfont.la \
+	$(top_builddir)/xts5/src/libxts5.la \
 	$(top_builddir)/src/tet3/apilib/libapi.la \
 	$(top_builddir)/src/tet3/apilib/libapi_s.la \
 	$(XTS_LIBS)
diff --git a/xts5/XIproto/Makefile.am b/xts5/XIproto/Makefile.am
index 1bbae4ae..b8248fd0 100644
--- a/xts5/XIproto/Makefile.am
+++ b/xts5/XIproto/Makefile.am
@@ -6,9 +6,7 @@ AM_CFLAGS = -I$(top_srcdir)/include \
 	-I$(top_srcdir)/xts5/include \
 	$(XTS_CFLAGS)
 LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
-	$(top_builddir)/xts5/src/libproto/libXst.la \
-	$(top_builddir)/xts5/src/lib/libxtest.la \
-	$(top_builddir)/xts5/fonts/libfont.la \
+	$(top_builddir)/xts5/src/libxts5proto.la \
 	$(top_builddir)/src/tet3/apilib/libapi.la \
 	$(top_builddir)/src/tet3/apilib/libapi_s.la \
 	$(XTS_LIBS)
diff --git a/xts5/Xlib10/Makefile.am b/xts5/Xlib10/Makefile.am
index 3af3e98c..3f99f17a 100644
--- a/xts5/Xlib10/Makefile.am
+++ b/xts5/Xlib10/Makefile.am
@@ -6,9 +6,7 @@ AM_CFLAGS = -I$(top_srcdir)/include \
 	-I$(top_srcdir)/xts5/include \
 	$(XTS_CFLAGS)
 LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
-	$(top_builddir)/xts5/src/xim/libximtest.la \
-	$(top_builddir)/xts5/src/lib/libxtest.la \
-	$(top_builddir)/xts5/fonts/libfont.la \
+	$(top_builddir)/xts5/src/libxts5.la \
 	$(top_builddir)/src/tet3/apilib/libapi.la \
 	$(top_builddir)/src/tet3/apilib/libapi_s.la \
 	$(XTS_LIBS)
diff --git a/xts5/Xlib11/Makefile.am b/xts5/Xlib11/Makefile.am
index b0175704..64237fad 100644
--- a/xts5/Xlib11/Makefile.am
+++ b/xts5/Xlib11/Makefile.am
@@ -6,9 +6,7 @@ AM_CFLAGS = -I$(top_srcdir)/include \
 	-I$(top_srcdir)/xts5/include \
 	$(XTS_CFLAGS)
 LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
-	$(top_builddir)/xts5/src/xim/libximtest.la \
-	$(top_builddir)/xts5/src/lib/libxtest.la \
-	$(top_builddir)/xts5/fonts/libfont.la \
+	$(top_builddir)/xts5/src/libxts5.la \
 	$(top_builddir)/src/tet3/apilib/libapi.la \
 	$(top_builddir)/src/tet3/apilib/libapi_s.la \
 	$(XTS_LIBS)
diff --git a/xts5/Xlib12/Makefile.am b/xts5/Xlib12/Makefile.am
index c23b01cd..755b1a7c 100644
--- a/xts5/Xlib12/Makefile.am
+++ b/xts5/Xlib12/Makefile.am
@@ -6,9 +6,7 @@ AM_CFLAGS = -I$(top_srcdir)/include \
 	-I$(top_srcdir)/xts5/include \
 	$(XTS_CFLAGS)
 LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
-	$(top_builddir)/xts5/src/xim/libximtest.la \
-	$(top_builddir)/xts5/src/lib/libxtest.la \
-	$(top_builddir)/xts5/fonts/libfont.la \
+	$(top_builddir)/xts5/src/libxts5.la \
 	$(top_builddir)/src/tet3/apilib/libapi.la \
 	$(top_builddir)/src/tet3/apilib/libapi_s.la \
 	$(XTS_LIBS)
diff --git a/xts5/Xlib13/Makefile.am b/xts5/Xlib13/Makefile.am
index d98e343f..ac9cd5ce 100644
--- a/xts5/Xlib13/Makefile.am
+++ b/xts5/Xlib13/Makefile.am
@@ -6,9 +6,7 @@ AM_CFLAGS = -I$(top_srcdir)/include \
 	-I$(top_srcdir)/xts5/include \
 	$(XTS_CFLAGS)
 LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
-	$(top_builddir)/xts5/src/xim/libximtest.la \
-	$(top_builddir)/xts5/src/lib/libxtest.la \
-	$(top_builddir)/xts5/fonts/libfont.la \
+	$(top_builddir)/xts5/src/libxts5.la \
 	$(top_builddir)/src/tet3/apilib/libapi.la \
 	$(top_builddir)/src/tet3/apilib/libapi_s.la \
 	$(XTS_LIBS)
diff --git a/xts5/Xlib14/Makefile.am b/xts5/Xlib14/Makefile.am
index 1e2f59b9..c804d09c 100644
--- a/xts5/Xlib14/Makefile.am
+++ b/xts5/Xlib14/Makefile.am
@@ -6,9 +6,7 @@ AM_CFLAGS = -I$(top_srcdir)/include \
 	-I$(top_srcdir)/xts5/include \
 	$(XTS_CFLAGS)
 LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
-	$(top_builddir)/xts5/src/xim/libximtest.la \
-	$(top_builddir)/xts5/src/lib/libxtest.la \
-	$(top_builddir)/xts5/fonts/libfont.la \
+	$(top_builddir)/xts5/src/libxts5.la \
 	$(top_builddir)/src/tet3/apilib/libapi.la \
 	$(top_builddir)/src/tet3/apilib/libapi_s.la \
 	$(top_builddir)/xts5/src/libXR5/libXR5.la \
diff --git a/xts5/Xlib15/Makefile.am b/xts5/Xlib15/Makefile.am
index b19605f8..57bfb84e 100644
--- a/xts5/Xlib15/Makefile.am
+++ b/xts5/Xlib15/Makefile.am
@@ -6,9 +6,7 @@ AM_CFLAGS = -I$(top_srcdir)/include \
 	-I$(top_srcdir)/xts5/include \
 	$(XTS_CFLAGS)
 LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
-	$(top_builddir)/xts5/src/xim/libximtest.la \
-	$(top_builddir)/xts5/src/lib/libxtest.la \
-	$(top_builddir)/xts5/fonts/libfont.la \
+	$(top_builddir)/xts5/src/libxts5.la \
 	$(top_builddir)/src/tet3/apilib/libapi.la \
 	$(top_builddir)/src/tet3/apilib/libapi_s.la \
 	$(XTS_LIBS)
diff --git a/xts5/Xlib16/Makefile.am b/xts5/Xlib16/Makefile.am
index 7b169959..0070d7ef 100644
--- a/xts5/Xlib16/Makefile.am
+++ b/xts5/Xlib16/Makefile.am
@@ -6,9 +6,7 @@ AM_CFLAGS = -I$(top_srcdir)/include \
 	-I$(top_srcdir)/xts5/include \
 	$(XTS_CFLAGS)
 LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
-	$(top_builddir)/xts5/src/xim/libximtest.la \
-	$(top_builddir)/xts5/src/lib/libxtest.la \
-	$(top_builddir)/xts5/fonts/libfont.la \
+	$(top_builddir)/xts5/src/libxts5.la \
 	$(top_builddir)/src/tet3/apilib/libapi.la \
 	$(top_builddir)/src/tet3/apilib/libapi_s.la \
 	$(XTS_LIBS)
diff --git a/xts5/Xlib17/Makefile.am b/xts5/Xlib17/Makefile.am
index 98b8dbf9..f174ab69 100644
--- a/xts5/Xlib17/Makefile.am
+++ b/xts5/Xlib17/Makefile.am
@@ -6,9 +6,7 @@ AM_CFLAGS = -I$(top_srcdir)/include \
 	-I$(top_srcdir)/xts5/include \
 	$(XTS_CFLAGS)
 LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
-	$(top_builddir)/xts5/src/xim/libximtest.la \
-	$(top_builddir)/xts5/src/lib/libxtest.la \
-	$(top_builddir)/xts5/fonts/libfont.la \
+	$(top_builddir)/xts5/src/libxts5.la \
 	$(top_builddir)/src/tet3/apilib/libapi.la \
 	$(top_builddir)/src/tet3/apilib/libapi_s.la \
 	$(XTS_LIBS)
diff --git a/xts5/Xlib3/Makefile.am b/xts5/Xlib3/Makefile.am
index e0ded60d..bb11aada 100644
--- a/xts5/Xlib3/Makefile.am
+++ b/xts5/Xlib3/Makefile.am
@@ -6,9 +6,7 @@ AM_CFLAGS = -I$(top_srcdir)/include \
 	-I$(top_srcdir)/xts5/include \
 	$(XTS_CFLAGS)
 LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
-	$(top_builddir)/xts5/src/xim/libximtest.la \
-	$(top_builddir)/xts5/src/lib/libxtest.la \
-	$(top_builddir)/xts5/fonts/libfont.la \
+	$(top_builddir)/xts5/src/libxts5.la \
 	$(top_builddir)/src/tet3/apilib/libapi.la \
 	$(top_builddir)/src/tet3/apilib/libapi_s.la \
 	$(XTS_LIBS)
diff --git a/xts5/Xlib4/Makefile.am b/xts5/Xlib4/Makefile.am
index ac6ce487..c5d0b084 100644
--- a/xts5/Xlib4/Makefile.am
+++ b/xts5/Xlib4/Makefile.am
@@ -6,9 +6,7 @@ AM_CFLAGS = -I$(top_srcdir)/include \
 	-I$(top_srcdir)/xts5/include \
 	$(XTS_CFLAGS)
 LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
-	$(top_builddir)/xts5/src/xim/libximtest.la \
-	$(top_builddir)/xts5/src/lib/libxtest.la \
-	$(top_builddir)/xts5/fonts/libfont.la \
+	$(top_builddir)/xts5/src/libxts5.la \
 	$(top_builddir)/src/tet3/apilib/libapi.la \
 	$(top_builddir)/src/tet3/apilib/libapi_s.la \
 	$(XTS_LIBS)
diff --git a/xts5/Xlib5/Makefile.am b/xts5/Xlib5/Makefile.am
index e1050139..38eb4da1 100644
--- a/xts5/Xlib5/Makefile.am
+++ b/xts5/Xlib5/Makefile.am
@@ -6,9 +6,7 @@ AM_CFLAGS = -I$(top_srcdir)/include \
 	-I$(top_srcdir)/xts5/include \
 	$(XTS_CFLAGS)
 LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
-	$(top_builddir)/xts5/src/xim/libximtest.la \
-	$(top_builddir)/xts5/src/lib/libxtest.la \
-	$(top_builddir)/xts5/fonts/libfont.la \
+	$(top_builddir)/xts5/src/libxts5.la \
 	$(top_builddir)/src/tet3/apilib/libapi.la \
 	$(top_builddir)/src/tet3/apilib/libapi_s.la \
 	$(XTS_LIBS)
diff --git a/xts5/Xlib6/Makefile.am b/xts5/Xlib6/Makefile.am
index bf7b1e17..928740ac 100644
--- a/xts5/Xlib6/Makefile.am
+++ b/xts5/Xlib6/Makefile.am
@@ -6,9 +6,7 @@ AM_CFLAGS = -I$(top_srcdir)/include \
 	-I$(top_srcdir)/xts5/include \
 	$(XTS_CFLAGS)
 LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
-	$(top_builddir)/xts5/src/xim/libximtest.la \
-	$(top_builddir)/xts5/src/lib/libxtest.la \
-	$(top_builddir)/xts5/fonts/libfont.la \
+	$(top_builddir)/xts5/src/libxts5.la \
 	$(top_builddir)/src/tet3/apilib/libapi.la \
 	$(top_builddir)/src/tet3/apilib/libapi_s.la \
 	$(XTS_LIBS)
diff --git a/xts5/Xlib7/Makefile.am b/xts5/Xlib7/Makefile.am
index 4a626a67..4fd360c0 100644
--- a/xts5/Xlib7/Makefile.am
+++ b/xts5/Xlib7/Makefile.am
@@ -6,9 +6,7 @@ AM_CFLAGS = -I$(top_srcdir)/include \
 	-I$(top_srcdir)/xts5/include \
 	$(XTS_CFLAGS)
 LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
-	$(top_builddir)/xts5/src/xim/libximtest.la \
-	$(top_builddir)/xts5/src/lib/libxtest.la \
-	$(top_builddir)/xts5/fonts/libfont.la \
+	$(top_builddir)/xts5/src/libxts5.la \
 	$(top_builddir)/src/tet3/apilib/libapi.la \
 	$(top_builddir)/src/tet3/apilib/libapi_s.la \
 	$(top_builddir)/xts5/src/libXR5/libXR5.la \
diff --git a/xts5/Xlib8/Makefile.am b/xts5/Xlib8/Makefile.am
index ee3be354..e67a9bf6 100644
--- a/xts5/Xlib8/Makefile.am
+++ b/xts5/Xlib8/Makefile.am
@@ -6,9 +6,7 @@ AM_CFLAGS = -I$(top_srcdir)/include \
 	-I$(top_srcdir)/xts5/include \
 	$(XTS_CFLAGS)
 LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
-	$(top_builddir)/xts5/src/xim/libximtest.la \
-	$(top_builddir)/xts5/src/lib/libxtest.la \
-	$(top_builddir)/xts5/fonts/libfont.la \
+	$(top_builddir)/xts5/src/libxts5.la \
 	$(top_builddir)/src/tet3/apilib/libapi.la \
 	$(top_builddir)/src/tet3/apilib/libapi_s.la \
 	$(XTS_LIBS)
diff --git a/xts5/Xlib9/Makefile.am b/xts5/Xlib9/Makefile.am
index e8810525..efdd92db 100644
--- a/xts5/Xlib9/Makefile.am
+++ b/xts5/Xlib9/Makefile.am
@@ -6,9 +6,7 @@ AM_CFLAGS = -I$(top_srcdir)/include \
 	-I$(top_srcdir)/xts5/include \
 	$(XTS_CFLAGS)
 LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
-	$(top_builddir)/xts5/src/xim/libximtest.la \
-	$(top_builddir)/xts5/src/lib/libxtest.la \
-	$(top_builddir)/xts5/fonts/libfont.la \
+	$(top_builddir)/xts5/src/libxts5.la \
 	$(top_builddir)/src/tet3/apilib/libapi.la \
 	$(top_builddir)/src/tet3/apilib/libapi_s.la \
 	$(XTS_LIBS)
diff --git a/xts5/Xopen/Makefile.am b/xts5/Xopen/Makefile.am
index 433152e2..8250eb71 100644
--- a/xts5/Xopen/Makefile.am
+++ b/xts5/Xopen/Makefile.am
@@ -6,9 +6,7 @@ AM_CFLAGS = -I$(top_srcdir)/include \
 	-I$(top_srcdir)/xts5/include \
 	$(XTS_CFLAGS)
 LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
-	$(top_builddir)/xts5/src/xim/libximtest.la \
-	$(top_builddir)/xts5/src/lib/libxtest.la \
-	$(top_builddir)/xts5/fonts/libfont.la \
+	$(top_builddir)/xts5/src/libxts5.la \
 	$(top_builddir)/src/tet3/apilib/libapi.la \
 	$(top_builddir)/src/tet3/apilib/libapi_s.la \
 	$(XTS_LIBS)