Index: /trunk/psLib/src/astronomy/Makefile
===================================================================
--- /trunk/psLib/src/astronomy/Makefile	(revision 1337)
+++ /trunk/psLib/src/astronomy/Makefile	(revision 1338)
@@ -12,12 +12,14 @@
            psCoord.o
 
+OBJS = $(addprefix makedir/,$(SRC_OBJS))
+
 all: $(TARGET_STATIC)
 
 # Rule to make static library
 
-libpslib.a:     $(SRC_OBJS)
+libpslib.a:     $(OBJS)
 # The ar option -r is to add/replace object and -s is to create
 # a symbol table in the archive
-	$(AR) rcs ../$@ $(SRC_OBJS)
+	$(AR) rcs ../$@ $(OBJS)
 
 # Define PHONY target "install" which will install necessary files
@@ -32,5 +34,8 @@
 clean:
 	@echo "    Deleting intermediate files for 'astronomy'"
-	$(RM) $(SRC_OBJS) *.lint $(SRC_OBJS:.o=.i)
+	$(RM) $(OBJS) *.lint $(SRC_OBJS:.o=.i)
+
+cleandep:
+	$(RM) $(OBJS:.o=.d)
 
 %.lint: %.c
@@ -40,11 +45,11 @@
 	$(CC) -E $(CFLAGS) -o $@ $<
 
-%.o: %.i
+makedir/%.o: %.c
 	$(CC) -c $(CFLAGS) -o $@ $<
 
-%.d: %.c
+makedir/%.d: %.c
 	$(CC) -MM $(CFLAGS) $< > $@.tmp
-	sed 's/\($*\)\.o[ :]*/\1.o $@ : /g' $@.tmp > $@
+	sed 's|\($*\)\.o[ :]*|\1.o $@ : |g' $@.tmp > $@
 	$(RM) -f $@.tmp
 
-include $(SRC_OBJS:.o=.d)
+include $(OBJS:.o=.d)
Index: unk/psLib/src/astronomy/psCCD.d
===================================================================
--- /trunk/psLib/src/astronomy/psCCD.d	(revision 1337)
+++ 	(revision )
@@ -1,3 +1,0 @@
-psCCD.o psCCD.d : psCCD.c psCCD.h ../sysUtils/psType.h ../image/psImage.h \
-  ../collections/psArray.h ../collections/psCompare.h \
-  ../collections/psList.h ../sysUtils/psMemory.h
Index: unk/psLib/src/astronomy/psTime.d
===================================================================
--- /trunk/psLib/src/astronomy/psTime.d	(revision 1337)
+++ 	(revision )
@@ -1,2 +1,0 @@
-psTime.o psTime.d : psTime.c psTime.h ../sysUtils/psType.h ../sysUtils/psError.h \
-  ../sysUtils/psMemory.h
Index: /trunk/psLib/src/collections/Makefile
===================================================================
--- /trunk/psLib/src/collections/Makefile	(revision 1337)
+++ /trunk/psLib/src/collections/Makefile	(revision 1338)
@@ -3,6 +3,6 @@
 ##  Makefile:   collections
 ##
-##  $Revision: 1.26 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-07-22 20:42:54 $
+##  $Revision: 1.27 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-07-29 21:43:11 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -37,4 +37,6 @@
            psArray.o
 
+OBJS = $(addprefix makedir/,$(SRC_OBJS))
+
 # Define PHONY target "all" which will make all the necessary items
 
@@ -43,8 +45,8 @@
 # Rule to make static library
 
-libpslib.a: $(SRC_OBJS)
+libpslib.a: $(OBJS)
 # The ar option -r is to add/replace object and -s is to create
 # a symbol table in the archive
-	$(AR) rcs ../$@ $(SRC_OBJS)
+	$(AR) rcs ../$@ $(OBJS)
 
 # Define PHONY target "install" which will install necessary files
