Changeset 1109

Timestamp:

Jun 25, 2004, 5:05:13 PM (22 years ago)

Author:

desonia

Message:

Relaxed the dependency file generation to avoid remakes when psLib changes.

Location:

trunk/psLib/test

Files:

• collections/Makefile (modified) (3 diffs)
• collections/builddir/tst_psBitSet_01.d (modified) (1 diff)
• collections/builddir/tst_psBitSet_02.d (modified) (1 diff)
• collections/builddir/tst_psBitSet_03.d (modified) (1 diff)
• collections/builddir/tst_psBitSet_04.d (modified) (1 diff)
• collections/builddir/tst_psBitSet_05.d (modified) (1 diff)
• collections/builddir/tst_psBitSet_06.d (modified) (1 diff)
• collections/builddir/tst_psImage.d (modified) (1 diff)
• collections/builddir/tst_psList.d (modified) (1 diff)
• collections/builddir/tst_psSort_01.d (modified) (1 diff)
• collections/builddir/tst_psSort_02.d (modified) (1 diff)
• collections/builddir/tst_psSort_03.d (modified) (1 diff)
• collections/builddir/tst_psSort_04.d (modified) (1 diff)
• collections/builddir/tst_psVector_01.d (modified) (1 diff)
• collections/builddir/tst_psVector_02.d (modified) (1 diff)
• collections/builddir/tst_psVector_03.d (modified) (1 diff)
• dataManip/Makefile (modified) (3 diffs)
• dataManip/builddir/tst_psFunc00.d (modified) (1 diff)
• dataManip/builddir/tst_psFunc01.d (modified) (1 diff)
• dataManip/builddir/tst_psHist00.d (modified) (1 diff)
• dataManip/builddir/tst_psHist01.d (modified) (1 diff)
• dataManip/builddir/tst_psHist02.d (modified) (1 diff)
• dataManip/builddir/tst_psImageFFT.d (modified) (1 diff)
• dataManip/builddir/tst_psImageIO.d (modified) (1 diff)
• dataManip/builddir/tst_psImageStats00.d (modified) (1 diff)
• dataManip/builddir/tst_psImageStats01.d (modified) (1 diff)
• dataManip/builddir/tst_psImageStats02.d (modified) (1 diff)
• dataManip/builddir/tst_psImageStats03.d (added)
• dataManip/builddir/tst_psMatrix01.d (modified) (1 diff)
• dataManip/builddir/tst_psMatrix02.d (modified) (1 diff)
• dataManip/builddir/tst_psMatrix03.d (modified) (1 diff)
• dataManip/builddir/tst_psMatrix04.d (modified) (1 diff)
• dataManip/builddir/tst_psMatrix05.d (modified) (1 diff)
• dataManip/builddir/tst_psMatrix06.d (modified) (1 diff)
• dataManip/builddir/tst_psMatrix07.d (modified) (1 diff)
• dataManip/builddir/tst_psMinimize00.d (added)
• dataManip/builddir/tst_psStats00.d (modified) (1 diff)
• dataManip/builddir/tst_psStats01.d (modified) (1 diff)
• dataManip/builddir/tst_psStats02.d (modified) (1 diff)
• dataManip/builddir/tst_psStats03.d (modified) (1 diff)
• dataManip/builddir/tst_psStats05.d (modified) (1 diff)
• dataManip/builddir/tst_psStats06.d (modified) (1 diff)
• dataManip/builddir/tst_psStats07.d (modified) (1 diff)
• dataManip/builddir/tst_psStats08.d (modified) (1 diff)
• dataManip/builddir/tst_psStats09.d (modified) (1 diff)
• dataManip/builddir/tst_psVectorFFT.d (modified) (1 diff)
• sysUtils/Makefile (modified) (3 diffs)
• sysUtils/builddir/atst_psAbort_01.d (modified) (1 diff)
• sysUtils/builddir/atst_psAbort_02.d (modified) (1 diff)
• sysUtils/builddir/atst_psAbort_03.d (modified) (1 diff)
• sysUtils/builddir/tst_psError.d (modified) (1 diff)
• sysUtils/builddir/tst_psHash00.d (modified) (1 diff)
• sysUtils/builddir/tst_psHash01.d (modified) (1 diff)
• sysUtils/builddir/tst_psHash02.d (modified) (1 diff)
• sysUtils/builddir/tst_psHash03.d (modified) (1 diff)
• sysUtils/builddir/tst_psHash04.d (modified) (1 diff)
• sysUtils/builddir/tst_psLogMsg00.d (modified) (1 diff)
• sysUtils/builddir/tst_psLogMsg01.d (modified) (1 diff)
• sysUtils/builddir/tst_psLogMsg02.d (modified) (1 diff)
• sysUtils/builddir/tst_psLogMsg03.d (modified) (1 diff)
• sysUtils/builddir/tst_psMemory.d (modified) (1 diff)
• sysUtils/builddir/tst_psStringCopy.d (modified) (1 diff)
• sysUtils/builddir/tst_psTrace00.d (modified) (1 diff)
• sysUtils/builddir/tst_psTrace01.d (modified) (1 diff)
• sysUtils/builddir/tst_psTrace02.d (modified) (1 diff)
• sysUtils/builddir/tst_psTrace03.d (modified) (1 diff)
• sysUtils/builddir/tst_psTrace04.d (modified) (1 diff)

