Index: trunk/psLib/test/dataManip/Makefile
===================================================================
--- trunk/psLib/test/dataManip/Makefile	(revision 1187)
+++ trunk/psLib/test/dataManip/Makefile	(revision 1212)
@@ -3,6 +3,6 @@
 ##  Makefile:   test/sysUtils
 ##
-##  $Revision: 1.32 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-07-07 02:39:21 $
+##  $Revision: 1.33 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-07-13 01:37:59 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -10,99 +10,74 @@
 ###############################################################################
 
+ifndef prefix
+    export prefix=$(shell cd ../..;pwd)
+endif
+
 include ../../src/Makefile.Globals
 
-PSLIB_INCL_DIR = ../../include
+CFLAGS := -I../../include $(CFLAGS)
+LDFLAGS := -L../../lib -lpslib -lpstest $(LDFLAGS)
 
-PSLIB_LIB_DIR = ../../lib
+TARGET = \
+tst_psFunc00 \
+tst_psFunc01 \
+tst_psHist00 \
+tst_psHist01 \
+tst_psHist02 \
+tst_psImageFFT \
+tst_psImageIO \
+tst_psImageManip \
+tst_psImageStats00 \
+tst_psImageStats01 \
+tst_psImageStats02 \
+tst_psImageStats03 \
+tst_psMatrix01 \
+tst_psMatrix02 \
+tst_psMatrix03 \
+tst_psMatrix04 \
+tst_psMatrix05 \
+tst_psMatrix06 \
+tst_psMatrix07 \
+tst_psMatrixVectorArithmetic01 \
+tst_psMatrixVectorArithmetic02 \
+tst_psMatrixVectorArithmetic03 \
+tst_psMinimize00 \
+tst_psMinimize01 \
+tst_psMinimize02 \
+tst_psMinimize03 \
+tst_psMinimize04 \
+tst_psStats00 \
+tst_psStats01 \
+tst_psStats02 \
+tst_psStats03 \
+tst_psStats05 \
+tst_psStats06 \
+tst_psStats07 \
+tst_psStats08 \
+tst_psStats09 \
+tst_psVectorFFT 
 
-TARGET = tst_psMatrix01 \
- tst_psMatrix02 \
- tst_psMatrix03 \
- tst_psMatrix04 \
- tst_psMatrix05 \
- tst_psMatrix06 \
- tst_psMatrix07 \
- tst_psMatrixVectorArithmetic01 \
- tst_psMatrixVectorArithmetic02 \
- tst_psMatrixVectorArithmetic03 \
- tst_psStats00 \
- tst_psStats01 \
- tst_psStats02 \
- tst_psStats03 \
- tst_psStats05 \
- tst_psStats06 \
- tst_psStats07 \
- tst_psStats08 \
- tst_psStats09 \
- tst_psHist00 \
- tst_psHist01 \
- tst_psHist02 \
- tst_psFunc00 \
- tst_psFunc01 \
- tst_psMinimize00 \
- tst_psMinimize01 \
- tst_psMinimize02 \
- tst_psMinimize03 \
- tst_psImageStats00 \
- tst_psImageStats01 \
- tst_psImageStats02
+OBJS = $(addsuffix .o,$(TARGET))
 
 all: $(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_psMatrixVectorArithmetic01: tst_psMatrixVectorArithmetic01.o
-tst_psMatrixVectorArithmetic02: tst_psMatrixVectorArithmetic02.o
-tst_psMatrixVectorArithmetic03: tst_psMatrixVectorArithmetic03.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_psMinimize01:	tst_psMinimize01.o
-tst_psMinimize02:	tst_psMinimize02.o
-tst_psMinimize03:	tst_psMinimize03.o
-tst_psMinimize04:	tst_psMinimize04.o
-tst_psMinimize05:	tst_psMinimize05.o
-tst_psImageStats00:	tst_psImageStats00.o
-tst_psImageStats01:	tst_psImageStats01.o
-tst_psImageStats02:	tst_psImageStats02.o
-tst_psImageStats03:	tst_psImageStats03.o
+# include $(DEPENDENCIES)
 
 clean:
-	@echo "    Deleting executable and binary files for 'test/sysUtils'"
-	$(RM) $(TARGET) *.o *.lint
+	@echo "    Deleting executable and binary files for 'test/collections'"
+	$(RM) $(OBJS)
 
-%.o : %.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) -I.. -I$(PSLIB_INCL_DIR) -c -o $@ $<
-
-%   : %.o
-	$(CC) -o $@ $< -L$(PSLIB_LIB_DIR) -lpslib -lpstest -lgsl -lgslcblas $(LDFLAGS)
-
-## NOTE: The distclean target does not remove the .o files.  The Makefiles must
-## be repaired.
-distclean:
+distclean: clean
 	$(RM) $(TARGET)
 
-%.lint: %.c
-	splint +posixlib -exportlocal -realcompare $(INCLUDE_GLOBAL) $? > $@; cat $@
+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