@@ -62,5 +64,8 @@
 clean:
 	@echo "    Deleting intermediate files for 'collections'"
-	$(RM) $(SRC_OBJS) *.lint $(SRC_OBJS:.o=.i)
+	$(RM) $(OBJS) *.lint $(SRC_OBJS:.o=.i)
+
+cleandep:
+	$(RM) $(OBJS:.o=.d)
 
 %.lint: %.c
@@ -70,11 +75,11 @@
 	$(CC) -E $(CFLAGS) -o $@ $<
 
-%.o: %.i
+makedir/%.o: %.c
 	$(CC) -c $(CFLAGS) -o $@ $<
 
-%.d: %.c
+makedir/%.d: %.c
 	$(CC) -MM $(CFLAGS) $< > $@.tmp
-	sed 's/\($*\)\.o[ :]*/\1.o $@ : /g' $@.tmp > $@
+	sed 's|\($*\)\.o[ :]*|\1.o $@ : |g' $@.tmp > $@
 	$(RM) -f $@.tmp
 
-include $(SRC_OBJS:.o=.d)
+include $(OBJS:.o=.d)
Index: /trunk/psLib/src/dataManip/Makefile
===================================================================
--- /trunk/psLib/src/dataManip/Makefile	(revision 1337)
+++ /trunk/psLib/src/dataManip/Makefile	(revision 1338)
@@ -13,5 +13,7 @@
            psFFT.o \
            psMinimize.o \
-           
+ 
+OBJS = $(addprefix makedir/,$(SRC_OBJS))
+          
 all: $(TARGET_STATIC)
 
@@ -21,8 +23,8 @@
 # Rule to make static library
 
-libpslib.a:     $(SRC_OBJS)
+libpslib.a:     $(OBJS)
 # The ar option -r is to add/replace object and -s is to create
 # a symbol table in the archive
-	$(AR) rcs ../$@ $(SRC_OBJS)
+	$(AR) rcs ../$@ $(OBJS)
 
 # Define PHONY target "install" which will install necessary files
@@ -37,5 +39,8 @@
 clean:
 	@echo "    Deleting intermediate files for 'sysUtils'"
-	$(RM) $(SRC_OBJS) *.lint $(SRC_OBJS:.o=.i)
+	$(RM) $(OBJS) *.lint $(SRC_OBJS:.o=.i)
+
+cleandep:
+	$(RM) $(OBJS:.o=.d)
 
 %.lint: %.c
@@ -45,11 +50,11 @@
 	$(CC) -E $(CFLAGS) -o $@ $<
 
-%.o: %.i
+makedir/%.o: %.c
 	$(CC) -c $(CFLAGS) -o $@ $<
 
-%.d: %.c
+makedir/%.d: %.c
 	$(CC) -MM $(CFLAGS) $< > $@.tmp
-	sed 's/\($*\)\.o[ :]*/\1.o $@ : /g' $@.tmp > $@
+	sed 's|\($*\)\.o[ :]*|\1.o $@ : |g' $@.tmp > $@
 	$(RM) -f $@.tmp
 
