Makefile

[Ian Romanick]

Update of /cvs/xtest/xtest/xts5
In directory gabe:/tmp/cvs-serv7608/xts5

Modified Files:
	Makefile tetclean.cfg 
Log Message:
Numerous changes to eliminate the need for wclean.  It is replaced by doing
'wbuild clean'.  tetclean.cfg will soon get the axe as well.


Index: Makefile
===================================================================
RCS file: /cvs/xtest/xtest/xts5/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile	1 Nov 2005 01:23:34 -0000	1.5
+++ Makefile	1 Nov 2005 01:38:05 -0000	1.6
@@ -33,6 +33,10 @@
 #
 # Modifications:
 # $Log$
+# Revision 1.6  2005/11/01 01:38:05  idr
+# Numerous changes to eliminate the need for wclean.  It is replaced by doing
+# 'wbuild clean'.  tetclean.cfg will soon get the axe as well.
+#
 # Revision 1.5  2005/11/01 01:23:34  jamey
 # Add a target for compiling the tests, and include it in make all.
 #
@@ -194,17 +198,17 @@
 	@(cd $(TET_ROOT)/vsw5/src/libXtmu; wbuild install 2>&1 | tee -a $(TET_ROOT)/vsw5/results/install.log)
 
 clean:
-	@(cd src/lib; wclean)
-	@(cd src/libXR5; wclean)
+	@(cd src/lib; wbuild clean)
+	@(cd src/libXR5; wbuild clean)
 	@if [ -d $(TET_ROOT)/vsw5/src/libXtTest ]; \
 	then \
-	cd src/libXtTest; wclean; \
+	cd src/libXtTest; wbuild clean; \
 	fi
-	@(cd src/libproto; wclean)
-	@(cd src/libXtaw; wclean)
-	@(cd src/libXtmu; wclean)
-	@(cd src/xim; wclean)
-	@(cd fonts; wclean)
-	@(cd src/bin/mc ; wclean)
-	@(cd src/bin/reports ; wclean)
-	@(cd src/pixval/blowup; wclean)
+	@(cd src/libproto; wbuild clean)
+	@(cd src/libXtaw; wbuild clean)
+	@(cd src/libXtmu; wbuild clean)
+	@(cd src/xim; wbuild clean)
+	@(cd fonts; wbuild clean)
+	@(cd src/bin/mc ; wbuild clean)
+	@(cd src/bin/reports ; wbuild clean)
+	@(cd src/pixval/blowup; wbuild clean)

Index: tetclean.cfg
===================================================================
RCS file: /cvs/xtest/xtest/xts5/tetclean.cfg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- tetclean.cfg	21 Apr 2005 09:40:42 -0000	1.2
+++ tetclean.cfg	1 Nov 2005 01:38:05 -0000	1.3
@@ -103,11 +103,11 @@
 # TET_CLEAN_TOOL - The program to use as the TET clean tool.
 # This should normally be the wclean program supplied as part 
 # of the test suite.
-TET_CLEAN_TOOL=wclean
+TET_CLEAN_TOOL=wbuild
 
 # TET_CLEAN_FILE - This is intended to be used for the arguments to the TET
-# clean tool - this should be empty, since no arguments are accepted by wclean.
-TET_CLEAN_FILE=
+# clean tool - this *must* be 'clean'
+TET_CLEAN_FILE=clean
 
 # TET_OUTPUT_CAPTURE - This must be set to True.
 TET_OUTPUT_CAPTURE=TRUE