trunk/psLib/test/collections/Makefile

@@ -3 +3 @@
 ##  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 +53 @@
         $(RM) $(TARGET)
 
+cleandependencies:
+        $(RM) $(DEPENDENCIES)
+
 builddir/%.o : builddir/%.i
         $(CC) $(CFLAGS) -I$(PSLIB_INCL_DIR) -c -o $@ $<
@@ -69 +72 @@
 
 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)

trunk/psLib/test/collections/builddir/tst_psBitSet_01.d

@@ -1 @@
-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 \

trunk/psLib/test/collections/builddir/tst_psBitSet_02.d

@@ -1 @@
-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 \

trunk/psLib/test/collections/builddir/tst_psBitSet_03.d

@@ -1 @@
-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 \

trunk/psLib/test/collections/builddir/tst_psBitSet_04.d

@@ -1 @@
-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 \

trunk/psLib/test/collections/builddir/tst_psBitSet_05.d

@@ -1 @@
-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 \

trunk/psLib/test/collections/builddir/tst_psBitSet_06.d

@@ -1 @@
-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 \

trunk/psLib/test/collections/builddir/tst_psImage.d

@@ -1 @@
-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 \

trunk/psLib/test/collections/builddir/tst_psList.d

@@ -1 @@
-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 \

trunk/psLib/test/collections/builddir/tst_psSort_01.d

@@ -1 @@
-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 \

trunk/psLib/test/collections/builddir/tst_psSort_02.d

@@ -1 @@
-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 \

trunk/psLib/test/collections/builddir/tst_psSort_03.d

@@ -1 @@
-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 \

trunk/psLib/test/collections/builddir/tst_psSort_04.d

@@ -1 @@
-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 \

trunk/psLib/test/collections/builddir/tst_psVector_01.d

@@ -1 @@
-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 \

trunk/psLib/test/collections/builddir/tst_psVector_02.d

@@ -1 @@
-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 \

trunk/psLib/test/collections/builddir/tst_psVector_03.d

@@ -1 @@
-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 \

trunk/psLib/test/dataManip/Makefile

@@ -3 +3 @@
 ##  Makefile:   test/sysUtils
 ##
-##  $Revision: 1.20 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-06-26 01:12:22 $
+##  $Revision: 1.21 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-06-26 03:04:44 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
 ##
 ###############################################################################
+
+ifndef prefix
+    export prefix=$(shell cd ../..;pwd)
+endif
 
 include ../../src/Makefile.Globals
@@ -37 +41 @@
  tst_psFunc00 \
  tst_psFunc01 \
- tst_psMinimize00 \
  tst_psImageStats00 \
  tst_psImageStats01 \
- tst_psImageStats02
+ tst_psImageStats02 \
+ tst_psImageStats03 \
+ tst_psMinimize00 \
+ tst_psImageIO \
+ tst_psVectorFFT \
+ tst_psImageFFT
 
-all: $(TARGET)
+DEPENDENCIES = $(addprefix builddir/,$(addsuffix .d,$(TARGET)))
+OBJS = $(addprefix builddir/,$(addsuffix .o,$(TARGET)))
 