-include $(SRC_OBJS:.o=.d)
+include $(OBJS:.o=.d)
Index: unk/psLib/src/dataManip/psFFT.d
===================================================================
--- /trunk/psLib/src/dataManip/psFFT.d	(revision 1337)
+++ 	(revision )
@@ -1,3 +1,0 @@
-psFFT.o psFFT.d : psFFT.c psFFT.h ../image/psImage.h ../sysUtils/psType.h \
-  ../collections/psVector.h ../sysUtils/psError.h ../sysUtils/psMemory.h \
-  ../sysUtils/psLogMsg.h ../image/psImageExtraction.h psStats.h
Index: unk/psLib/src/dataManip/psFunctions.d
===================================================================
--- /trunk/psLib/src/dataManip/psFunctions.d	(revision 1337)
+++ 	(revision )
@@ -1,3 +1,0 @@
-psFunctions.o psFunctions.d : psFunctions.c ../sysUtils/psMemory.h \
-  ../collections/psVector.h ../sysUtils/psType.h ../sysUtils/psTrace.h \
-  ../sysUtils/psError.h ../sysUtils/psAbort.h psFunctions.h
Index: unk/psLib/src/dataManip/psMatrix.d
===================================================================
--- /trunk/psLib/src/dataManip/psMatrix.d	(revision 1337)
+++ 	(revision )
@@ -1,3 +1,0 @@
-psMatrix.o psMatrix.d : psMatrix.c ../sysUtils/psMemory.h ../sysUtils/psError.h \
-  ../image/psImage.h ../sysUtils/psType.h ../collections/psVector.h \
-  psMatrix.h
Index: unk/psLib/src/dataManip/psMatrixVectorArithmetic.d
===================================================================
--- /trunk/psLib/src/dataManip/psMatrixVectorArithmetic.d	(revision 1337)
+++ 	(revision )
@@ -1,4 +1,0 @@
-psMatrixVectorArithmetic.o psMatrixVectorArithmetic.d : psMatrixVectorArithmetic.c \
-  ../sysUtils/psMemory.h ../sysUtils/psError.h ../image/psImage.h \
-  ../sysUtils/psType.h ../collections/psVector.h \
-  ../collections/psScalar.h
Index: unk/psLib/src/dataManip/psMinimize.d
===================================================================
--- /trunk/psLib/src/dataManip/psMinimize.d	(revision 1337)
+++ 	(revision )
@@ -1,4 +1,0 @@
-psMinimize.o psMinimize.d : psMinimize.c ../sysUtils/psMemory.h \
-  ../collections/psVector.h ../sysUtils/psType.h ../image/psImage.h \
-  ../sysUtils/psTrace.h ../sysUtils/psError.h ../sysUtils/psAbort.h \
-  psFunctions.h psMinimize.h psMatrix.h
Index: unk/psLib/src/dataManip/psStats.d
===================================================================
--- /trunk/psLib/src/dataManip/psStats.d	(revision 1337)
+++ 	(revision )
@@ -1,4 +1,0 @@
-psStats.o psStats.d : psStats.c ../sysUtils/psMemory.h ../image/psImage.h \
-  ../sysUtils/psType.h ../collections/psVector.h ../sysUtils/psTrace.h \
-  ../sysUtils/psError.h ../sysUtils/psAbort.h psStats.h psMinimize.h \
-  psFunctions.h
Index: /trunk/psLib/src/image/Makefile
===================================================================
--- /trunk/psLib/src/image/Makefile	(revision 1337)
+++ /trunk/psLib/src/image/Makefile	(revision 1338)
@@ -3,6 +3,6 @@
 ##  Makefile:   collections
 ##
-##  $Revision: 1.1 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-07-22 20:47:55 $
+##  $Revision: 1.2 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-07-29 21:43:11 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -36,4 +36,6 @@
            psImageStats.o
 
+OBJS = $(addprefix makedir/,$(SRC_OBJS))
+
 # Define PHONY target "all" which will make all the necessary items
 
@@ -42,8 +44,8 @@
 # Rule to make static library
 
-libpslib.a: $(SRC_OBJS)
+libpslib.a: $(OBJS)
 # The ar option -r is to add/replace object and -s is to create
 # a symbol table in the archive
-	$(AR) rcs ../$@ $(SRC_OBJS)
+	$(AR) rcs ../$@ $(OBJS)
 
 # Define PHONY target "install" which will install necessary files
@@ -61,5 +63,8 @@
 clean:
 	@echo "    Deleting intermediate files for 'collections'"
-	$(RM) $(SRC_OBJS) *.lint $(SRC_OBJS:.o=.i)
+	$(RM) $(OBJS) *.lint $(SRC_OBJS:.o=.i)
+
+cleandep:
+	$(RM) $(OBJS:.o=.d)
 
 %.lint: %.c
