IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 1889 for trunk/psModules/src


Ignore:
Timestamp:
Sep 24, 2004, 1:47:21 PM (22 years ago)
Author:
gusciora
Message:

...

Location:
trunk/psModules/src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/src/Makefile

    r1883 r1889  
    1 # Makefile.in generated by automake 1.7.8 from Makefile.am.
     1# Makefile.in generated by automake 1.8.3 from Makefile.am.
    22# src/Makefile.  Generated from Makefile.in by configure.
    33
    4 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
    5 # Free Software Foundation, Inc.
     4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
     5# 2003, 2004  Free Software Foundation, Inc.
    66# This Makefile.in is free software; the Free Software Foundation
    77# gives unlimited permission to copy and/or distribute it,
    … …  
    1515
    1616
     17
     18
     19SOURCES = $(libpsmodule_a_SOURCES) $(tst_pmFlatField_SOURCES) $(tst_pmMaskBadPixels_SOURCES)
     20
    1721srcdir = .
    1822top_srcdir = ..
    … …  
    2226pkgincludedir = $(includedir)/psModule
    2327top_builddir = ..
    24 
    2528am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
    2629INSTALL = /usr/bin/install -c
    … …  
    3740POST_UNINSTALL = :
    3841host_triplet = i686-redhat-linux-gnu
     42bin_PROGRAMS = tst_pmFlatField$(EXEEXT) tst_pmMaskBadPixels$(EXEEXT)
     43subdir = src
     44DIST_COMMON = $(libpsmodule_a_HEADERS) $(srcdir)/Makefile.am \
     45        $(srcdir)/Makefile.in $(srcdir)/config.h.in
     46ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     47am__aclocal_m4_deps = $(top_srcdir)/configure.in
     48am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
     49        $(ACLOCAL_M4)
     50mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
     51CONFIG_HEADER = config.h
     52CONFIG_CLEAN_FILES =
     53ARFLAGS = cru
     54am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libpsmodule_adir)"
     55libLIBRARIES_INSTALL = $(INSTALL_DATA)
     56LIBRARIES = $(lib_LIBRARIES)
     57libpsmodule_a_AR = $(AR) $(ARFLAGS)
     58libpsmodule_a_LIBADD =
     59am_libpsmodule_a_OBJECTS = pmFlatField.$(OBJEXT) \
     60        pmMaskBadPixels.$(OBJEXT) pmSubtractBias.$(OBJEXT) \
     61        psTest.$(OBJEXT) pmSubtractBias.$(OBJEXT)
     62libpsmodule_a_OBJECTS = $(am_libpsmodule_a_OBJECTS)
     63binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
     64PROGRAMS = $(bin_PROGRAMS)
     65am_tst_pmFlatField_OBJECTS = tst_pmFlatField.$(OBJEXT)
     66tst_pmFlatField_OBJECTS = $(am_tst_pmFlatField_OBJECTS)
     67tst_pmFlatField_LDADD = $(LDADD)
     68am_tst_pmMaskBadPixels_OBJECTS = tst_pmMaskBadPixels.$(OBJEXT)
     69tst_pmMaskBadPixels_OBJECTS = $(am_tst_pmMaskBadPixels_OBJECTS)
     70tst_pmMaskBadPixels_LDADD = $(LDADD)
     71DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
     72depcomp = $(SHELL) $(top_srcdir)/depcomp
     73am__depfiles_maybe = depfiles
     74DEP_FILES = ./$(DEPDIR)/pmFlatField.Po \
     75        ./$(DEPDIR)/pmMaskBadPixels.Po \
     76        ./$(DEPDIR)/pmSubtractBias.Po \
     77        ./$(DEPDIR)/psTest.Po \
     78        ./$(DEPDIR)/tst_pmFlatField.Po \
     79        ./$(DEPDIR)/tst_pmMaskBadPixels.Po
     80COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
     81        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
     82LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
     83        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
     84        $(AM_CFLAGS) $(CFLAGS)
     85CCLD = $(CC)
     86LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
     87        $(AM_LDFLAGS) $(LDFLAGS) -o $@
     88SOURCES = $(libpsmodule_a_SOURCES) $(tst_pmFlatField_SOURCES) \
     89        $(tst_pmMaskBadPixels_SOURCES)
     90DIST_SOURCES = $(libpsmodule_a_SOURCES) $(tst_pmFlatField_SOURCES) \
     91        $(tst_pmMaskBadPixels_SOURCES)
     92libpsmodule_aHEADERS_INSTALL = $(INSTALL_HEADER)
     93HEADERS = $(libpsmodule_a_HEADERS)
     94ETAGS = etags
     95CTAGS = ctags
     96DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    3997ACLOCAL = ${SHELL} /home/gusciora/dragon/PAN/CVS/psModule/missing --run aclocal-1.7
    4098AMDEP_FALSE = #
    … …  
    48106CC = gcc
    49107CCDEPMODE = depmode=gcc3
    50 CFLAGS = -g -O2 -g2 -Wall -std=c99 -D_GNU_SOURCE -I/home/gusciora/dragon/PAN/CVS/psLib//include -I/usr/local/include
     108CFLAGS = -g -O2 -g2 -Wall -std=c99 -D_GNU_SOURCE -I/home/gusciora/dragon/PAN/CVS/psLib/include -I/usr/local/include
    51109CPP = gcc -E
    52110CPPFLAGS =
    … …  
    71129INSTALL_SCRIPT = ${INSTALL}
    72130INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
    73 LDFLAGS =  -L/home/gusciora/dragon/PAN/CVS/psLib//lib -L/usr/local/lib-L/usr/local/lib -lgsl -lgslcblas -lm
     131LDFLAGS =  -L/home/gusciora/dragon/PAN/CVS/psLib/lib -L/usr/local/lib-L/usr/local/lib -lgsl -lgslcblas -lm
    74132LIBOBJS =
    75133LIBS = -lpslib -lgslcblas -lgsl -lfftw3f -lcfitsio -lsla
    … …  
    132190target_alias =
    133191lib_LIBRARIES = libpsmodule.a
    134 bin_PROGRAMS = tst_pmFlatField tst_pmMaskBadPixels
    135 
    136 libpsmodule_a_SOURCES = pmFlatField.c pmMaskBadPixels.c psTest.c
    137 libpsmodule_a_HEADERS = pmFlatField.h pmMaskBadPixels.h psTest.h
     192libpsmodule_a_SOURCES = pmFlatField.c pmMaskBadPixels.c pmSubtractBias.c psTest.c pmSubtractBias.c
     193libpsmodule_a_HEADERS = pmFlatField.h pmMaskBadPixels.h pmSubtractBias.h psTest.h pmSubtractBias.h
    138194libpsmodule_adir = .
    139 
    140195tst_pmFlatField_SOURCES = tst_pmFlatField.c
    141196tst_pmFlatField_LDFLAGS = libpsmodule.a
    142 
    143197tst_pmMaskBadPixels_SOURCES = tst_pmMaskBadPixels.c
    144198tst_pmMaskBadPixels_LDFLAGS = libpsmodule.a
    145 subdir = src
    146 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    147 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
    148 CONFIG_HEADER = config.h
    149 CONFIG_CLEAN_FILES =
    150 LIBRARIES = $(lib_LIBRARIES)
    151 
    152 libpsmodule_a_AR = $(AR) cru
    153 libpsmodule_a_LIBADD =
    154 am_libpsmodule_a_OBJECTS = pmFlatField.$(OBJEXT) \
    155         pmMaskBadPixels.$(OBJEXT) psTest.$(OBJEXT)
    156 libpsmodule_a_OBJECTS = $(am_libpsmodule_a_OBJECTS)
    157 bin_PROGRAMS = tst_pmFlatField$(EXEEXT) tst_pmMaskBadPixels$(EXEEXT)
    158 PROGRAMS = $(bin_PROGRAMS)
    159 
    160 am_tst_pmFlatField_OBJECTS = tst_pmFlatField.$(OBJEXT)
    161 tst_pmFlatField_OBJECTS = $(am_tst_pmFlatField_OBJECTS)
    162 tst_pmFlatField_LDADD = $(LDADD)
    163 tst_pmFlatField_DEPENDENCIES =
    164 am_tst_pmMaskBadPixels_OBJECTS = tst_pmMaskBadPixels.$(OBJEXT)
    165 tst_pmMaskBadPixels_OBJECTS = $(am_tst_pmMaskBadPixels_OBJECTS)
    166 tst_pmMaskBadPixels_LDADD = $(LDADD)
    167 tst_pmMaskBadPixels_DEPENDENCIES =
    168 
    169 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I.
    170 depcomp = $(SHELL) $(top_srcdir)/depcomp
    171 am__depfiles_maybe = depfiles
    172 DEP_FILES = ./$(DEPDIR)/pmFlatField.Po \
    173         ./$(DEPDIR)/pmMaskBadPixels.Po \
    174         ./$(DEPDIR)/psTest.Po \
    175         ./$(DEPDIR)/tst_pmFlatField.Po \
    176         ./$(DEPDIR)/tst_pmMaskBadPixels.Po
    177 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
    178         $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
    179 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
    180         $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
    181 CCLD = $(CC)
    182 LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
    183         $(AM_LDFLAGS) $(LDFLAGS) -o $@
    184 DIST_SOURCES = $(libpsmodule_a_SOURCES) $(tst_pmFlatField_SOURCES) \
    185         $(tst_pmMaskBadPixels_SOURCES)
    186 HEADERS = $(libpsmodule_a_HEADERS)
    187 
    188 DIST_COMMON = $(libpsmodule_a_HEADERS) $(srcdir)/Makefile.in \
    189         Makefile.am config.h.in
    190 SOURCES = $(libpsmodule_a_SOURCES) $(tst_pmFlatField_SOURCES) $(tst_pmMaskBadPixels_SOURCES)
    191 
     199tst_pmSB_SOURCES = tst_pmMaskBadPixels.c
     200tst_pmSB_LDFLAGS = libpsmodule.a
    192201all: config.h
    193202        $(MAKE) $(AM_MAKEFLAGS) all-am
    … …  
    195204.SUFFIXES:
    196205.SUFFIXES: .c .lo .o .obj
    197 $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
     206$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
     207        @for dep in $?; do \
     208          case '$(am__configure_deps)' in \
     209            *$$dep*) \
     210              cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
     211                && exit 0; \
     212              exit 1;; \
     213          esac; \
     214        done; \
     215        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
    198216        cd $(top_srcdir) && \
    199217          $(AUTOMAKE) --gnu  src/Makefile
    200 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
    201         cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
     218.PRECIOUS: Makefile
     219Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
     220        @case '$?' in \
     221          *config.status*) \
     222            cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
     223          *) \
     224            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
     225            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
     226        esac;
     227
     228$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
     229        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
     230
     231$(top_srcdir)/configure:  $(am__configure_deps)
     232        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
     233$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
     234        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    202235
    203236config.h: stamp-h1
    … …  
    210243        @rm -f stamp-h1
    211244        cd $(top_builddir) && $(SHELL) ./config.status src/config.h
    212 
    213 $(srcdir)/config.h.in:  $(top_srcdir)/configure.in $(ACLOCAL_M4)
     245$(srcdir)/config.h.in:  $(am__configure_deps)
    214246        cd $(top_srcdir) && $(AUTOHEADER)
    215         touch $(srcdir)/config.h.in
     247        rm -f stamp-h1
     248        touch $@
    216249
    217250distclean-hdr:
    218251        -rm -f config.h stamp-h1
    219 libLIBRARIES_INSTALL = $(INSTALL_DATA)
    220252install-libLIBRARIES: $(lib_LIBRARIES)
    221253        @$(NORMAL_INSTALL)
    222         $(mkinstalldirs) $(DESTDIR)$(libdir)
     254        test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
    223255        @list='$(lib_LIBRARIES)'; for p in $$list; do \
    224256          if test -f $$p; then \
    225257            f="`echo $$p | sed -e 's|^.*/||'`"; \
    226             echo " $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f"; \
    227             $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f; \
     258            echo " $(libLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
     259            $(libLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
    228260          else :; fi; \
    229261        done
    … …  
    232264          if test -f $$p; then \
    233265            p="`echo $$p | sed -e 's|^.*/||'`"; \
    234             echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
    235             $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
     266            echo " $(RANLIB) '$(DESTDIR)$(libdir)/$$p'"; \
     267            $(RANLIB) "$(DESTDIR)$(libdir)/$$p"; \
    236268          else :; fi; \
    237269        done
    … …  
    241273        @list='$(lib_LIBRARIES)'; for p in $$list; do \
    242274          p="`echo $$p | sed -e 's|^.*/||'`"; \
    243           echo " rm -f $(DESTDIR)$(libdir)/$$p"; \
    244           rm -f $(DESTDIR)$(libdir)/$$p; \
     275          echo " rm -f '$(DESTDIR)$(libdir)/$$p'"; \
     276          rm -f "$(DESTDIR)$(libdir)/$$p"; \
    245277        done
    246278
    … …  
    251283        $(libpsmodule_a_AR) libpsmodule.a $(libpsmodule_a_OBJECTS) $(libpsmodule_a_LIBADD)
    252284        $(RANLIB) libpsmodule.a
    253 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
    254285install-binPROGRAMS: $(bin_PROGRAMS)
    255286        @$(NORMAL_INSTALL)
    256         $(mkinstalldirs) $(DESTDIR)$(bindir)
     287        test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
    257288        @list='$(bin_PROGRAMS)'; for p in $$list; do \
    258289          p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
    … …  
    261292          ; then \
    262293            f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
    263            echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
    264            $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
     294           echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
     295           $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
    265296          else :; fi; \
    266297        done
    … …  
    270301        @list='$(bin_PROGRAMS)'; for p in $$list; do \
    271302          f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
    272           echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
    273           rm -f $(DESTDIR)$(bindir)/$$f; \
     303          echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
     304          rm -f "$(DESTDIR)$(bindir)/$$f"; \
    274305        done
    275306
    … …  
    288319
    289320mostlyclean-compile:
    290         -rm -f *.$(OBJEXT) core *.core
     321        -rm -f *.$(OBJEXT)
    291322
    292323distclean-compile:
    … …  
    295326include ./$(DEPDIR)/pmFlatField.Po
    296327include ./$(DEPDIR)/pmMaskBadPixels.Po
     328include ./$(DEPDIR)/pmSubtractBias.Po
    297329include ./$(DEPDIR)/psTest.Po
    298330include ./$(DEPDIR)/tst_pmFlatField.Po
    … …  
    300332
    301333.c.o:
    302         if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
    303           -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
    304         then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
    305         else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
    306         fi
     334        if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
     335        then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    307336#       source='$<' object='$@' libtool=no \
    308337#       depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
    309338#       $(CCDEPMODE) $(depcomp) \
    310 #       $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
     339#       $(COMPILE) -c $<
    311340
    312341.c.obj:
    313         if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
    314           -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
    315         then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
    316         else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
    317         fi
     342        if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
     343        then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    318344#       source='$<' object='$@' libtool=no \
    319345#       depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
    320346#       $(CCDEPMODE) $(depcomp) \
    321 #       $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
     347#       $(COMPILE) -c `$(CYGPATH_W) '$<'`
    322348
    323349.c.lo:
    324         if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
    325           -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
    326         then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
    327         else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
    328         fi
     350        if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
     351        then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    329352#       source='$<' object='$@' libtool=yes \
    330353#       depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' \
    331354#       $(CCDEPMODE) $(depcomp) \
    332 #       $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
     355#       $(LTCOMPILE) -c -o $@ $<
    333356
    334357mostlyclean-libtool:
    … …  
    341364        -rm -f libtool
    342365uninstall-info-am:
    343 libpsmodule_aHEADERS_INSTALL = $(INSTALL_HEADER)
    344366install-libpsmodule_aHEADERS: $(libpsmodule_a_HEADERS)
    345367        @$(NORMAL_INSTALL)
    346         $(mkinstalldirs) $(DESTDIR)$(libpsmodule_adir)
     368        test -z "$(libpsmodule_adir)" || $(mkdir_p) "$(DESTDIR)$(libpsmodule_adir)"
    347369        @list='$(libpsmodule_a_HEADERS)'; for p in $$list; do \
    348370          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
    349371          f="`echo $$p | sed -e 's|^.*/||'`"; \
    350           echo " $(libpsmodule_aHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libpsmodule_adir)/$$f"; \
    351           $(libpsmodule_aHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libpsmodule_adir)/$$f; \
     372          echo " $(libpsmodule_aHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libpsmodule_adir)/$$f'"; \
     373          $(libpsmodule_aHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libpsmodule_adir)/$$f"; \
    352374        done
    353375
    … …  
    356378        @list='$(libpsmodule_a_HEADERS)'; for p in $$list; do \
    357379          f="`echo $$p | sed -e 's|^.*/||'`"; \
    358           echo " rm -f $(DESTDIR)$(libpsmodule_adir)/$$f"; \
    359           rm -f $(DESTDIR)$(libpsmodule_adir)/$$f; \
    360         done
    361 
    362 ETAGS = etags
    363 ETAGSFLAGS =
    364 
    365 CTAGS = ctags
    366 CTAGSFLAGS =
    367 
    368 tags: TAGS
     380          echo " rm -f '$(DESTDIR)$(libpsmodule_adir)/$$f'"; \
     381          rm -f "$(DESTDIR)$(libpsmodule_adir)/$$f"; \
     382        done
    369383
    370384ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
    … …  
    376390               END { for (i in files) print i; }'`; \
    377391        mkid -fID $$unique
     392tags: TAGS
    378393
    379394TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
    … …  
    390405          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
    391406             $$tags $$unique
    392 
    393407ctags: CTAGS
    394408CTAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
    … …  
    413427distclean-tags:
    414428        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
    415 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    416 
    417 top_distdir = ..
    418 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
    419429
    420430distdir: $(DISTFILES)
    … …  
    430440          if test "$$dir" != "$$file" && test "$$dir" != "."; then \
    431441            dir="/$$dir"; \
    432             $(mkinstalldirs) "$(distdir)$$dir"; \
     442            $(mkdir_p) "$(distdir)$$dir"; \
    433443          else \
    434444            dir=''; \
    … …  
    448458check: check-am
    449459all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS) config.h
    450 
    451460installdirs:
    452         $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(libpsmodule_adir)
     461        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libpsmodule_adir)"; do \
     462          test -z "$$dir" || $(mkdir_p) "$$dir"; \
     463        done
    453464install: install-am
    454465install-exec: install-exec-am
    … …  
    462473install-strip:
    463474        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
    464           INSTALL_STRIP_FLAG=-s \
     475          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
    465476          `test -z '$(STRIP)' || \
    466477            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
    … …  
    483494        -rm -rf ./$(DEPDIR)
    484495        -rm -f Makefile
    485 distclean-am: clean-am distclean-compile distclean-generic distclean-hdr \
    486         distclean-libtool distclean-tags
     496distclean-am: clean-am distclean-compile distclean-generic \
     497        distclean-hdr distclean-libtool distclean-tags
    487498
    488499dvi: dvi-am
    489500
    490501dvi-am:
     502
     503html: html-am
    491504
    492505info: info-am
    … …  
    528541        clean-generic clean-libLIBRARIES clean-libtool ctags distclean \
    529542        distclean-compile distclean-generic distclean-hdr \
    530         distclean-libtool distclean-tags distdir dvi dvi-am info \
    531         info-am install install-am install-binPROGRAMS install-data \
    532         install-data-am install-exec install-exec-am install-info \
    533         install-info-am install-libLIBRARIES \
     543        distclean-libtool distclean-tags distdir dvi dvi-am html \
     544        html-am info info-am install install-am install-binPROGRAMS \
     545        install-data install-data-am install-exec install-exec-am \
     546        install-info install-info-am install-libLIBRARIES \
    534547        install-libpsmodule_aHEADERS install-man install-strip \
    535548        installcheck installcheck-am installdirs maintainer-clean \

  • trunk/psModules/src/pmSubtractBias.c

    r1885 r1889  
    88 *  @author George Gusciora, MHPCC
    99 *
    10  *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
    11  *  @date $Date: 2004-09-24 23:00:37 $
     10 *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
     11 *  @date $Date: 2004-09-24 23:47:21 $
    1212 *
    1313 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    144144}
    145145
    146 // XXX: Must scale the overscan vector
     146/******************************************************************************
     147ScaleOverscanVector(): this routine takes as input an arbitrary vector,
     148creates anew vector of length n, and fills the new vector with the
     149interpolated values of the old vector.  The type of interpolation is:
     150    PM_FIT_POLYNOMIAL: fit a polynomial to the entire input vector data.
     151    PM_FIT_SPLINE: fit splines to the input vector data.
     152XXX: Doesn't it make more sense to do polynomial interpolation on a few
     153elements of the input vector, rather than fit a polynomial to the entire
     154vector?
     155 *****************************************************************************/
    147156psVector *ScaleOverscanVector(psVector *overscanVector,
    148157                              int n,
     158                              void *fitSpec,
    149159                              pmFit fit)
    150160{
    151161    psVector *newVec = psVectorAlloc(n, PS_TYPE_F32);
    152 
    153     if (fit == PM_FIT_POLYNOMIAL) {}
    154     else if (fit == PM_FIT_SPLINE) {}
    155     else {}
     162    psPolynomial1D *myPoly;
     163    psSpline1D *mySpline;
     164    float x;
     165    int i;
     166
     167    if (fit == PM_FIT_POLYNOMIAL) {
     168        myPoly = (psPolynomial1D *) fitSpec;
     169        myPoly = psVectorFitPolynomial1D(myPoly, NULL, overscanVector, NULL);
     170        for (i=0;i<n;i++) {
     171            x = (((float) i) / ((float) n)) * ((float) overscanVector->n);
     172            newVec->data.F32[i] = psPolynomial1DEval(x, myPoly);
     173        }
     174    } else if (fit == PM_FIT_SPLINE) {
     175        mySpline = (psSpline1D *) fitSpec;
     176        mySpline = psVectorFitSpline1D(mySpline, NULL, overscanVector, NULL);
     177        for (i=0;i<n;i++) {
     178            x = (((float) i) / ((float) n)) * ((float) overscanVector->n);
     179            newVec->data.F32[i] = psSpline1DEval(mySpline, x);
     180        }
     181    } else {
     182        // XXX: psErrorMsg()
     183    }
     184
    156185    return(newVec);
    157186}
    … …  
    251280            }
    252281            psFree(tmpRow);
    253             ScaleOverscanVector(overscanVector, (in->image)->numCols, fit);
     282            ScaleOverscanVector(overscanVector, (in->image)->numCols, fitSpec, fit);
    254283        }
    255284        if (overScanAxis == PM_OVERSCAN_COLUMNS) {
    … …  
    274303            }
    275304            psFree(tmpCol);
    276             ScaleOverscanVector(overscanVector, (in->image)->numRows, fit);
     305            ScaleOverscanVector(overscanVector, (in->image)->numRows, fitSpec, fit);
    277306        }
    278307
Note: See TracChangeset for help on using the changeset viewer.