-tst_psMatrix01:         tst_psMatrix01.o
-tst_psMatrix02:         tst_psMatrix02.o
-tst_psMatrix03:         tst_psMatrix03.o
-tst_psMatrix04:         tst_psMatrix04.o
-tst_psMatrix05:         tst_psMatrix05.o
-tst_psMatrix06:         tst_psMatrix06.o
-tst_psMatrix07:         tst_psMatrix07.o
-tst_psStats00:          tst_psStats00.o
-tst_psStats01:          tst_psStats01.o
-tst_psStats02:          tst_psStats02.o
-tst_psStats03:          tst_psStats03.o
-tst_psStats04:          tst_psStats04.o
-tst_psStats05:          tst_psStats05.o
-tst_psStats06:          tst_psStats06.o
-tst_psStats07:          tst_psStats07.o
-tst_psStats08:          tst_psStats08.o
-tst_psStats09:          tst_psStats09.o
-tst_psHist00:           tst_psHist00.o
-tst_psHist01:           tst_psHist01.o
-tst_psHist02:           tst_psHist02.o
-tst_psFunc00:           tst_psFunc00.o
-tst_psFunc01:           tst_psFunc01.o
-tst_psFunc02:           tst_psFunc02.o
-tst_psFunc03:           tst_psFunc03.o
-tst_psMinimize00:       tst_psMinimize00.o
-tst_psImageStats00:     tst_psImageStats00.o
-tst_psImageStats01:     tst_psImageStats01.o
-tst_psImageStats02:     tst_psImageStats02.o
-tst_psImageStats03:     tst_psImageStats03.o
+all: builddir $(TARGET)
+
+builddir:
+        mkdir builddir
+
+include $(DEPENDENCIES)
 
 clean:
