Changeset 2814

Timestamp:

Dec 23, 2004, 1:42:25 PM (22 years ago)

Author:

gusciora

Message:

...

Location:

trunk/psModules/src

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (5 diffs)
• pmReadoutCombine.c (modified) (2 diffs)
• pmReadoutCombine.h (modified) (2 diffs)

trunk/psModules/src/Makefile.am

@@ -2 +2 @@
 
 libpsmodule_a_SOURCES = pmFlatField.c pmMaskBadPixels.c pmSubtractBias.c psTest.c pmSubtractBias.c pmNonLinear.c pmReadoutCombine.c pmSubtractSky.c
-libpsmodule_a_HEADERS = pmFlatField.h pmMaskBadPixels.h pmSubtractBias.h psTest.h pmSubtractBias.h pmReadoutCombine.h pmSubtractSky.h
+
+libpsmodule_a_HEADERS = pmFlatField.h pmMaskBadPixels.h pmSubtractBias.h psTest.h pmSubtractBias.h pmNonLinear.h pmReadoutCombine.h pmSubtractSky.h
+
 libpsmodule_adir = $(includedir)

trunk/psModules/src/Makefile.in

@@ -96 +96 @@
 lib_LIBRARIES = libpsmodule.a
 
-libpsmodule_a_SOURCES = pmFlatField.c pmMaskBadPixels.c pmSubtractBias.c psTest.c pmSubtractBias.c pmNonLinear.c pmReadoutCombine.c pmSubtractSky.c
-libpsmodule_a_HEADERS = pmFlatField.h pmMaskBadPixels.h pmSubtractBias.h psTest.h pmSubtractBias.h pmReadoutCombine.h pmSubtractSky.h
+libpsmodule_a_SOURCES = pmFlatField.c pmMaskBadPixels.c pmSubtractBias.c
+
+libpsmodule_a_HEADERS = pmFlatField.h pmMaskBadPixels.h pmSubtractBias.h
+
 libpsmodule_adir = $(includedir)
 subdir = src
@@ -108 +110 @@
 libpsmodule_a_LIBADD =
 am_libpsmodule_a_OBJECTS = pmFlatField.$(OBJEXT) \
-        pmMaskBadPixels.$(OBJEXT) pmSubtractBias.$(OBJEXT) \
-        psTest.$(OBJEXT) pmSubtractBias.$(OBJEXT) pmNonLinear.$(OBJEXT) \
-        pmReadoutCombine.$(OBJEXT) pmSubtractSky.$(OBJEXT)
+        pmMaskBadPixels.$(OBJEXT) pmSubtractBias.$(OBJEXT)
 libpsmodule_a_OBJECTS = $(am_libpsmodule_a_OBJECTS)
 
@@ -122 +122 @@
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/pmFlatField.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/pmMaskBadPixels.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/pmNonLinear.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/pmReadoutCombine.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/pmSubtractBias.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/pmSubtractSky.Po ./$(DEPDIR)/psTest.Po
+@AMDEP_TRUE@    ./$(DEPDIR)/pmSubtractBias.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
         $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -210 +207 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmFlatField.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmMaskBadPixels.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmNonLinear.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmReadoutCombine.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmSubtractBias.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmSubtractSky.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psTest.Po@am__quote@
 
 distclean-depend:
@@ -411 +404 @@
         uninstall-libLIBRARIES uninstall-libpsmodule_aHEADERS
 
+psTest.c pmSubtractBias.c pmNonLinear.c pmReadoutCombine.c pmSubtractSky.c
+psTest.h pmSubtractBias.h pmNonLinear.h pmReadoutCombine.h pmSubtractSky.h
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

trunk/psModules/src/pmReadoutCombine.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-23 23:16:36 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-12-23 23:42:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -15 +15 @@
 #include<math.h>
 #include "pslib.h"
-#include "psConstants.h"
 
 typedef struct

trunk/psModules/src/pmReadoutCombine.h

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-03 22:10:37 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-12-23 23:42:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -22 +22 @@
 #include<math.h>
 #include "pslib.h"
+#include "psConstants.h"
 // XXX: have Desonia do this correctly.
 #include "../../psLib/src/dataManip/psConstants.h"