Index: trunk/psLib/test/collections/Makefile
===================================================================
--- trunk/psLib/test/collections/Makefile	(revision 857)
+++ trunk/psLib/test/collections/Makefile	(revision 877)
@@ -3,6 +3,6 @@
 ##  Makefile:   test/collections
 ##
-##  $Revision: 1.9 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-06-04 03:13:37 $
+##  $Revision: 1.10 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-06-04 23:49:14 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -29,22 +29,12 @@
          tst_psSort_03   \
          tst_psSort_04   \
-         tst_psImage
+         tst_psImage     \
+         tst_psDlist
+
+OBJS = $(addsuffix .o,$(TARGET))
 
 all: $(TARGET)
 
-tst_psVector_01: tst_psVector_01.o
-tst_psVector_02: tst_psVector_02.o
-tst_psVector_03: tst_psVector_03.o
-tst_psBitSet_01: tst_psBitSet_01.o
-tst_psBitSet_02: tst_psBitSet_02.o
-tst_psBitSet_03: tst_psBitSet_03.o
-tst_psBitSet_04: tst_psBitSet_04.o
-tst_psBitSet_05: tst_psBitSet_05.o
-tst_psBitSet_06: tst_psBitSet_06.o
-tst_psSort_01: tst_psSort_01.o
-tst_psSort_02: tst_psSort_02.o
-tst_psSort_03: tst_psSort_03.o
-tst_psSort_04: tst_psSort_04.o
-tst_psImage: tst_psImage.o
+include $(OBJS:.o=.d)
 
 clean:
@@ -53,8 +43,8 @@
 
 %.o : %.i
-	$(CC) $(CFLAGS) $(CPPFLAGS) -I$(PSLIB_INCL_DIR) -c -o $@ $<
+	$(CC) $(CFLAGS) -I$(PSLIB_INCL_DIR) -c -o $@ $<
 
 %.o : %.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) -I$(PSLIB_INCL_DIR) -c -o $@ $<
+	$(CC) $(CFLAGS) -I$(PSLIB_INCL_DIR) -c -o $@ $<
 
 %   : %.o
@@ -68,5 +58,5 @@
 
 %.d: %.c
-	$(CC) -M $(CFLAGS) $< > $@.tmp
+	$(CC) -M $(CFLAGS) -I$(PSLIB_INCL_DIR) $< > $@.tmp
 	sed 's/\($*\)\.o[ :]*/\1.o $@ : /g' $@.tmp > $@
 	$(RM) -f $@.tmp