Index: trunk/psLib/test/collections/Makefile
===================================================================
--- trunk/psLib/test/collections/Makefile	(revision 1080)
+++ trunk/psLib/test/collections/Makefile	(revision 1109)
@@ -3,6 +3,6 @@
 ##  Makefile:   test/collections
 ##
-##  $Revision: 1.14 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-06-11 20:36:04 $
+##  $Revision: 1.15 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-06-26 03:05:12 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -53,4 +53,7 @@
 	$(RM) $(TARGET)
 
+cleandependencies:
+	$(RM) $(DEPENDENCIES)
+
 builddir/%.o : builddir/%.i
 	$(CC) $(CFLAGS) -I$(PSLIB_INCL_DIR) -c -o $@ $<
@@ -69,7 +72,5 @@
 
 builddir/%.d: %.c
-	$(CC) -MM $(CFLAGS) -I$(PSLIB_INCL_DIR) $< > $@.tmp
-	sed 's|\($*\)\.o[ :]*|builddir\/\1.o $@ : |g' $@.tmp > $@
-	$(RM) -f $@.tmp
+	$(CC) -MM $(CFLAGS) -I$(PSLIB_INCL_DIR) $< | sed 's|\(.*\.o\)|builddir/\1|' > $@
 
 install: $(testbindir) $(testbindir)/verified $(TARGET)
Index: trunk/psLib/test/collections/builddir/tst_psBitSet_01.d
===================================================================
--- trunk/psLib/test/collections/builddir/tst_psBitSet_01.d	(revision 1080)
+++ trunk/psLib/test/collections/builddir/tst_psBitSet_01.d	(revision 1109)
@@ -1,3 +1,3 @@
-builddir/tst_psBitSet_01.o builddir/tst_psBitSet_01.d : tst_psBitSet_01.c ../../include/pslib.h \
+builddir/tst_psBitSet_01.o: tst_psBitSet_01.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
Index: trunk/psLib/test/collections/builddir/tst_psBitSet_02.d
===================================================================
--- trunk/psLib/test/collections/builddir/tst_psBitSet_02.d	(revision 1080)
+++ trunk/psLib/test/collections/builddir/tst_psBitSet_02.d	(revision 1109)
@@ -1,3 +1,3 @@
-builddir/tst_psBitSet_02.o builddir/tst_psBitSet_02.d : tst_psBitSet_02.c ../../include/pslib.h \
+builddir/tst_psBitSet_02.o: tst_psBitSet_02.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
Index: trunk/psLib/test/collections/builddir/tst_psBitSet_03.d
===================================================================
--- trunk/psLib/test/collections/builddir/tst_psBitSet_03.d	(revision 1080)
+++ trunk/psLib/test/collections/builddir/tst_psBitSet_03.d	(revision 1109)
@@ -1,3 +1,3 @@
-builddir/tst_psBitSet_03.o builddir/tst_psBitSet_03.d : tst_psBitSet_03.c ../../include/pslib.h \
+builddir/tst_psBitSet_03.o: tst_psBitSet_03.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
Index: trunk/psLib/test/collections/builddir/tst_psBitSet_04.d
===================================================================
--- trunk/psLib/test/collections/builddir/tst_psBitSet_04.d	(revision 1080)
+++ trunk/psLib/test/collections/builddir/tst_psBitSet_04.d	(revision 1109)
@@ -1,3 +1,3 @@
-builddir/tst_psBitSet_04.o builddir/tst_psBitSet_04.d : tst_psBitSet_04.c ../../include/pslib.h \
+builddir/tst_psBitSet_04.o: tst_psBitSet_04.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
Index: trunk/psLib/test/collections/builddir/tst_psBitSet_05.d
===================================================================
--- trunk/psLib/test/collections/builddir/tst_psBitSet_05.d	(revision 1080)
+++ trunk/psLib/test/collections/builddir/tst_psBitSet_05.d	(revision 1109)
@@ -1,3 +1,3 @@
-builddir/tst_psBitSet_05.o builddir/tst_psBitSet_05.d : tst_psBitSet_05.c ../../include/pslib.h \
+builddir/tst_psBitSet_05.o: tst_psBitSet_05.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
Index: trunk/psLib/test/collections/builddir/tst_psBitSet_06.d
===================================================================
--- trunk/psLib/test/collections/builddir/tst_psBitSet_06.d	(revision 1080)
+++ trunk/psLib/test/collections/builddir/tst_psBitSet_06.d	(revision 1109)
@@ -1,3 +1,3 @@
-builddir/tst_psBitSet_06.o builddir/tst_psBitSet_06.d : tst_psBitSet_06.c ../../include/pslib.h \
+builddir/tst_psBitSet_06.o: tst_psBitSet_06.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
Index: trunk/psLib/test/collections/builddir/tst_psImage.d
===================================================================
--- trunk/psLib/test/collections/builddir/tst_psImage.d	(revision 1080)
+++ trunk/psLib/test/collections/builddir/tst_psImage.d	(revision 1109)
@@ -1,3 +1,3 @@
-builddir/tst_psImage.o builddir/tst_psImage.d : tst_psImage.c ../../include/psTest.h ../../include/pslib.h \
+builddir/tst_psImage.o: tst_psImage.c ../../include/psTest.h ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
Index: trunk/psLib/test/collections/builddir/tst_psList.d
===================================================================
--- trunk/psLib/test/collections/builddir/tst_psList.d	(revision 1080)
+++ trunk/psLib/test/collections/builddir/tst_psList.d	(revision 1109)
@@ -1,3 +1,3 @@
-builddir/tst_psList.o builddir/tst_psList.d : tst_psList.c ../../include/psTest.h ../../include/pslib.h \
+builddir/tst_psList.o: tst_psList.c ../../include/psTest.h ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
Index: trunk/psLib/test/collections/builddir/tst_psSort_01.d
===================================================================
--- trunk/psLib/test/collections/builddir/tst_psSort_01.d	(revision 1080)
+++ trunk/psLib/test/collections/builddir/tst_psSort_01.d	(revision 1109)
@@ -1,3 +1,3 @@
-builddir/tst_psSort_01.o builddir/tst_psSort_01.d : tst_psSort_01.c ../../include/pslib.h \
+builddir/tst_psSort_01.o: tst_psSort_01.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
Index: trunk/psLib/test/collections/builddir/tst_psSort_02.d
===================================================================
--- trunk/psLib/test/collections/builddir/tst_psSort_02.d	(revision 1080)
+++ trunk/psLib/test/collections/builddir/tst_psSort_02.d	(revision 1109)
@@ -1,3 +1,3 @@
-builddir/tst_psSort_02.o builddir/tst_psSort_02.d : tst_psSort_02.c ../../include/pslib.h \
+builddir/tst_psSort_02.o: tst_psSort_02.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
Index: trunk/psLib/test/collections/builddir/tst_psSort_03.d
===================================================================
--- trunk/psLib/test/collections/builddir/tst_psSort_03.d	(revision 1080)
+++ trunk/psLib/test/collections/builddir/tst_psSort_03.d	(revision 1109)
@@ -1,3 +1,3 @@
-builddir/tst_psSort_03.o builddir/tst_psSort_03.d : tst_psSort_03.c ../../include/pslib.h \
+builddir/tst_psSort_03.o: tst_psSort_03.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
Index: trunk/psLib/test/collections/builddir/tst_psSort_04.d
===================================================================
--- trunk/psLib/test/collections/builddir/tst_psSort_04.d	(revision 1080)
+++ trunk/psLib/test/collections/builddir/tst_psSort_04.d	(revision 1109)
@@ -1,3 +1,3 @@
-builddir/tst_psSort_04.o builddir/tst_psSort_04.d : tst_psSort_04.c ../../include/pslib.h \
+builddir/tst_psSort_04.o: tst_psSort_04.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
Index: trunk/psLib/test/collections/builddir/tst_psVector_01.d
===================================================================
--- trunk/psLib/test/collections/builddir/tst_psVector_01.d	(revision 1080)
+++ trunk/psLib/test/collections/builddir/tst_psVector_01.d	(revision 1109)
@@ -1,3 +1,3 @@
-builddir/tst_psVector_01.o builddir/tst_psVector_01.d : tst_psVector_01.c ../../include/pslib.h \
+builddir/tst_psVector_01.o: tst_psVector_01.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
Index: trunk/psLib/test/collections/builddir/tst_psVector_02.d
===================================================================
--- trunk/psLib/test/collections/builddir/tst_psVector_02.d	(revision 1080)
+++ trunk/psLib/test/collections/builddir/tst_psVector_02.d	(revision 1109)
@@ -1,3 +1,3 @@
-builddir/tst_psVector_02.o builddir/tst_psVector_02.d : tst_psVector_02.c ../../include/pslib.h \
+builddir/tst_psVector_02.o: tst_psVector_02.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
Index: trunk/psLib/test/collections/builddir/tst_psVector_03.d
===================================================================
--- trunk/psLib/test/collections/builddir/tst_psVector_03.d	(revision 1080)
+++ trunk/psLib/test/collections/builddir/tst_psVector_03.d	(revision 1109)
@@ -1,3 +1,3 @@
-builddir/tst_psVector_03.o builddir/tst_psVector_03.d : tst_psVector_03.c ../../include/pslib.h \
+builddir/tst_psVector_03.o: tst_psVector_03.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \