[PATCH xts 4/4] Remove remaining mentions of TET_LITE.

[Eric Anholt]

Signed-off-by: Eric Anholt <eric at anholt.net>
---
 configure.ac            |  1 -
 src/tet3/common.mk      | 15 ++++-----------
 src/tet3/litelib.mk     |  2 --
 src/tet3/tcc/tcc.h      |  2 +-
 src/tet3/tcm/tcmfuncs.c |  3 ---
 5 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/configure.ac b/configure.ac
index 35bb4c62fef9..8e977b06f49a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,7 +74,6 @@ dnl Checks for header files.
 AC_HEADER_STDC
 
 dnl Setup common macros
-AC_DEFINE([TET_LITE], [1], [Use a smaller subset of the TET API])
 AC_DEFINE([XT_X_RELEASE], [6], [The X11 Release, e.g. 6 for X11R6])
 AC_DEFINE([XTESTEXTENSION], [1], [Build tests using the XTEST extension])
 AC_DEFINE([INPUTEXTENSION], [1], [Build tests using the XI extension])
diff --git a/src/tet3/common.mk b/src/tet3/common.mk
index 14debb4b1ff7..fa3243b778b4 100644
--- a/src/tet3/common.mk
+++ b/src/tet3/common.mk
@@ -48,8 +48,6 @@
 #	Added support for shared libraries.
 #	Re-instated this file as the non-variant common.mk.
 #	CFLAGS are now set in each lower-level makefile.
-#	The variable TS_CDEFS is set in the ts.mk file on this level;
-#	in litelib.mk it is set to -DTET_LITE, otherwise it is set to nothing.
 #
 # ************************************************************************
 #
@@ -77,11 +75,6 @@
 #	SHLIB_COPTS	used in addition to COPTS or THR_COPTS when compiling
 #			the shared API library		
 # 
-# variables set in src/tet3/ts.mk:
-# 
-#	TS_CDEFS	transport-specific CDEFS
-#			(-DTET_LITE or nothing)
-# 
 # variables set in src/tet3/*/makefile
 # 
 #	LOCAL_TET_CDEFS	makefile-specific TET-specific CDEFS
@@ -101,11 +94,11 @@
 # 
 #	TET_CFLAGS	TET-specific CFLAGS; set to:
 # 
-#		CDEFS LOCAL_TET_CDEFS TS_CDEFS LOCAL_CDEFS LOCAL_COPTS
+#		CDEFS LOCAL_TET_CDEFS LOCAL_CDEFS LOCAL_COPTS
 # 
 #	DTET_CFLAGS	DTET-specific CFLAGS; set to:
 # 
-#		CDEFS LOCAL_DTET_CDEFS TS_CDEFS LOCAL_CDEFS LOCAL_COPTS
+#		CDEFS LOCAL_DTET_CDEFS LOCAL_CDEFS LOCAL_COPTS
 # 
 # 
 # So, the structure at the top of any makefile below here should be:
@@ -134,8 +127,8 @@ LIBDAPI = $(LIB)/libapi$A
 LIBTHRAPI = $(LIB)/libthrapi$A
 
 # CFLAGS used when compiling source files
-TET_CFLAGS = $(CDEFS) $(LOCAL_TET_CDEFS) $(TS_CDEFS) $(LOCAL_CDEFS) \
+TET_CFLAGS = $(CDEFS) $(LOCAL_TET_CDEFS) $(LOCAL_CDEFS) \
 	$(LOCAL_COPTS)
-DTET_CFLAGS = $(CDEFS) $(LOCAL_DTET_CDEFS) $(TS_CDEFS) $(LOCAL_CDEFS) \
+DTET_CFLAGS = $(CDEFS) $(LOCAL_DTET_CDEFS) $(LOCAL_CDEFS) \
 	$(LOCAL_COPTS)
 
diff --git a/src/tet3/litelib.mk b/src/tet3/litelib.mk
index 0e3b0bfef66b..a2f89f0b486a 100644
--- a/src/tet3/litelib.mk
+++ b/src/tet3/litelib.mk
@@ -39,5 +39,3 @@
 TS_LIBDIRS =
 TS_BINDIRS =
 
-TS_CDEFS = -DTET_LITE
-
diff --git a/src/tet3/tcc/tcc.h b/src/tet3/tcc/tcc.h
index a93bcbd49a1d..2a0c7616e3c8 100644
--- a/src/tet3/tcc/tcc.h
+++ b/src/tet3/tcc/tcc.h
@@ -129,7 +129,7 @@ extern int tcc_timeout;
 /* length of an input line buffer */
 #define LBUFLEN		1024
 
-/* fake tet_tcerrno for use in TET_LITE */
+/* Return value from the test to the test framework. */
 extern int tet_tcerrno;
 
 /* reliable BUFCHK() call */
diff --git a/src/tet3/tcm/tcmfuncs.c b/src/tet3/tcm/tcmfuncs.c
index 443da60041a2..a7b29f2184b1 100644
--- a/src/tet3/tcm/tcmfuncs.c
+++ b/src/tet3/tcm/tcmfuncs.c
@@ -80,9 +80,6 @@ MODIFICATIONS:
 	Aaron Plattner, April 2010
 	Fixed warnings when compiled with GCC's -Wall option.
 
-	Peter Hutterer, June 2010
-	Move envmsg into ifndef TET_LITE define, fixes warning.
-
 ************************************************************************/
 
 #include <stdio.h>
-- 
2.9.3