Changeset 3231

Timestamp:

Feb 15, 2005, 1:59:06 PM (21 years ago)

Author:

desonia

Message:

* empty log message *

Location:

trunk

Files:

• psLib/configure.ac (modified) (8 diffs)
• psModules/src/pmObjects.c (modified) (8 diffs)
• psModules/test/Makefile.am (modified) (1 diff)

trunk/psLib/configure.ac

@@ -1 @@
-AC_INIT([pslib],[1.4])
+AC_INIT([pslib],[1.4],[robert.desonia@mhpcc.hpc.mil])
 AM_CONFIG_HEADER(src/config.h)
 AM_INIT_AUTOMAKE(pslib, 1.4)
@@ -7 +7 @@
 
 dnl Setup CFLAGS with project-particulars
-CFLAGS="${CFLAGS=} -std=c99 -D_GNU_SOURCE"
+CFLAGS="${CFLAGS=} -std=c99 -Wall"
 SUBDIR="etc src test" dnl don't include 'swig', as it is optional
 AH_VERBATIM([_GNU_SOURCE], 
@@ -30 +30 @@
 AC_LANG(C)
 AC_PROG_CC
+AC_LANG_WERROR
+AC_GNU_SOURCE
+
+AC_LANG_PUSH(Fortran 77)
 AC_PROG_F77
 AC_F77_WRAPPERS
-AC_F77_LIBRARY_LDFLAGS
+AC_LANG_POP(Fortran 77)
+
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
@@ -55 +60 @@
 [CFITSIO_LDFLAGS="-L$withval"])
 CFLAGS="${CFLAGS=} $CFITSIO_CFLAGS"
+LDFLAGS="${LDFLAGS} $CFITSIO_LDFLAGS -lcfitsio"
 PSLIB_LIBS="${PSLIB_LIBS=} $CFITSIO_LDFLAGS -lcfitsio"
 AC_CHECK_HEADERS([fitsio.h],[],
@@ -71 +77 @@
 [FFTW3_LDFLAGS="-L$withval"])
 CFLAGS="${CFLAGS=} $FFTW3_CFLAGS"
+LDFLAGS="${LDFLAGS=} $FFTW3_LDFLAGS -lfftw3f"
 PSLIB_LIBS="${PSLIB_LIBS=} $FFTW3_LDFLAGS -lfftw3f"
 AC_MSG_CHECKING([FFTW header files])
@@ -87 +94 @@
 AC_MSG_RESULT([${GSL_CFLAGS}])
 CFLAGS="${CFLAGS=} ${GSL_CFLAGS}"
+LDFLAGS="${LDFLAGS=} `${GSL_CONFIG} --libs`"
 PSLIB_LIBS="${PSLIB_LIBS=} `${GSL_CONFIG} --libs`"
    
@@ -100 +108 @@
 AC_MSG_RESULT([${XML_CFLAGS}])
 CFLAGS="${CFLAGS=} ${XML_CFLAGS}"
+LDFLAGS="${LDFLAGS=} `${XML_CONFIG} --libs`"
 PSLIB_LIBS="${PSLIB_LIBS=} `${XML_CONFIG} --libs`"
 
@@ -149 +158 @@
 AC_SUBST(DOXYGEN,$DOXYGEN)
 
-CFLAGS="${CFLAGS=} -Wall -Werror"
 CFLAGS="${CFLAGS=}  -DPS_CONFIG_FILE_DEFAULT=\\\"$sysconfdir/pslib/psTime.config\\\""
 

trunk/psModules/src/pmObjects.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-25 02:45:43 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-15 23:59:05 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -114 +114 @@
                     (image->data.F32[row][col] >  image->data.F32[row+1][col]) &&
                     (image->data.F32[row][col] >= image->data.F32[row+1][col+1])) {
-                if (image->data.F32[row][col] > threashold) {
+                if (image->data.F32[row][col] > threshold) {
                     // Add peak at location (row, col)
                 }
@@ -124 +124 @@
                     (image->data.F32[row][col] >  image->data.F32[row+1][col]) &&
                     (image->data.F32[row][col] >= image->data.F32[row+1][col+1])) {
-                if (image->data.F32[row][col] > threashold) {
+                if (image->data.F32[row][col] > threshold) {
                     // Add peak at location (row, col)
                 }
@@ -133 +133 @@
                     (image->data.F32[row][col] > image->data.F32[row+1][col]) &&
                     (image->data.F32[row][col] >= image->data.F32[row+1][col-1])) {
-                if (image->data.F32[row][col] > threashold) {
+                if (image->data.F32[row][col] > threshold) {
                     // Add peak at location (row, col)
                 }
@@ -159 +159 @@
                     (image->data.F32[row][col] >= image->data.F32[row+1][col]) &&
                     (image->data.F32[row][col] >= image->data.F32[row+1][col+1])) {
-                if (image->data.F32[row][col] > threashold) {
+                if (image->data.F32[row][col] > threshold) {
                     // Add peak at location (row, col)
                 }
@@ -175 +175 @@
                     (image->data.F32[row][col] >= image->data.F32[row-1][col+1]) &&
                     (image->data.F32[row][col] >  image->data.F32[row][col+1])) {
-                if (image->data.F32[row][col] > threashold) {
+                if (image->data.F32[row][col] > threshold) {
                     // Add peak at location (row, col)
                 }
@@ -185 +185 @@
                     (image->data.F32[row][col] >  image->data.F32[row][col-1]) &&
                     (image->data.F32[row][col] >= image->data.F32[row][col+1])) {
-                if (image->data.F32[row][col] > threashold) {
+                if (image->data.F32[row][col] > threshold) {
                     // Add peak at location (row, col)
                 }
@@ -194 +194 @@
                     (image->data.F32[row][col] >  image->data.F32[row-1][col]) &&
                     (image->data.F32[row][col] >  image->data.F32[row][col-1])) {
-                if (image->data.F32[row][col] > threashold) {
+                if (image->data.F32[row][col] > threshold) {
                     // Add peak at location (row, col)
                 }

trunk/psModules/test/Makefile.am

@@ -1 +1 @@
 bin_PROGRAMS = tst_pmFlatField tst_pmMaskBadPixels tst_pmNonLinear tst_pmSubtractBias tst_pmReadoutCombine tst_pmSubtractSky
 
+AM_LDFLAGS = -L../src -lpsmodule $(LDFLAGS)
+
 tst_pmFlatField_SOURCES = tst_pmFlatField.c
-tst_pmFlatField_LDFLAGS = -L../src -lpsmodule
 
 tst_pmMaskBadPixels_SOURCES = tst_pmMaskBadPixels.c
-tst_pmMaskBadPixels_LDFLAGS = -L../src -lpsmodule
 
 tst_pmNonLinear_SOURCES = tst_pmNonLinear.c
-tst_pmNonLinear_LDFLAGS = -L../src -lpsmodule
 
 tst_pmSubtractBias_SOURCES = tst_pmSubtractBias.c
-tst_pmSubtractBias_LDFLAGS = -L../src -lpsmodule
 
 tst_pmReadoutCombine_SOURCES = tst_pmReadoutCombine.c
-tst_pmReadoutCombine_LDFLAGS = -L../src -lpsmodule
 
 tst_pmSubtractSky_SOURCES = tst_pmSubtractSky.c
-tst_pmSubtractSky_LDFLAGS = -L../src -lpsmodule