Changeset 1264

Timestamp:

Jul 22, 2004, 10:42:54 AM (22 years ago)

Author:

desonia

Message:

moved image stuff to own folder.

Location:

trunk/psLib/src

Files:

• Makefile (modified) (8 diffs)
• astronomy/Makefile (modified) (1 diff)
• astronomy/psCCD.d (modified) (1 diff)
• collections/Makefile (modified) (2 diffs)
• dataManip/Makefile (modified) (1 diff)
• dataManip/psFFT.c (modified) (2 diffs)
• dataManip/psFFT.d (modified) (1 diff)
• dataManip/psMatrix.d (modified) (1 diff)
• dataManip/psMatrixVectorArithmetic.d (modified) (1 diff)
• dataManip/psMinimize.d (modified) (1 diff)
• dataManip/psVectorFFT.c (modified) (2 diffs)
• fft/psVectorFFT.c (modified) (2 diffs)

trunk/psLib/src/Makefile

@@ -3 +3 @@
 ##  Makefile:  psLib
 ##
-##  $Revision: 1.15 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-07-15 22:43:53 $
+##  $Revision: 1.16 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-07-22 20:42:54 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -27 +27 @@
    VERSION:= ": Project Version: Unknown "
 else
-   VERSION:= ": Project Version: $(NAME) "
+   VERSION:= ": Project VersidistcleanSysUtils:
+        $(MAKE) --directory=sysUtils distclean
+        
+on: $(NAME) "
 endif
 
 # Define the target to build
 
-ALLTARGETS = sysUtils collections dataManip astronomy
+ALLTARGETS = sysUtils collections image dataManip astronomy
 
 TARGET_DYNAMIC = libpslib.$(DLL)
@@ -39 +42 @@
 # Define the installation targets
 
-INSTALLTARGETS = installSysUtils installCollections installDataManip installAstronomy
+INSTALLTARGETS = installSysUtils installCollections installImage installDataManip installAstronomy
 
 # Define the clean up targets
 
-CLEANTARGETS = cleanSysUtils cleanCollections cleanDataManip cleanAstronomy
+CLEANTARGETS = cleanSysUtils cleanCollections cleanImage cleanDataManip cleanAstronomy
 
 # Define the distribution clean up targets
 
-DISTCLEANTARGETS = distcleanSysUtils distcleanCollections distcleanDataManip distcleanAstronomy
+DISTCLEANTARGETS = distcleanSysUtils distcleanCollections distcleanImage distcleanDataManip distcleanAstronomy
 
 # Define PHONY target "all" which will make all necessary items
@@ -62 +65 @@
 sysUtils:
         $(MAKE) --directory=sysUtils all
+
+image:
+        $(MAKE) --directory=image all
 
 collections:
@@ -80 +86 @@
         $(MAKE) --directory=sysUtils install
 
+installImage:
+        $(MAKE) --directory=image install
+
 installCollections:
         $(MAKE) --directory=collections install
@@ -95 +104 @@
         $(MAKE) --directory=sysUtils clean
 
+cleanImage:
+        $(MAKE) --directory=image clean
+
 cleanCollections:
         $(MAKE) --directory=collections clean
@@ -109 +121 @@
 distcleanSysUtils:
         $(MAKE) --directory=sysUtils distclean
+        
+distcleanImage:
+        $(MAKE) --directory=image distclean
         
 distcleanCollections:
@@ -180 +195 @@
 
 # List of PHONY targets with make file
-.PHONY:  sysUtils collections dataManip astronomy
+.PHONY:  sysUtils collections image dataManip astronomy

trunk/psLib/src/astronomy/Makefile

@@ -5 +5 @@
 TARGET_STATIC  = libpslib.a
 include ../Makefile.Globals
-CFLAGS := $(CFLAGS_RELOC) -I. -I../sysUtils -I../collections -I..
+CFLAGS := $(CFLAGS_RELOC) -I. -I../sysUtils -I../collections -I.. -I../image
 
 SRC_OBJS = psTime.o \

trunk/psLib/src/astronomy/psCCD.d

@@ -1 @@
-psCCD.o psCCD.d : psCCD.c psCCD.h ../collections/psType.h ../collections/psImage.h \
+psCCD.o psCCD.d : psCCD.c psCCD.h ../collections/psType.h ../image/psImage.h \
   ../collections/psArray.h ../collections/psCompare.h \
   ../collections/psList.h ../sysUtils/psMemory.h

