Index: trunk/psModules/src/Makefile =================================================================== --- trunk/psModules/src/Makefile (revision 1888) +++ trunk/psModules/src/Makefile (revision 1889) @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.7.8 from Makefile.am. +# Makefile.in generated by automake 1.8.3 from Makefile.am. # src/Makefile. Generated from Makefile.in by configure. -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,4 +15,8 @@ + + +SOURCES = $(libpsmodule_a_SOURCES) $(tst_pmFlatField_SOURCES) $(tst_pmMaskBadPixels_SOURCES) + srcdir = . top_srcdir = .. @@ -22,5 +26,4 @@ pkgincludedir = $(includedir)/psModule top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = /usr/bin/install -c @@ -37,4 +40,59 @@ POST_UNINSTALL = : host_triplet = i686-redhat-linux-gnu +bin_PROGRAMS = tst_pmFlatField$(EXEEXT) tst_pmMaskBadPixels$(EXEEXT) +subdir = src +DIST_COMMON = $(libpsmodule_a_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/config.h.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = config.h +CONFIG_CLEAN_FILES = +ARFLAGS = cru +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libpsmodule_adir)" +libLIBRARIES_INSTALL = $(INSTALL_DATA) +LIBRARIES = $(lib_LIBRARIES) +libpsmodule_a_AR = $(AR) $(ARFLAGS) +libpsmodule_a_LIBADD = +am_libpsmodule_a_OBJECTS = pmFlatField.$(OBJEXT) \ + pmMaskBadPixels.$(OBJEXT) pmSubtractBias.$(OBJEXT) \ + psTest.$(OBJEXT) pmSubtractBias.$(OBJEXT) +libpsmodule_a_OBJECTS = $(am_libpsmodule_a_OBJECTS) +binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +PROGRAMS = $(bin_PROGRAMS) +am_tst_pmFlatField_OBJECTS = tst_pmFlatField.$(OBJEXT) +tst_pmFlatField_OBJECTS = $(am_tst_pmFlatField_OBJECTS) +tst_pmFlatField_LDADD = $(LDADD) +am_tst_pmMaskBadPixels_OBJECTS = tst_pmMaskBadPixels.$(OBJEXT) +tst_pmMaskBadPixels_OBJECTS = $(am_tst_pmMaskBadPixels_OBJECTS) +tst_pmMaskBadPixels_LDADD = $(LDADD) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I. +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +DEP_FILES = ./$(DEPDIR)/pmFlatField.Po \ + ./$(DEPDIR)/pmMaskBadPixels.Po \ + ./$(DEPDIR)/pmSubtractBias.Po \ + ./$(DEPDIR)/psTest.Po \ + ./$(DEPDIR)/tst_pmFlatField.Po \ + ./$(DEPDIR)/tst_pmMaskBadPixels.Po +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(libpsmodule_a_SOURCES) $(tst_pmFlatField_SOURCES) \ + $(tst_pmMaskBadPixels_SOURCES) +DIST_SOURCES = $(libpsmodule_a_SOURCES) $(tst_pmFlatField_SOURCES) \ + $(tst_pmMaskBadPixels_SOURCES) +libpsmodule_aHEADERS_INSTALL = $(INSTALL_HEADER) +HEADERS = $(libpsmodule_a_HEADERS) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = ${SHELL} /home/gusciora/dragon/PAN/CVS/psModule/missing --run aclocal-1.7 AMDEP_FALSE = # @@ -48,5 +106,5 @@ CC = gcc CCDEPMODE = depmode=gcc3 -CFLAGS = -g -O2 -g2 -Wall -std=c99 -D_GNU_SOURCE -I/home/gusciora/dragon/PAN/CVS/psLib//include -I/usr/local/include +CFLAGS = -g -O2 -g2 -Wall -std=c99 -D_GNU_SOURCE -I/home/gusciora/dragon/PAN/CVS/psLib/include -I/usr/local/include CPP = gcc -E CPPFLAGS = @@ -71,5 +129,5 @@ INSTALL_SCRIPT = ${INSTALL} INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s -LDFLAGS = -L/home/gusciora/dragon/PAN/CVS/psLib//lib -L/usr/local/lib-L/usr/local/lib -lgsl -lgslcblas -lm +LDFLAGS = -L/home/gusciora/dragon/PAN/CVS/psLib/lib -L/usr/local/lib-L/usr/local/lib -lgsl -lgslcblas -lm LIBOBJS = LIBS = -lpslib -lgslcblas -lgsl -lfftw3f -lcfitsio -lsla @@ -132,62 +190,13 @@ target_alias = lib_LIBRARIES = libpsmodule.a -bin_PROGRAMS = tst_pmFlatField tst_pmMaskBadPixels - -libpsmodule_a_SOURCES = pmFlatField.c pmMaskBadPixels.c psTest.c -libpsmodule_a_HEADERS = pmFlatField.h pmMaskBadPixels.h psTest.h +libpsmodule_a_SOURCES = pmFlatField.c pmMaskBadPixels.c pmSubtractBias.c psTest.c pmSubtractBias.c +libpsmodule_a_HEADERS = pmFlatField.h pmMaskBadPixels.h pmSubtractBias.h psTest.h pmSubtractBias.h libpsmodule_adir = . - tst_pmFlatField_SOURCES = tst_pmFlatField.c tst_pmFlatField_LDFLAGS = libpsmodule.a - tst_pmMaskBadPixels_SOURCES = tst_pmMaskBadPixels.c tst_pmMaskBadPixels_LDFLAGS = libpsmodule.a -subdir = src -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = -LIBRARIES = $(lib_LIBRARIES) - -libpsmodule_a_AR = $(AR) cru -libpsmodule_a_LIBADD = -am_libpsmodule_a_OBJECTS = pmFlatField.$(OBJEXT) \ - pmMaskBadPixels.$(OBJEXT) psTest.$(OBJEXT) -libpsmodule_a_OBJECTS = $(am_libpsmodule_a_OBJECTS) -bin_PROGRAMS = tst_pmFlatField$(EXEEXT) tst_pmMaskBadPixels$(EXEEXT) -PROGRAMS = $(bin_PROGRAMS) - -am_tst_pmFlatField_OBJECTS = tst_pmFlatField.$(OBJEXT) -tst_pmFlatField_OBJECTS = $(am_tst_pmFlatField_OBJECTS) -tst_pmFlatField_LDADD = $(LDADD) -tst_pmFlatField_DEPENDENCIES = -am_tst_pmMaskBadPixels_OBJECTS = tst_pmMaskBadPixels.$(OBJEXT) -tst_pmMaskBadPixels_OBJECTS = $(am_tst_pmMaskBadPixels_OBJECTS) -tst_pmMaskBadPixels_LDADD = $(LDADD) -tst_pmMaskBadPixels_DEPENDENCIES = - -DEFAULT_INCLUDES = -I. -I$(srcdir) -I. -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -DEP_FILES = ./$(DEPDIR)/pmFlatField.Po \ - ./$(DEPDIR)/pmMaskBadPixels.Po \ - ./$(DEPDIR)/psTest.Po \ - ./$(DEPDIR)/tst_pmFlatField.Po \ - ./$(DEPDIR)/tst_pmMaskBadPixels.Po -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(libpsmodule_a_SOURCES) $(tst_pmFlatField_SOURCES) \ - $(tst_pmMaskBadPixels_SOURCES) -HEADERS = $(libpsmodule_a_HEADERS) - -DIST_COMMON = $(libpsmodule_a_HEADERS) $(srcdir)/Makefile.in \ - Makefile.am config.h.in -SOURCES = $(libpsmodule_a_SOURCES) $(tst_pmFlatField_SOURCES) $(tst_pmMaskBadPixels_SOURCES) - +tst_pmSB_SOURCES = tst_pmMaskBadPixels.c +tst_pmSB_LDFLAGS = libpsmodule.a all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -195,9 +204,33 @@ .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu src/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh config.h: stamp-h1 @@ -210,20 +243,19 @@ @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status src/config.h - -$(srcdir)/config.h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/config.h.in: $(am__configure_deps) cd $(top_srcdir) && $(AUTOHEADER) - touch $(srcdir)/config.h.in + rm -f stamp-h1 + touch $@ distclean-hdr: -rm -f config.h stamp-h1 -libLIBRARIES_INSTALL = $(INSTALL_DATA) install-libLIBRARIES: $(lib_LIBRARIES) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(libdir) + test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" @list='$(lib_LIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f"; \ - $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f; \ + echo " $(libLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ + $(libLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ else :; fi; \ done @@ -232,6 +264,6 @@ if test -f $$p; then \ p="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \ - $(RANLIB) $(DESTDIR)$(libdir)/$$p; \ + echo " $(RANLIB) '$(DESTDIR)$(libdir)/$$p'"; \ + $(RANLIB) "$(DESTDIR)$(libdir)/$$p"; \ else :; fi; \ done @@ -241,6 +273,6 @@ @list='$(lib_LIBRARIES)'; for p in $$list; do \ p="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(libdir)/$$p"; \ - rm -f $(DESTDIR)$(libdir)/$$p; \ + echo " rm -f '$(DESTDIR)$(libdir)/$$p'"; \ + rm -f "$(DESTDIR)$(libdir)/$$p"; \ done @@ -251,8 +283,7 @@ $(libpsmodule_a_AR) libpsmodule.a $(libpsmodule_a_OBJECTS) $(libpsmodule_a_LIBADD) $(RANLIB) libpsmodule.a -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) + test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ @@ -261,6 +292,6 @@ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -270,6 +301,6 @@ @list='$(bin_PROGRAMS)'; for p in $$list; do \ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ - rm -f $(DESTDIR)$(bindir)/$$f; \ + echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ + rm -f "$(DESTDIR)$(bindir)/$$f"; \ done @@ -288,5 +319,5 @@ mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core + -rm -f *.$(OBJEXT) distclean-compile: @@ -295,4 +326,5 @@ include ./$(DEPDIR)/pmFlatField.Po include ./$(DEPDIR)/pmMaskBadPixels.Po +include ./$(DEPDIR)/pmSubtractBias.Po include ./$(DEPDIR)/psTest.Po include ./$(DEPDIR)/tst_pmFlatField.Po @@ -300,35 +332,26 @@ .c.o: - if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ - -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ - then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ - else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ - fi + if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ + then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi # source='$<' object='$@' libtool=no \ # depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \ # $(CCDEPMODE) $(depcomp) \ -# $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< +# $(COMPILE) -c $< .c.obj: - if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ - -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ - then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ - else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ - fi + if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ + then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi # source='$<' object='$@' libtool=no \ # depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \ # $(CCDEPMODE) $(depcomp) \ -# $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` +# $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: - if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ - -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ - then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ - else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ - fi + if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ + then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi # source='$<' object='$@' libtool=yes \ # depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' \ # $(CCDEPMODE) $(depcomp) \ -# $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< +# $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: @@ -341,13 +364,12 @@ -rm -f libtool uninstall-info-am: -libpsmodule_aHEADERS_INSTALL = $(INSTALL_HEADER) install-libpsmodule_aHEADERS: $(libpsmodule_a_HEADERS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(libpsmodule_adir) + test -z "$(libpsmodule_adir)" || $(mkdir_p) "$(DESTDIR)$(libpsmodule_adir)" @list='$(libpsmodule_a_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(libpsmodule_aHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libpsmodule_adir)/$$f"; \ - $(libpsmodule_aHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libpsmodule_adir)/$$f; \ + echo " $(libpsmodule_aHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libpsmodule_adir)/$$f'"; \ + $(libpsmodule_aHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libpsmodule_adir)/$$f"; \ done @@ -356,15 +378,7 @@ @list='$(libpsmodule_a_HEADERS)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(libpsmodule_adir)/$$f"; \ - rm -f $(DESTDIR)$(libpsmodule_adir)/$$f; \ - done - -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS + echo " rm -f '$(DESTDIR)$(libpsmodule_adir)/$$f'"; \ + rm -f "$(DESTDIR)$(libpsmodule_adir)/$$f"; \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -376,4 +390,5 @@ END { for (i in files) print i; }'`; \ mkid -fID $$unique +tags: TAGS TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ @@ -390,5 +405,4 @@ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique - ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ @@ -413,8 +427,4 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @@ -430,5 +440,5 @@ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ @@ -448,7 +458,8 @@ check: check-am all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS) config.h - installdirs: - $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(libpsmodule_adir) + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libpsmodule_adir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done install: install-am install-exec: install-exec-am @@ -462,5 +473,5 @@ install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install @@ -483,10 +494,12 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic distclean-hdr \ - distclean-libtool distclean-tags +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-hdr distclean-libtool distclean-tags dvi: dvi-am dvi-am: + +html: html-am info: info-am @@ -528,8 +541,8 @@ clean-generic clean-libLIBRARIES clean-libtool ctags distclean \ distclean-compile distclean-generic distclean-hdr \ - distclean-libtool distclean-tags distdir dvi dvi-am info \ - info-am install install-am install-binPROGRAMS install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-libLIBRARIES \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-exec install-exec-am \ + install-info install-info-am install-libLIBRARIES \ install-libpsmodule_aHEADERS install-man install-strip \ installcheck installcheck-am installdirs maintainer-clean \ Index: trunk/psModules/src/pmSubtractBias.c =================================================================== --- trunk/psModules/src/pmSubtractBias.c (revision 1888) +++ trunk/psModules/src/pmSubtractBias.c (revision 1889) @@ -8,6 +8,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-24 23:00:37 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-09-24 23:47:21 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -144,14 +144,43 @@ } -// XXX: Must scale the overscan vector +/****************************************************************************** +ScaleOverscanVector(): this routine takes as input an arbitrary vector, +creates anew vector of length n, and fills the new vector with the +interpolated values of the old vector. The type of interpolation is: + PM_FIT_POLYNOMIAL: fit a polynomial to the entire input vector data. + PM_FIT_SPLINE: fit splines to the input vector data. +XXX: Doesn't it make more sense to do polynomial interpolation on a few +elements of the input vector, rather than fit a polynomial to the entire +vector? + *****************************************************************************/ psVector *ScaleOverscanVector(psVector *overscanVector, int n, + void *fitSpec, pmFit fit) { psVector *newVec = psVectorAlloc(n, PS_TYPE_F32); - - if (fit == PM_FIT_POLYNOMIAL) {} - else if (fit == PM_FIT_SPLINE) {} - else {} + psPolynomial1D *myPoly; + psSpline1D *mySpline; + float x; + int i; + + if (fit == PM_FIT_POLYNOMIAL) { + myPoly = (psPolynomial1D *) fitSpec; + myPoly = psVectorFitPolynomial1D(myPoly, NULL, overscanVector, NULL); + for (i=0;in); + newVec->data.F32[i] = psPolynomial1DEval(x, myPoly); + } + } else if (fit == PM_FIT_SPLINE) { + mySpline = (psSpline1D *) fitSpec; + mySpline = psVectorFitSpline1D(mySpline, NULL, overscanVector, NULL); + for (i=0;in); + newVec->data.F32[i] = psSpline1DEval(mySpline, x); + } + } else { + // XXX: psErrorMsg() + } + return(newVec); } @@ -251,5 +280,5 @@ } psFree(tmpRow); - ScaleOverscanVector(overscanVector, (in->image)->numCols, fit); + ScaleOverscanVector(overscanVector, (in->image)->numCols, fitSpec, fit); } if (overScanAxis == PM_OVERSCAN_COLUMNS) { @@ -274,5 +303,5 @@ } psFree(tmpCol); - ScaleOverscanVector(overscanVector, (in->image)->numRows, fit); + ScaleOverscanVector(overscanVector, (in->image)->numRows, fitSpec, fit); }