@@ -69,11 +74,11 @@
 	$(CC) -E $(CFLAGS) -o $@ $<
 
-%.o: %.i
+makedir/%.o: %.c
 	$(CC) -c $(CFLAGS) -o $@ $<
 
-%.d: %.c
+makedir/%.d: %.c
 	$(CC) -MM $(CFLAGS) $< > $@.tmp
-	sed 's/\($*\)\.o[ :]*/\1.o $@ : /g' $@.tmp > $@
+	sed 's|\($*\)\.o[ :]*|\1.o $@ : |g' $@.tmp > $@
 	$(RM) -f $@.tmp
 
-include $(SRC_OBJS:.o=.d)
+include $(OBJS:.o=.d)
Index: unk/psLib/src/image/psImage.d
===================================================================
--- /trunk/psLib/src/image/psImage.d	(revision 1337)
+++ 	(revision )
@@ -1,2 +1,0 @@
-psImage.o psImage.d : psImage.c ../sysUtils/psMemory.h ../sysUtils/psAbort.h \
-  ../sysUtils/psError.h psImage.h ../sysUtils/psType.h
Index: unk/psLib/src/image/psImageExtraction.d
===================================================================
--- /trunk/psLib/src/image/psImageExtraction.d	(revision 1337)
+++ 	(revision )
@@ -1,3 +1,0 @@
-psImageExtraction.o psImageExtraction.d : psImageExtraction.c ../sysUtils/psMemory.h \
-  psImageExtraction.h psImage.h ../sysUtils/psType.h \
-  ../collections/psVector.h ../dataManip/psStats.h ../sysUtils/psError.h
Index: unk/psLib/src/image/psImageIO.d
===================================================================
--- /trunk/psLib/src/image/psImageIO.d	(revision 1337)
+++ 	(revision )
@@ -1,2 +1,0 @@
-psImageIO.o psImageIO.d : psImageIO.c psImageIO.h psImage.h ../sysUtils/psType.h \
-  ../sysUtils/psError.h ../sysUtils/psMemory.h
Index: unk/psLib/src/image/psImageManip.d
===================================================================
--- /trunk/psLib/src/image/psImageManip.d	(revision 1337)
+++ 	(revision )
@@ -1,3 +1,0 @@
-psImageManip.o psImageManip.d : psImageManip.c ../sysUtils/psError.h psImage.h \
-  ../sysUtils/psType.h ../dataManip/psStats.h ../collections/psVector.h \
-  ../sysUtils/psMemory.h psImageExtraction.h
Index: unk/psLib/src/image/psImageStats.d
===================================================================
--- /trunk/psLib/src/image/psImageStats.d	(revision 1337)
+++ 	(revision )
@@ -1,4 +1,0 @@
-psImageStats.o psImageStats.d : psImageStats.c ../sysUtils/psMemory.h \
-  ../collections/psVector.h ../sysUtils/psType.h ../sysUtils/psTrace.h \
-  ../sysUtils/psError.h ../sysUtils/psAbort.h ../dataManip/psStats.h \
-  psImage.h ../dataManip/psFunctions.h psImageStats.h
Index: /trunk/psLib/src/sysUtils/Makefile
===================================================================
--- /trunk/psLib/src/sysUtils/Makefile	(revision 1337)
+++ /trunk/psLib/src/sysUtils/Makefile	(revision 1338)
@@ -3,6 +3,6 @@
 ##  Makefile:   sysUtils
 ##
-##  $Revision: 1.16 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-06-10 20:40:26 $
+##  $Revision: 1.17 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-07-29 21:43:11 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -38,4 +38,6 @@
            psString.o    
 
+OBJS = $(addprefix makedir/,$(SRC_OBJS))
+
 # Define PHONY target "all" which will make all the necessary items
 