trunk/psLib/src/collections/Makefile

@@ -3 +3 @@
 ##  Makefile:   collections
 ##
-##  $Revision: 1.25 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-07-15 23:52:33 $
+##  $Revision: 1.26 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-07-22 20:42:54 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -32 +32 @@
 SRC_OBJS = psBitSet.o \
            psVector.o \
-           psImage.o \
            psList.o \
            psScalar.o \

trunk/psLib/src/dataManip/Makefile

@@ -5 +5 @@
 TARGET_STATIC  = libpslib.a
 include ../Makefile.Globals
-CFLAGS := $(CFLAGS_RELOC) -I. -I../sysUtils -I../collections -I..
+CFLAGS := $(CFLAGS_RELOC) -I. -I../sysUtils -I../collections -I.. -I../image
 
 SRC_OBJS = psStats.o  \
            psFunctions.o \
-           psImageStats.o \
            psMatrix.o \
            psMatrixVectorArithmetic.o \
            psFFT.o \
-           psImageIO.o \
            psMinimize.o \
-           psImageManip.o
            
 all: $(TARGET_STATIC)

trunk/psLib/src/dataManip/psFFT.c

@@ -5 +5 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-23 23:00:15 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-22 20:42:54 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -21 +21 @@
 #include "psMemory.h"
 #include "psLogMsg.h"
+#include "psImageExtraction.h"
 
 #define P_FFTW_PLAN_RIGOR FFTW_ESTIMATE

trunk/psLib/src/dataManip/psFFT.d

@@ -1 @@
-psFFT.o psFFT.d : psFFT.c psFFT.h ../collections/psImage.h ../collections/psType.h \
+psFFT.o psFFT.d : psFFT.c psFFT.h ../image/psImage.h ../collections/psType.h \
   ../collections/psVector.h ../sysUtils/psError.h ../sysUtils/psMemory.h \
-  ../sysUtils/psLogMsg.h
+  ../sysUtils/psLogMsg.h ../image/psImageExtraction.h

trunk/psLib/src/dataManip/psMatrix.d

@@ -1 +1 @@
 psMatrix.o psMatrix.d : psMatrix.c ../sysUtils/psMemory.h ../sysUtils/psError.h \
-  ../collections/psImage.h ../collections/psType.h \
-  ../collections/psVector.h psMatrix.h
+  ../image/psImage.h ../collections/psType.h ../collections/psVector.h \
+  psMatrix.h

trunk/psLib/src/dataManip/psMatrixVectorArithmetic.d

@@ -1 +1 @@
 psMatrixVectorArithmetic.o psMatrixVectorArithmetic.d : psMatrixVectorArithmetic.c \
-  ../sysUtils/psMemory.h ../sysUtils/psError.h ../collections/psImage.h \
+  ../sysUtils/psMemory.h ../sysUtils/psError.h ../image/psImage.h \
   ../collections/psType.h ../collections/psVector.h \
   ../collections/psScalar.h

trunk/psLib/src/dataManip/psMinimize.d

@@ -1 +1 @@
 psMinimize.o psMinimize.d : psMinimize.c ../sysUtils/psMemory.h \
-  ../collections/psVector.h ../collections/psType.h \
-  ../collections/psImage.h ../sysUtils/psTrace.h ../sysUtils/psError.h \
-  ../sysUtils/psAbort.h psFunctions.h psMinimize.h psMatrix.h
+  ../collections/psVector.h ../collections/psType.h ../image/psImage.h \
+  ../sysUtils/psTrace.h ../sysUtils/psError.h ../sysUtils/psAbort.h \
+  psFunctions.h psMinimize.h psMatrix.h

trunk/psLib/src/dataManip/psVectorFFT.c

@@ -5 +5 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-23 23:00:15 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-22 20:42:54 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -21 +21 @@
 #include "psMemory.h"
 #include "psLogMsg.h"
+#include "psImageExtraction.h"
 
 #define P_FFTW_PLAN_RIGOR FFTW_ESTIMATE

trunk/psLib/src/fft/psVectorFFT.c

@@ -5 +5 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-23 23:00:15 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-22 20:42:54 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -21 +21 @@
 #include "psMemory.h"
 #include "psLogMsg.h"
+#include "psImageExtraction.h"
 
 #define P_FFTW_PLAN_RIGOR FFTW_ESTIMATE