Index: trunk/psModules/test/Makefile.in =================================================================== --- trunk/psModules/test/Makefile.in (revision 2133) +++ trunk/psModules/test/Makefile.in (revision 2138) @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.6.3 from Makefile.am. +# Makefile.in generated by automake 1.8.3 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# 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, @@ -14,44 +14,21 @@ @SET_MAKE@ -SHELL = @SHELL@ + +SOURCES = $(tst_pmFlatField_SOURCES) $(tst_pmMaskBadPixels_SOURCES) $(tst_pmNonLinear_SOURCES) $(tst_pmSubtractBias_SOURCES) srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : @@ -60,73 +37,32 @@ PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ host_triplet = @host@ - -EXEEXT = @EXEEXT@ -OBJEXT = @OBJEXT@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -AMTAR = @AMTAR@ -AS = @AS@ -AWK = @AWK@ -CC = @CC@ -CFLAGS = @CFLAGS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -GSL_CONFIG = @GSL_CONFIG@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -OBJDUMP = @OBJDUMP@ -PACKAGE = @PACKAGE@ -RANLIB = @RANLIB@ -STRIP = @STRIP@ -VERSION = @VERSION@ -am__include = @am__include@ -am__quote = @am__quote@ -install_sh = @install_sh@ -bin_PROGRAMS = tst_pmFlatField tst_pmMaskBadPixels tst_pmNonLinear tst_pmSubtractBias - -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 +bin_PROGRAMS = tst_pmFlatField$(EXEEXT) tst_pmMaskBadPixels$(EXEEXT) \ + tst_pmNonLinear$(EXEEXT) tst_pmSubtractBias$(EXEEXT) subdir = test +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.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 = $(top_builddir)/src/config.h CONFIG_CLEAN_FILES = -bin_PROGRAMS = tst_pmFlatField$(EXEEXT) tst_pmMaskBadPixels$(EXEEXT) \ - tst_pmNonLinear$(EXEEXT) tst_pmSubtractBias$(EXEEXT) +am__installdirs = "$(DESTDIR)$(bindir)" +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) -tst_pmFlatField_DEPENDENCIES = am_tst_pmMaskBadPixels_OBJECTS = tst_pmMaskBadPixels.$(OBJEXT) tst_pmMaskBadPixels_OBJECTS = $(am_tst_pmMaskBadPixels_OBJECTS) tst_pmMaskBadPixels_LDADD = $(LDADD) -tst_pmMaskBadPixels_DEPENDENCIES = am_tst_pmNonLinear_OBJECTS = tst_pmNonLinear.$(OBJEXT) tst_pmNonLinear_OBJECTS = $(am_tst_pmNonLinear_OBJECTS) tst_pmNonLinear_LDADD = $(LDADD) -tst_pmNonLinear_DEPENDENCIES = am_tst_pmSubtractBias_OBJECTS = tst_pmSubtractBias.$(OBJEXT) tst_pmSubtractBias_OBJECTS = $(am_tst_pmSubtractBias_OBJECTS) tst_pmSubtractBias_LDADD = $(LDADD) -tst_pmSubtractBias_DEPENDENCIES = - -DEFS = @DEFS@ -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -137,27 +73,157 @@ 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) +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 = $(tst_pmFlatField_SOURCES) $(tst_pmMaskBadPixels_SOURCES) \ +SOURCES = $(tst_pmFlatField_SOURCES) $(tst_pmMaskBadPixels_SOURCES) \ $(tst_pmNonLinear_SOURCES) $(tst_pmSubtractBias_SOURCES) -DIST_COMMON = Makefile.am Makefile.in -SOURCES = $(tst_pmFlatField_SOURCES) $(tst_pmMaskBadPixels_SOURCES) $(tst_pmNonLinear_SOURCES) $(tst_pmSubtractBias_SOURCES) - +DIST_SOURCES = $(tst_pmFlatField_SOURCES) \ + $(tst_pmMaskBadPixels_SOURCES) $(tst_pmNonLinear_SOURCES) \ + $(tst_pmSubtractBias_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GSL_CONFIG = @GSL_CONFIG@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +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 all: all-am .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 test/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu test/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +.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 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)$$//'`; \ @@ -166,6 +232,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; \ + 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 @@ -175,6 +241,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 @@ -199,5 +265,5 @@ mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core + -rm -f *.$(OBJEXT) distclean-compile: @@ -209,25 +275,27 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tst_pmSubtractBias.Po@am__quote@ -distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: -@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `cygpath -w $<` +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -CCDEPMODE = @CCDEPMODE@ +@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: @@ -240,9 +308,4 @@ -rm -f libtool uninstall-info-am: - -ETAGS = etags -ETAGSFLAGS = - -tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -254,4 +317,5 @@ END { for (i in files) print i; }'`; \ mkid -fID $$unique +tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ @@ -268,4 +332,18 @@ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique GTAGS: @@ -275,17 +353,19 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @list='$(DISTFILES)'; for file in $$list; do \ + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ @@ -305,8 +385,8 @@ check: check-am all-am: Makefile $(PROGRAMS) - installdirs: - $(mkinstalldirs) $(DESTDIR)$(bindir) - + for dir in "$(DESTDIR)$(bindir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done install: install-am install-exec: install-exec-am @@ -320,5 +400,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 @@ -328,5 +408,5 @@ distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @@ -338,7 +418,8 @@ distclean: distclean-am - -distclean-am: clean-am distclean-compile distclean-depend \ - distclean-generic distclean-libtool distclean-tags + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-libtool distclean-tags dvi: dvi-am @@ -346,4 +427,6 @@ dvi-am: +html: html-am + info: info-am @@ -361,5 +444,6 @@ maintainer-clean: maintainer-clean-am - + -rm -rf ./$(DEPDIR) + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -369,16 +453,24 @@ mostlyclean-libtool +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + uninstall-am: uninstall-binPROGRAMS uninstall-info-am -.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool distclean distclean-compile \ - distclean-depend distclean-generic 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-man install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool tags uninstall uninstall-am \ +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ + clean-generic clean-libtool ctags distclean distclean-compile \ + distclean-generic 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-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am \ uninstall-binPROGRAMS uninstall-info-am Index: trunk/psModules/test/tst_pmMaskBadPixels.c =================================================================== --- trunk/psModules/test/tst_pmMaskBadPixels.c (revision 2133) +++ trunk/psModules/test/tst_pmMaskBadPixels.c (revision 2138) @@ -17,6 +17,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-24 23:42:28 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-14 23:52:09 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -56,9 +56,29 @@ -static int testMaskBadPixels(void); +static int testMaskBadPixels1(void); +static int testMaskBadPixels2(void); +static int testMaskBadPixels3(void); +static int testMaskBadPixels4(void); +static int testMaskBadPixels5(void); +static int testMaskBadPixels6(void); +static int testMaskBadPixels7(void); +static int testMaskBadPixels8(void); +static int testMaskBadPixels9(void); +static int testMaskBadPixels10(void); +static int testMaskBadPixels11(void); testDescription tests[] = { - {testMaskBadPixels, 885, "pmMaskBadPixels", 0, false}, + {testMaskBadPixels1, 885, "pmMaskBadPixels - Create mask based on maskVal argument", 0, false}, + {testMaskBadPixels2, 885, "pmMaskBadPixels - Create mask based on saturation argument", 0, false}, + {testMaskBadPixels3, 885, "pmMaskBadPixels - Create mask based on growVal and grow arguments", 0, false}, + {testMaskBadPixels4, 885, "pmMaskBadPixels - Auto create mask based on maskVal argument", 0, false}, + {testMaskBadPixels5, 885, "pmMaskBadPixels - Attempt to use null mask", 0, false}, + {testMaskBadPixels6, 885, "pmMaskBadPixels - Attempt tp use null input image", 0, false}, + {testMaskBadPixels7, 885, "pmMaskBadPixels - Attempt to use input image bigger than mask", 0, false}, + {testMaskBadPixels8, 885, "pmMaskBadPixels - Attempt to use input image mask bigger than mask", 0, false}, + {testMaskBadPixels9, 885, "pmMaskBadPixels - Attempt to use offset greater than input image", 0, false}, + {testMaskBadPixels10, 885, "pmMaskBadPixels - Attempt to use complex input image", 0, false}, + {testMaskBadPixels11, 885, "pmMaskBadPixels - Attempt to use non-mask type mask image", 0, false}, {NULL} }; @@ -71,10 +91,7 @@ -int testMaskBadPixels( void ) -{ - - +int testMaskBadPixels1( void ) +{ // Test A - Create mask based on maskVal argument - printPositiveTestHeader(stdout, "pmMaskBadPixels", "Test A - Create mask based on maskVal argument"); CREATE_AND_SET_IMAGE(inImage1,F64,0,50,50); CREATE_AND_SET_IMAGE(mask1,U8,0,50,50) @@ -87,10 +104,11 @@ psFree(inReadout); psFree(inImage1); - printFooter(stdout, "pmMaskBadPixels", "Test A - Create mask based on maskVal argument", true); - printf("\n\n\n"); - - + + return 0; +} + +int testMaskBadPixels2( void ) +{ // Test B - Create mask based on saturation argument - printPositiveTestHeader(stdout, "pmMaskBadPixels", "Test B - Create mask based on saturation argument"); CREATE_AND_SET_IMAGE(inImage2,F64,150.0,50,50); CREATE_AND_SET_IMAGE(mask2,U8,0,50,50) @@ -102,10 +120,11 @@ psFree(inReadout2); psFree(inImage2); - printFooter(stdout, "pmMaskBadPixels", "Test B - Create mask based on saturation argument", true); - printf("\n\n\n"); - - + + return 0; +} + +int testMaskBadPixels3( void ) +{ // Test C - Create mask based on growVal and grow arguments - printPositiveTestHeader(stdout, "pmMaskBadPixels", "Test C - Create mask based on growVal and grow arguments"); CREATE_AND_SET_IMAGE(inImage3,F64,50.0,50,50); CREATE_AND_SET_IMAGE(mask3,U8,0,50,50) @@ -120,10 +139,11 @@ psFree(inReadout3); psFree(inImage3); - printFooter(stdout, "pmMaskBadPixels", "Test C - Create mask based on growVal and grow arguments", true); - printf("\n\n\n"); - - + + return 0; +} + +int testMaskBadPixels4( void ) +{ // Test D - Auto Create mask based on maskVal argument - printPositiveTestHeader(stdout, "pmMaskBadPixels", "Test D - Auto create mask based on maskVal argument"); CREATE_AND_SET_IMAGE(inImage4,F64,50.0,50,50); CREATE_AND_SET_IMAGE(mask4,U8,0,50,50) @@ -138,24 +158,23 @@ psFree(inReadout4); psFree(inImage4); - printFooter(stdout, "pmMaskBadPixels", "Test D - Auto create mask based on maskVal argument", true); - printf("\n\n\n"); - - + + return 0; +} + +int testMaskBadPixels5( void ) +{ // Test E - Attempt to use null mask - printNegativeTestHeader(stdout,"pmMaskBadPixels", "Test E - Attempt to use null mask", - "Null not allowed for mask image", 0); CREATE_AND_SET_IMAGE(inImage5,F64,50.0,50,50); psReadout *inReadout5 = psReadoutAlloc(0, 0, inImage5); - pmMaskBadPixels(inReadout4, NULL, 0, 100.0, 1, 10); + pmMaskBadPixels(inReadout5, NULL, 0, 100.0, 1, 10); psFree(inReadout5); psFree(inImage5); - printFooter(stdout, "pmMaskBadPixels", "Test E - Attempt to use null mask", true); - printf("\n\n\n"); - - + + return 0; +} + +int testMaskBadPixels6( void ) +{ // Test F - Attempt tp use null input image - printNegativeTestHeader(stdout,"pmMaskBadPixels", "Test F - Attempt tp use null input image", - "Null not allowed for input image", 0); - CREATE_AND_SET_IMAGE(mask6,U8,0,50,50) psReadout *inReadout6 = psReadoutAlloc(0, 0, NULL); @@ -163,27 +182,27 @@ pmMaskBadPixels(inReadout6, mask6, 0, 100.0, 1, 10); psFree(inReadout6); - printFooter(stdout, "pmMaskBadPixels", "Test F - Attempt tp use null input image", true); - printf("\n\n\n"); - - + + return 0; +} + +int testMaskBadPixels7( void ) +{ // Test G - Attempt to use input image bigger than mask - printNegativeTestHeader(stdout,"pmMaskBadPixels", "Test G - Attempt to use input image bigger than mask", - "Input image size exceeds that of mask image", 0); CREATE_AND_SET_IMAGE(inImage7,F64,0.0,60,60); CREATE_AND_SET_IMAGE(mask7,U8,0,50,50) CREATE_AND_SET_IMAGE(mask7i,U8,0,50,50) psReadout *inReadout7 = psReadoutAlloc(0, 0, inImage7); - inReadout4->mask = mask7i; - pmMaskBadPixels(inReadout4, mask7, 0, 100.0, 1, 10); + inReadout7->mask = mask7i; + pmMaskBadPixels(inReadout7, mask7, 0, 100.0, 1, 10); psFree(mask7); psFree(inReadout7); psFree(inImage7); - printFooter(stdout, "pmMaskBadPixels", "Test G - Attempt to use input image bigger than mask", true); - printf("\n\n\n"); - - + + return 0; +} + +int testMaskBadPixels8( void ) +{ // Test H - Attempt to use input image mask bigger than mask - printNegativeTestHeader(stdout,"pmMaskBadPixels", "Test H - Attempt to use input image mask bigger than mask", - "Input image mask size exceeds that of mask image", 0); CREATE_AND_SET_IMAGE(inImage8,F64,0.0,50,50); CREATE_AND_SET_IMAGE(mask8,U8,0,50,50) @@ -195,11 +214,11 @@ psFree(inReadout8); psFree(inImage8); - printFooter(stdout, "pmMaskBadPixels", "Test H - Attempt to use input image mask bigger than mask", true); - printf("\n\n\n"); - - + + return 0; +} + +int testMaskBadPixels9( void ) +{ // Test I - Attempt to use offset greater than input image - printNegativeTestHeader(stdout,"pmMaskBadPixels", "Test I - Attempt to use offset greater than input image", - "Total offset >= input image size", 0); CREATE_AND_SET_IMAGE(inImage9,F64,0.0,50,50); CREATE_AND_SET_IMAGE(mask9,U8,0,50,50) @@ -207,17 +226,17 @@ psReadout *inReadout9 = psReadoutAlloc(0, 0, inImage9); inReadout9->mask = mask9i; - *(int*)&inReadout->col0 = 150; - *(int*)&inReadout->row0 = 150; + *(int*)&inReadout9->col0 = 150; + *(int*)&inReadout9->row0 = 150; pmMaskBadPixels(inReadout9, mask9, 0, 100.0, 1, 10); psFree(mask9); psFree(inReadout9); psFree(inImage9); - printFooter(stdout, "pmMaskBadPixels", "Test I - Attempt to use offset greater than input image", true); - printf("\n\n\n"); - - + + return 0; +} + +int testMaskBadPixels10( void ) +{ // Test J - Attempt to use complex input image - printNegativeTestHeader(stdout,"pmMaskBadPixels", "Test J - Attempt to use complex input image", - "Complex types not allowed for input image", 0); CREATE_AND_SET_IMAGE(inImage10,C64,50.0,50,50); CREATE_AND_SET_IMAGE(mask10,U8,0,50,50) @@ -229,15 +248,15 @@ psFree(inReadout10); psFree(inImage10); - printFooter(stdout, "pmMaskBadPixels", "Test J - Attempt to use complex input image", true); - printf("\n\n\n"); - - + + return 0; +} + +int testMaskBadPixels11( void ) +{ // Test K - Attempt to use non-mask type mask image - printNegativeTestHeader(stdout,"pmMaskBadPixels", "Test K - Attempt to use non-mask type mask image", - "Mask must be PS_TYPE_MASK type", 0); CREATE_AND_SET_IMAGE(inImage11,F64,50.0,50,50); CREATE_AND_SET_IMAGE(mask11,F64,0,50,50) CREATE_AND_SET_IMAGE(mask11i,U8,0,50,50) - psReadout *inReadout11 = psReadoutAlloc(0, 0, inImage10); + psReadout *inReadout11 = psReadoutAlloc(0, 0, inImage11); inReadout11->mask = mask11i; pmMaskBadPixels(inReadout11, mask11, 0, 100.0, 1, 10); @@ -245,7 +264,6 @@ psFree(inReadout11); psFree(inImage11); - printFooter(stdout, "pmMaskBadPixels", "Test K - Attempt to use non-mask type mask image", true); - printf("\n\n\n"); - - return 0; -} + + return 0; +} + Index: trunk/psModules/test/tst_pmNonLinear.c =================================================================== --- trunk/psModules/test/tst_pmNonLinear.c (revision 2133) +++ trunk/psModules/test/tst_pmNonLinear.c (revision 2138) @@ -13,6 +13,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-14 20:49:53 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-14 23:52:09 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -56,5 +56,4 @@ } - printPositiveTestHeader(stdout, "pmNonLinear", "Simple polynomial"); myReadout = pmNonLinearityPolynomial(myReadout, myPoly); for (i=0;i