@@ -44,8 +46,8 @@
 # Rule to make static library
 
-libpslib.a: $(SRC_OBJS)
+libpslib.a: $(OBJS)
 # The ar option -r is to add/replace object and -s is to create
 # a symbol table in the archive
-	$(AR) rcs ../$@ $(SRC_OBJS)
+	$(AR) rcs ../$@ $(OBJS)
 
 # Define PHONY target "install" which will install necessary files
@@ -63,13 +65,19 @@
 clean:
 	@echo "    Deleting intermediate files for 'sysUtils'"
-	$(RM) $(SRC_OBJS) *.lint
+	$(RM) $(OBJS) *.lint
+
+cleandep:
+	$(RM) $(OBJS:.o=.d)
 
 %.lint: %.c
 	splint +posixlib -exportlocal -realcompare $(INCLUDE_GLOBAL) $? > $@; cat $@
 
-%.d: %.c
+makedir/%.o: %.c
+	$(CC) -c $(CFLAGS) -o $@ $<
+
+makedir/%.d: %.c
 	$(CC) -MM $(CFLAGS) $< > $@.tmp
-	sed 's/\($*\)\.o[ :]*/\1.o $@ : /g' $@.tmp > $@
+	sed 's|\($*\)\.o[ :]*|\1.o $@ : |g' $@.tmp > $@
 	$(RM) -f $@.tmp
 
-include $(SRC_OBJS:.o=.d)
+include $(OBJS:.o=.d)
Index: unk/psLib/src/sysUtils/psAbort.d
===================================================================
--- /trunk/psLib/src/sysUtils/psAbort.d	(revision 1337)
+++ 	(revision )
@@ -1,1 +1,0 @@
-psAbort.o psAbort.d : psAbort.c psAbort.h psLogMsg.h
Index: unk/psLib/src/sysUtils/psError.d
===================================================================
--- /trunk/psLib/src/sysUtils/psError.d	(revision 1337)
+++ 	(revision )
@@ -1,1 +1,0 @@
-psError.o psError.d : psError.c psLogMsg.h psError.h
Index: unk/psLib/src/sysUtils/psHash.d
===================================================================
--- /trunk/psLib/src/sysUtils/psHash.d	(revision 1337)
+++ 	(revision )
@@ -1,3 +1,0 @@
-psHash.o psHash.d : psHash.c psHash.h ../collections/psList.h \
-  ../collections/psCompare.h ../collections/psArray.h \
-  ../sysUtils/psType.h psMemory.h psString.h psTrace.h psAbort.h
Index: unk/psLib/src/sysUtils/psLogMsg.d
===================================================================
--- /trunk/psLib/src/sysUtils/psLogMsg.d	(revision 1337)
+++ 	(revision )
@@ -1,1 +1,0 @@
-psLogMsg.o psLogMsg.d : psLogMsg.c psLogMsg.h psError.h psErrorCodes.h psTrace.h
Index: unk/psLib/src/sysUtils/psMemory.d
===================================================================
--- /trunk/psLib/src/sysUtils/psMemory.d	(revision 1337)
+++ 	(revision )
@@ -1,1 +1,0 @@
-psMemory.o psMemory.d : psMemory.c psMemory.h psError.h psAbort.h psLogMsg.h
Index: unk/psLib/src/sysUtils/psString.d
===================================================================
--- /trunk/psLib/src/sysUtils/psString.d	(revision 1337)
+++ 	(revision )
@@ -1,1 +1,0 @@
-psString.o psString.d : psString.c psString.h psMemory.h psError.h
Index: unk/psLib/src/sysUtils/psTrace.d
===================================================================
--- /trunk/psLib/src/sysUtils/psTrace.d	(revision 1337)
+++ 	(revision )
@@ -1,1 +1,0 @@
-psTrace.o psTrace.d : psTrace.c psMemory.h psTrace.h psString.h psError.h