Index: /trunk/psLib/src/Makefile
===================================================================
--- /trunk/psLib/src/Makefile	(revision 656)
+++ /trunk/psLib/src/Makefile	(revision 657)
@@ -3,6 +3,6 @@
 ##  Makefile:  psLib
 ##
-##  $Revision: 1.9 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-05-12 21:49:39 $
+##  $Revision: 1.10 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-05-13 06:06:33 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -32,5 +32,5 @@
 # Define the target to build
 
-ALLTARGETS = sysUtils collections
+ALLTARGETS = sysUtils collections dataManip
 
 TARGET_DYNAMIC = libpslib.$(DLL)
@@ -39,13 +39,13 @@
 # Define the installation targets
 
-INSTALLTARGETS = installSysUtils installCollections
+INSTALLTARGETS = installSysUtils installCollections installDataManip
 
 # Define the clean up targets
 
-CLEANTARGETS = cleanSysUtils cleanCollections
+CLEANTARGETS = cleanSysUtils cleanCollections cleanDataManip
 
 # Define the distribution clean up targets
 
-DISTCLEANTARGETS = distcleanSysUtils distcleanCollections
+DISTCLEANTARGETS = distcleanSysUtils distcleanCollections distcleanDataManip
 
 # Define PHONY target "all" which will make all necessary items
@@ -66,4 +66,7 @@
 	$(MAKE) --directory=collections all
 
+dataManip:
+	$(MAKE) --directory=dataManip all
+
 
 ## ADD ADDITIONAL PORTIONS OF PSLIB HERE
@@ -78,4 +81,7 @@
 	$(MAKE) --directory=collections install
 
+installDataManip:
+	$(MAKE) --directory=dataManip install
+
 
 # Define PHONY target "cleanSysUtils" which will clean up the development
@@ -88,4 +94,7 @@
 	$(MAKE) --directory=collections clean
 
+cleanDataManip:
+	$(MAKE) --directory=dataManip clean
+
 # Define PHONY target "distcleanSysUtils which will clean up the distribution
 # files related to system utilities
@@ -96,4 +105,7 @@
 distcleanCollections:
 	$(MAKE) --directory=collections distclean
+
+distcleanDataManip:
+	$(MAKE) --directory=dataManip distclean
 
 
@@ -156,3 +168,3 @@
 
 # List of PHONY targets with make file
-.PHONY:  sysUtils collections
+.PHONY:  sysUtils collections dataManip
Index: /trunk/psLib/src/dataManip/Makefile
===================================================================
--- /trunk/psLib/src/dataManip/Makefile	(revision 656)
+++ /trunk/psLib/src/dataManip/Makefile	(revision 657)
@@ -3,27 +3,16 @@
 endif
 
-# Define the two targets to be built
-
-TARGET_STATIC  = libpsDataManip.a
-
-# Include the make global definitions for the project
-
+TARGET_STATIC  = libpslib.a
 include ../Makefile.Globals
-
-# Set CFLAGS used by the implicit rule to compile .c
-
-CFLAGS := $(CFLAGS_RELOC)
-
-# Define the source objects
-
+CFLAGS := $(CFLAGS_RELOC) -I.
 SRC_OBJS = psStats.o
-
-# Define PHONY target "all" which will make all the necessary items
 
 all: $(TARGET_STATIC)
 
-# Rule to make static library
+%.o:	%.c
+	@echo "    Compiling $<. "
+	$(CC) $(CFLAGS) -I../../include -c $< -o $@
 
-libpslib.a: $(SRC_OBJS)
+libpslib.a:	$(SRC_OBJS)
 # The ar option -r is to add/replace object and -s is to create
 # a symbol table in the archive
@@ -31,15 +20,12 @@
 
 # Define PHONY target "install" which will install necessary files
-
 install: $(TARGET_STATIC) 
 	install *.h $(includedir)
 
 # Define PHONY target "distclean" which will cleanup the distribution
-
 distclean:	clean
 	$(RM) ../$(TARGET_STATIC)
 
 # Define PHONY target "clean" which will cleanup the development area
-
 clean:
 	@echo "    Deleting intermediate files for 'sysUtils'"
@@ -50,41 +36,2 @@
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-%.o: %.c
-	@echo "    Compiling $<. "
-	$(CC) $(CFLAGS) -I../../include -c $< -o $@
-
-libpsDataManip.a: $(SRC_OBJS)
-#	$(AR) rcs libpsDataManip.a $(SRC_OBJS)
-	$(AR) rcs ../$@ $(SRC_OBJS)
-
-install: $(TARGET)
-	install *.h $(includedir)
-
-distclean:	clean
-	$(RM) $(TARGET)
-
-clean:
-	@echo "    Deleting intermediate files for 'utilities - $(CFG)'"
-	$(RM) $(SRC_OBJS) *.lint
-
-%.lint: %.c
-	splint +posixlib -exportlocal -realcompare $(INCLUDE_GLOBAL) $? > $@; cat $@ 
Index: /trunk/psLib/src/dataManip/psStats.c
===================================================================
--- /trunk/psLib/src/dataManip/psStats.c	(revision 656)
+++ /trunk/psLib/src/dataManip/psStats.c	(revision 657)
@@ -12,5 +12,4 @@
  *****************************************************************************/
 #include "psStats.h"
-
 /******************************************************************************
     psStatsAlloc(): This routine must create a new psStats data structure.
Index: /trunk/psLib/src/math/psStats.c
===================================================================
--- /trunk/psLib/src/math/psStats.c	(revision 656)
+++ /trunk/psLib/src/math/psStats.c	(revision 657)
@@ -12,5 +12,4 @@
  *****************************************************************************/
 #include "psStats.h"
-
 /******************************************************************************
     psStatsAlloc(): This routine must create a new psStats data structure.
Index: /trunk/psLib/test/dataManip/Makefile
===================================================================
--- /trunk/psLib/test/dataManip/Makefile	(revision 656)
+++ /trunk/psLib/test/dataManip/Makefile	(revision 657)
@@ -3,6 +3,6 @@
 ##  Makefile:   test/sysUtils
 ##
-##  $Revision: 1.1 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-05-13 02:02:24 $
+##  $Revision: 1.2 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-05-13 06:06:34 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -30,5 +30,5 @@
 
 %   : %.o
-	$(CC) $(LDFLAGS) -L.. -L$(PSLIB_LIB_DIR) -lpslib -lpstest -lpsDataManip -o $@ $<
+	$(CC) $(LDFLAGS) -L.. -L$(PSLIB_LIB_DIR) -lpslib -lpstest -o $@ $<
 
 %.lint: %.c