-        @echo "    Deleting executable and binary files for 'test/sysUtils'"
-        $(RM) $(TARGET) *.o *.lint
+        @echo "    Deleting executable and binary files for 'test/dataManip'"
+        $(RM) $(OBJS) *.lint tmpImages/*.fits
 
-%.o : %.c
+builddir/%.o : %.c
         $(CC) $(CFLAGS) $(CPPFLAGS) -I.. -I$(PSLIB_INCL_DIR) -c -o $@ $<
 
-%   : %.o
-        $(CC) -o $@ $< -L$(PSLIB_LIB_DIR) -lpslib -lpstest -lgsl -lgslcblas $(LDFLAGS)
+%   : builddir/%.o
+        $(CC) -o $@ $< -L$(PSLIB_LIB_DIR) -lpslib -lpstest $(LDFLAGS)
 
-## NOTE: The distclean target does not remove the .o files.  The Makefiles must
-## be repaired.
-distclean:
+distclean: clean
         $(RM) $(TARGET)
 
@@ -92 +76 @@
         splint +posixlib -exportlocal -realcompare $(INCLUDE_GLOBAL) $? > $@; cat $@
 
+cleandependencies:
+        $(RM) $(DEPENDENCIES)
+        
+builddir/%.d: %.c
+        $(CC) -MM $(CFLAGS) -I$(PSLIB_INCL_DIR) $< | sed 's|\(.*\.o\)|builddir/\1|' > $@
 
+install: $(testbindir) $(testbindir)/verified $(TARGET)
+        install $(TARGET) $(testbindir)
+        install verified/*.stderr verified/*.stdout $(testbindir)/verified
+
+$(testbindir):
+        mkdir -p $(testbindir)
+
+$(testbindir)/verified:
+        mkdir -p $(testbindir)/verified
+
+

trunk/psLib/test/dataManip/builddir/tst_psFunc00.d

@@ -1 @@
-builddir/tst_psFunc00.o builddir/tst_psFunc00.d : tst_psFunc00.c ../../include/pslib.h \
+builddir/tst_psFunc00.o: tst_psFunc00.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/dataManip/builddir/tst_psFunc01.d

@@ -1 @@
-builddir/tst_psFunc01.o builddir/tst_psFunc01.d : tst_psFunc01.c ../../include/pslib.h \
+builddir/tst_psFunc01.o: tst_psFunc01.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/dataManip/builddir/tst_psHist00.d

@@ -1 @@
-builddir/tst_psHist00.o builddir/tst_psHist00.d : tst_psHist00.c ../../include/pslib.h \
+builddir/tst_psHist00.o: tst_psHist00.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/dataManip/builddir/tst_psHist01.d

@@ -1 @@
-builddir/tst_psHist01.o builddir/tst_psHist01.d : tst_psHist01.c ../../include/pslib.h \
+builddir/tst_psHist01.o: tst_psHist01.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/dataManip/builddir/tst_psHist02.d

@@ -1 @@
-builddir/tst_psHist02.o builddir/tst_psHist02.d : tst_psHist02.c ../../include/pslib.h \
+builddir/tst_psHist02.o: tst_psHist02.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/dataManip/builddir/tst_psImageFFT.d

@@ -1 @@
-builddir/tst_psImageFFT.o builddir/tst_psImageFFT.d : tst_psImageFFT.c ../../include/psTest.h \
+builddir/tst_psImageFFT.o: tst_psImageFFT.c ../../include/psTest.h \
   ../../include/pslib.h ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/dataManip/builddir/tst_psImageIO.d

@@ -1 @@
-builddir/tst_psImageIO.o builddir/tst_psImageIO.d : tst_psImageIO.c ../../include/psTest.h \
+builddir/tst_psImageIO.o: tst_psImageIO.c ../../include/psTest.h \
   ../../include/pslib.h ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/dataManip/builddir/tst_psImageStats00.d

@@ -1 @@
-builddir/tst_psImageStats00.o builddir/tst_psImageStats00.d : tst_psImageStats00.c ../../include/pslib.h \
+builddir/tst_psImageStats00.o: tst_psImageStats00.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/dataManip/builddir/tst_psImageStats01.d

@@ -1 @@
-builddir/tst_psImageStats01.o builddir/tst_psImageStats01.d : tst_psImageStats01.c ../../include/pslib.h \
+builddir/tst_psImageStats01.o: tst_psImageStats01.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/dataManip/builddir/tst_psImageStats02.d

@@ -1 @@
-builddir/tst_psImageStats02.o builddir/tst_psImageStats02.d : tst_psImageStats02.c ../../include/pslib.h \
+builddir/tst_psImageStats02.o: tst_psImageStats02.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/dataManip/builddir/tst_psMatrix01.d

@@ -1 @@
-builddir/tst_psMatrix01.o builddir/tst_psMatrix01.d : tst_psMatrix01.c ../../include/pslib.h \
+builddir/tst_psMatrix01.o: tst_psMatrix01.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/dataManip/builddir/tst_psMatrix02.d

@@ -1 @@
-builddir/tst_psMatrix02.o builddir/tst_psMatrix02.d : tst_psMatrix02.c ../../include/pslib.h \
+builddir/tst_psMatrix02.o: tst_psMatrix02.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/dataManip/builddir/tst_psMatrix03.d

@@ -1 @@
-builddir/tst_psMatrix03.o builddir/tst_psMatrix03.d : tst_psMatrix03.c ../../include/pslib.h \
+builddir/tst_psMatrix03.o: tst_psMatrix03.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/dataManip/builddir/tst_psMatrix04.d

@@ -1 @@
-builddir/tst_psMatrix04.o builddir/tst_psMatrix04.d : tst_psMatrix04.c ../../include/pslib.h \
+builddir/tst_psMatrix04.o: tst_psMatrix04.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/dataManip/builddir/tst_psMatrix05.d

@@ -1 @@
-builddir/tst_psMatrix05.o builddir/tst_psMatrix05.d : tst_psMatrix05.c ../../include/pslib.h \
+builddir/tst_psMatrix05.o: tst_psMatrix05.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/dataManip/builddir/tst_psMatrix06.d

@@ -1 @@
-builddir/tst_psMatrix06.o builddir/tst_psMatrix06.d : tst_psMatrix06.c ../../include/pslib.h \
+builddir/tst_psMatrix06.o: tst_psMatrix06.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/dataManip/builddir/tst_psMatrix07.d

@@ -1 @@
-builddir/tst_psMatrix07.o builddir/tst_psMatrix07.d : tst_psMatrix07.c ../../include/pslib.h \
+builddir/tst_psMatrix07.o: tst_psMatrix07.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/dataManip/builddir/tst_psStats00.d

@@ -1 @@
-builddir/tst_psStats00.o builddir/tst_psStats00.d : tst_psStats00.c ../../include/pslib.h \
+builddir/tst_psStats00.o: tst_psStats00.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/dataManip/builddir/tst_psStats01.d

@@ -1 @@
-builddir/tst_psStats01.o builddir/tst_psStats01.d : tst_psStats01.c ../../include/pslib.h \
+builddir/tst_psStats01.o: tst_psStats01.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/dataManip/builddir/tst_psStats02.d

@@ -1 @@
-builddir/tst_psStats02.o builddir/tst_psStats02.d : tst_psStats02.c ../../include/pslib.h \
+builddir/tst_psStats02.o: tst_psStats02.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/dataManip/builddir/tst_psStats03.d

@@ -1 @@
-builddir/tst_psStats03.o builddir/tst_psStats03.d : tst_psStats03.c ../../include/pslib.h \
+builddir/tst_psStats03.o: tst_psStats03.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/dataManip/builddir/tst_psStats05.d

@@ -1 @@
-builddir/tst_psStats05.o builddir/tst_psStats05.d : tst_psStats05.c ../../include/pslib.h \
+builddir/tst_psStats05.o: tst_psStats05.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/dataManip/builddir/tst_psStats06.d

@@ -1 @@
-builddir/tst_psStats06.o builddir/tst_psStats06.d : tst_psStats06.c ../../include/pslib.h \
+builddir/tst_psStats06.o: tst_psStats06.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/dataManip/builddir/tst_psStats07.d

@@ -1 @@
-builddir/tst_psStats07.o builddir/tst_psStats07.d : tst_psStats07.c ../../include/pslib.h \
+builddir/tst_psStats07.o: tst_psStats07.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/dataManip/builddir/tst_psStats08.d

@@ -1 @@
-builddir/tst_psStats08.o builddir/tst_psStats08.d : tst_psStats08.c ../../include/pslib.h \
+builddir/tst_psStats08.o: tst_psStats08.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/dataManip/builddir/tst_psStats09.d

@@ -1 @@
-builddir/tst_psStats09.o builddir/tst_psStats09.d : tst_psStats09.c ../../include/pslib.h \
+builddir/tst_psStats09.o: tst_psStats09.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/dataManip/builddir/tst_psVectorFFT.d

@@ -1 @@
-builddir/tst_psVectorFFT.o builddir/tst_psVectorFFT.d : tst_psVectorFFT.c ../../include/psTest.h \
+builddir/tst_psVectorFFT.o: tst_psVectorFFT.c ../../include/psTest.h \
   ../../include/pslib.h ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/sysUtils/Makefile

@@ -3 +3 @@
 ##  Makefile:   test/sysUtils
 ##
-##  $Revision: 1.15 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-06-11 20:36:04 $
+##  $Revision: 1.16 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-06-26 03:05:12 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -58 +58 @@
         $(RM) $(TARGET)
 
+cleandependencies:
+        $(RM) $(DEPENDENCIES)
+
 builddir/%.o : %.c
         $(CC) $(CFLAGS) $(CPPFLAGS) -I.. -I$(PSLIB_INCL_DIR) -c -o $@ $<
@@ -68 +71 @@
 
 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)

trunk/psLib/test/sysUtils/builddir/atst_psAbort_01.d

@@ -1 @@
-builddir/atst_psAbort_01.o builddir/atst_psAbort_01.d : atst_psAbort_01.c ../../include/pslib.h \
+builddir/atst_psAbort_01.o: atst_psAbort_01.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/sysUtils/builddir/atst_psAbort_02.d

@@ -1 @@
-builddir/atst_psAbort_02.o builddir/atst_psAbort_02.d : atst_psAbort_02.c ../../include/pslib.h \
+builddir/atst_psAbort_02.o: atst_psAbort_02.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/sysUtils/builddir/atst_psAbort_03.d

@@ -1 @@
-builddir/atst_psAbort_03.o builddir/atst_psAbort_03.d : atst_psAbort_03.c ../../include/pslib.h \
+builddir/atst_psAbort_03.o: atst_psAbort_03.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/sysUtils/builddir/tst_psError.d

@@ -1 @@
-builddir/tst_psError.o builddir/tst_psError.d : tst_psError.c ../../include/pslib.h \
+builddir/tst_psError.o: tst_psError.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/sysUtils/builddir/tst_psHash00.d

@@ -1 @@
-builddir/tst_psHash00.o builddir/tst_psHash00.d : tst_psHash00.c ../../include/pslib.h \
+builddir/tst_psHash00.o: tst_psHash00.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/sysUtils/builddir/tst_psHash01.d

@@ -1 @@
-builddir/tst_psHash01.o builddir/tst_psHash01.d : tst_psHash01.c ../../include/pslib.h \
+builddir/tst_psHash01.o: tst_psHash01.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/sysUtils/builddir/tst_psHash02.d

@@ -1 @@
-builddir/tst_psHash02.o builddir/tst_psHash02.d : tst_psHash02.c ../../include/pslib.h \
+builddir/tst_psHash02.o: tst_psHash02.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/sysUtils/builddir/tst_psHash03.d

@@ -1 @@
-builddir/tst_psHash03.o builddir/tst_psHash03.d : tst_psHash03.c ../../include/pslib.h \
+builddir/tst_psHash03.o: tst_psHash03.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/sysUtils/builddir/tst_psHash04.d

@@ -1 @@
-builddir/tst_psHash04.o builddir/tst_psHash04.d : tst_psHash04.c ../../include/pslib.h \
+builddir/tst_psHash04.o: tst_psHash04.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/sysUtils/builddir/tst_psLogMsg00.d

@@ -1 @@
-builddir/tst_psLogMsg00.o builddir/tst_psLogMsg00.d : tst_psLogMsg00.c ../../include/pslib.h \
+builddir/tst_psLogMsg00.o: tst_psLogMsg00.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/sysUtils/builddir/tst_psLogMsg01.d

@@ -1 @@
-builddir/tst_psLogMsg01.o builddir/tst_psLogMsg01.d : tst_psLogMsg01.c ../../include/pslib.h \
+builddir/tst_psLogMsg01.o: tst_psLogMsg01.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/sysUtils/builddir/tst_psLogMsg02.d

@@ -1 @@
-builddir/tst_psLogMsg02.o builddir/tst_psLogMsg02.d : tst_psLogMsg02.c ../../include/pslib.h \
+builddir/tst_psLogMsg02.o: tst_psLogMsg02.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/sysUtils/builddir/tst_psLogMsg03.d

@@ -1 @@
-builddir/tst_psLogMsg03.o builddir/tst_psLogMsg03.d : tst_psLogMsg03.c ../../include/pslib.h \
+builddir/tst_psLogMsg03.o: tst_psLogMsg03.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/sysUtils/builddir/tst_psMemory.d

@@ -1 @@
-builddir/tst_psMemory.o builddir/tst_psMemory.d : tst_psMemory.c ../../include/psTest.h \
+builddir/tst_psMemory.o: tst_psMemory.c ../../include/psTest.h \
   ../../include/pslib.h ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/sysUtils/builddir/tst_psStringCopy.d

@@ -1 @@
-builddir/tst_psStringCopy.o builddir/tst_psStringCopy.d : tst_psStringCopy.c ../../include/pslib.h \
+builddir/tst_psStringCopy.o: tst_psStringCopy.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/sysUtils/builddir/tst_psTrace00.d

@@ -1 @@
-builddir/tst_psTrace00.o builddir/tst_psTrace00.d : tst_psTrace00.c ../../include/pslib.h \
+builddir/tst_psTrace00.o: tst_psTrace00.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/sysUtils/builddir/tst_psTrace01.d

@@ -1 @@
-builddir/tst_psTrace01.o builddir/tst_psTrace01.d : tst_psTrace01.c ../../include/pslib.h \
+builddir/tst_psTrace01.o: tst_psTrace01.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/sysUtils/builddir/tst_psTrace02.d

@@ -1 @@
-builddir/tst_psTrace02.o builddir/tst_psTrace02.d : tst_psTrace02.c ../../include/pslib.h \
+builddir/tst_psTrace02.o: tst_psTrace02.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/sysUtils/builddir/tst_psTrace03.d

@@ -1 @@
-builddir/tst_psTrace03.o builddir/tst_psTrace03.d : tst_psTrace03.c ../../include/pslib.h \
+builddir/tst_psTrace03.o: tst_psTrace03.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \

trunk/psLib/test/sysUtils/builddir/tst_psTrace04.d

@@ -1 @@
-builddir/tst_psTrace04.o builddir/tst_psTrace04.d : tst_psTrace04.c ../../include/pslib.h \
+builddir/tst_psTrace04.o: tst_psTrace04.c ../../include/pslib.h \
   ../../include/psMemory.h ../../include/psLogMsg.h \
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \