Index: trunk/psLib/test/dataManip/Makefile
===================================================================
--- trunk/psLib/test/dataManip/Makefile	(revision 1107)
+++ trunk/psLib/test/dataManip/Makefile	(revision 1109)
@@ -3,10 +3,14 @@
 ##  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,54 +41,34 @@
  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,3 +76,19 @@
 	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
+
+