Index: trunk/psLib/test/FullUnitTest =================================================================== --- trunk/psLib/test/FullUnitTest (revision 3112) +++ trunk/psLib/test/FullUnitTest (revision 3115) @@ -19,6 +19,6 @@ # RETURN : integer number of tests which failed # -# $Revision: 1.15 $ $Name: not supported by cvs2svn $ -# $Date: 2004-10-27 00:57:31 $ +# $Revision: 1.16 $ $Name: not supported by cvs2svn $ +# $Date: 2005-02-03 00:54:12 $ # # Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -239,10 +239,8 @@ `make clean`; - # Execute the make distclean - `make distclean`; } # Execute the make and save results - $_ = join( "\n|| ", split( "\n", "\n" . `make` ) ); + $_ = join( "\n|| ", split( "\n", "\n" . `make tests` ) ); # Check the output of make for return value != 0 or any of the @@ -276,7 +274,4 @@ # Display the make was successful if silent option not set print("\nMake successful.\n") if ( !$silent ); - if ($clean) { - `make install`; - } } } Index: trunk/psLib/test/Makefile =================================================================== --- trunk/psLib/test/Makefile (revision 3112) +++ trunk/psLib/test/Makefile (revision 3115) @@ -1,106 +1,468 @@ -############################################################################## -## -## Makefile: test -## -## $Revision: 1.10 $ $Name: not supported by cvs2svn $ -## $Date: 2004-11-09 01:10:38 $ -## -## Copyright 2004 Maui High Performance Computing Center, University of Hawaii -############################################################################### - -# Define variable prefix to the top level project - psLib -# This is necessary for definition is Makefile.Globals uses prefix - -ifndef prefix - export prefix=$(shell cd ..;pwd) -endif - -# Define the two targets to be built - -TARGET_STATIC = libpstest.a -TARGET_DYNAMIC = libpstest.$(DLL) - -# Include the make global definitions for the project - -include ../src/Makefile.Globals - -# Set CFLAGS used by the implicit rule to compile .c - -CFLAGS := $(CFLAGS_RELOC) -I../include - -# Define the source objects - -SRC_OBJS = psTest.o - -# Define PHONY target "all" which will make all the necessary items - -all: $(TARGET_STATIC) $(TARGET_DYNAMIC) - -# Rule to make static library - -libpstest.a: $(SRC_OBJS) -# The ar option -r is to add/replace object and -s is to create -# a symbol table in the archive - $(AR) rcs $@ $(SRC_OBJS) - -# Rule to make dynamic library - -libpstest.$(DLL): $(SRC_OBJS) - $(CC) $(LDFLAGS_DLL) -L../lib -lpslib $(SRC_OBJS) -o $@ - -# Define PHONY target "install" which will install necessary files - -install: $(TARGET_STATIC) $(TARGET_DYNAMIC) $(includedir) $(libexecdir) $(testbindir) - install *.h $(includedir) - install $(TARGET_STATIC) $(libexecdir) - install $(TARGET_DYNAMIC) $(libexecdir) - install FullUnitTest runTest $(testbindir) - $(MAKE) --directory=collections install - $(MAKE) --directory=image install - $(MAKE) --directory=dataManip install - $(MAKE) --directory=sysUtils install - $(MAKE) --directory=astronomy install - $(MAKE) --directory=fileUtils install - -# Define PHONY target "distclean" which will cleanup the distribution - -distclean: clean - $(MAKE) --directory=collections distclean - $(MAKE) --directory=image distclean - $(MAKE) --directory=dataManip distclean - $(MAKE) --directory=sysUtils distclean - $(MAKE) --directory=astronomy distclean - $(MAKE) --directory=fileUtils distclean - $(RM) $(TARGET_STATIC) - $(RM) $(TARGET_DYNAMIC) - $(RM) $(libexecdir)/$(TARGET_STATIC) - $(RM) $(libexecdir)/$(TARGET_DYNAMIC) - -# Define PHONY target "clean" which will cleanup the development area - -clean: - $(MAKE) --directory=collections clean - $(MAKE) --directory=image clean - $(MAKE) --directory=dataManip clean - $(MAKE) --directory=sysUtils clean - $(MAKE) --directory=astronomy clean - $(MAKE) --directory=fileUtils clean - @echo " Deleting intermediate files for 'test'" - $(RM) $(SRC_OBJS) *.lint - -%.lint: %.c - splint +posixlib -exportlocal -realcompare $(INCLUDE_GLOBAL) $? > $@; cat $@ - -# Rule to make include directory if needed - -$(includedir): - mkdir -p $(includedir) - -# Rule to make lib directory if needed - -$(libexecdir): - mkdir -p $(libexecdir) - -$(testbindir): - mkdir -p $(testbindir) - +# Makefile.in generated by automake 1.9.1 from Makefile.am. +# test/Makefile. Generated from Makefile.in by configure. + +# 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, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + +srcdir = . +top_srcdir = .. + +pkgdatadir = $(datadir)/pslib +pkglibdir = $(libdir)/pslib +pkgincludedir = $(includedir)/pslib +top_builddir = .. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = /usr/bin/install -c +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = x86_64-unknown-linux-gnu +host_triplet = x86_64-unknown-linux-gnu +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 = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-exec-recursive install-info-recursive \ + install-recursive installcheck-recursive installdirs-recursive \ + pdf-recursive ps-recursive uninstall-info-recursive \ + uninstall-recursive +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = ${SHELL} /home/desonia/panstarrs/psLib/missing --run aclocal-1.9 +AMDEP_FALSE = # +AMDEP_TRUE = +AMTAR = ${SHELL} /home/desonia/panstarrs/psLib/missing --run tar +AR = ar +AUTOCONF = ${SHELL} /home/desonia/panstarrs/psLib/missing --run autoconf +AUTOHEADER = ${SHELL} /home/desonia/panstarrs/psLib/missing --run autoheader +AUTOMAKE = ${SHELL} /home/desonia/panstarrs/psLib/missing --run automake-1.9 +AWK = gawk +CC = gcc +CCDEPMODE = depmode=gcc3 +CFLAGS = -g -O2 -g2 -Wall -std=c99 -D_GNU_SOURCE -I/usr/include -I/usr/include/libxml2 +CONFIG_FILE = /home/desonia/panstarrs/psLib/config/psTime.config +CPP = gcc -E +CPPFLAGS = +CXX = g++ +CXXCPP = g++ -E +CXXDEPMODE = depmode=gcc3 +CXXFLAGS = -g -O2 +CYGPATH_W = echo +DEFS = -DHAVE_CONFIG_H +DEPDIR = .deps +ECHO = echo +ECHO_C = +ECHO_N = -n +ECHO_T = +EGREP = grep -E +EXEEXT = +F77 = g77 +FFLAGS = -fno-second-underscore -O -fno-f2c +GSL_CONFIG = /usr/bin/gsl-config +INSTALL_DATA = ${INSTALL} -m 644 +INSTALL_PROGRAM = ${INSTALL} +INSTALL_SCRIPT = ${INSTALL} +INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s +LDFLAGS = +LIBOBJS = +LIBS = +LIBTOOL = $(SHELL) $(top_builddir)/libtool +LN_S = ln -s +LTLIBOBJS = +MAKEINFO = ${SHELL} /home/desonia/panstarrs/psLib/missing --run makeinfo +OBJEXT = o +PACKAGE = pslib +PACKAGE_BUGREPORT = +PACKAGE_NAME = +PACKAGE_STRING = +PACKAGE_TARNAME = +PACKAGE_VERSION = +PATH_SEPARATOR = : +PERL = /usr/bin/perl +PSLIB_CFLAGS = -I${prefix}/include +PSLIB_LIBS = -L${exec_prefix}/lib -lpslib -lcfitsio -lfftw3f -L/usr/lib64 -lgsl -lgslcblas -lm -lxml2 -lz -lpthread -lm +RANLIB = ranlib +SET_MAKE = +SHELL = /bin/sh +STRIP = strip +SWIG = /usr/bin/swig +VERSION = 1.5 +XML_CONFIG = /usr/bin/xml2-config +ac_ct_AR = ar +ac_ct_CC = gcc +ac_ct_CXX = g++ +ac_ct_F77 = g77 +ac_ct_RANLIB = ranlib +ac_ct_STRIP = strip +am__fastdepCC_FALSE = # +am__fastdepCC_TRUE = +am__fastdepCXX_FALSE = # +am__fastdepCXX_TRUE = +am__include = include +am__leading_dot = . +am__quote = +am__tar = ${AMTAR} chof - "$$tardir" +am__untar = ${AMTAR} xf - +bindir = ${exec_prefix}/bin +build = x86_64-unknown-linux-gnu +build_alias = +build_cpu = x86_64 +build_os = linux-gnu +build_vendor = unknown +datadir = ${prefix}/share +exec_prefix = ${prefix} +host = x86_64-unknown-linux-gnu +host_alias = +host_cpu = x86_64 +host_os = linux-gnu +host_vendor = unknown +includedir = ${prefix}/include +infodir = ${prefix}/info +install_sh = /home/desonia/panstarrs/psLib/install-sh +libdir = ${exec_prefix}/lib +libexecdir = ${exec_prefix}/libexec +localstatedir = ${prefix}/var +mandir = ${prefix}/man +mkdir_p = mkdir -p -- +oldincludedir = /usr/include +prefix = /home/desonia/panstarrs/psLib +program_transform_name = s,x,x, +sbindir = ${exec_prefix}/sbin +sharedstatedir = ${prefix}/com +sysconfdir = ${prefix}/etc +target_alias = + +# not a GNU package. You can remove this line, if +# have all needed files, that a GNU package needs +AUTOMAKE_OPTIONS = foreign 1.4 +SUBDIRS = astronomy collections dataManip fileUtils image sysUtils +EXTRA_DIST = runTest FullUnitTest +all: all-recursive + +.SUFFIXES: +$(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) --foreign test/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --foreign test/Makefile +.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 + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +mostlyclean-recursive clean-recursive distclean-recursive \ +maintainer-clean-recursive: + @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + 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; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + 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; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: ctags-recursive $(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: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @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"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(mkdir_p) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ + distdir) \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-recursive +all-am: Makefile +installdirs: installdirs-recursive +installdirs-am: +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-recursive + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-libtool \ + distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +info: info-recursive + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-recursive + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: uninstall-info-am + +uninstall-info: uninstall-info-recursive + +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ + clean clean-generic clean-libtool clean-recursive ctags \ + ctags-recursive distclean distclean-generic distclean-libtool \ + distclean-recursive distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive \ + mostlyclean mostlyclean-generic mostlyclean-libtool \ + mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-info-am + + +tests: +# 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. +.NOEXPORT: Index: trunk/psLib/test/Makefile.am =================================================================== --- trunk/psLib/test/Makefile.am (revision 3115) +++ trunk/psLib/test/Makefile.am (revision 3115) @@ -0,0 +1,10 @@ +# not a GNU package. You can remove this line, if +# have all needed files, that a GNU package needs +AUTOMAKE_OPTIONS = foreign 1.4 + +SUBDIRS = astronomy collections dataManip fileUtils image sysUtils + +EXTRA_DIST = runTest FullUnitTest + +tests: + Index: trunk/psLib/test/astronomy/Makefile =================================================================== --- trunk/psLib/test/astronomy/Makefile (revision 3112) +++ trunk/psLib/test/astronomy/Makefile (revision 3115) @@ -1,27 +1,252 @@ -################################################################################ -## -## Makefile: test/astronomy -## -## $Revision: 1.26 $ $Name: not supported by cvs2svn $ -## $Date: 2005-01-19 01:53:00 $ -## -## Copyright 2004 Maui High Performance Computing Center, University of Hawaii -## -############################################################################### - -ifndef prefix - export prefix=$(shell cd ../..;pwd) -endif - -include ../../src/Makefile.Globals - -CFLAGS := -I../../include \ - -DTIME_XML_FILE="\"$(TIME_XML_FILE)\"" \ - -DTIME_CONFIG_FILE="\"$(TIME_CONFIG_FILE)\"" \ - $(CFLAGS) - -LDFLAGS := -L../../lib -lpslib -lpstest -lxml2 $(LDFLAGS) - -TARGET = tst_psTime_01 \ +# Makefile.in generated by automake 1.9.1 from Makefile.am. +# test/astronomy/Makefile. Generated from Makefile.in by configure. + +# 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, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + +SOURCES = $(tst_psAstrometry_SOURCES) $(tst_psAstrometry01_SOURCES) $(tst_psCoord_SOURCES) $(tst_psMetadataIO_SOURCES) $(tst_psMetadata_01_SOURCES) $(tst_psMetadata_02_SOURCES) $(tst_psMetadata_03_SOURCES) $(tst_psMetadata_04_SOURCES) $(tst_psMetadata_05_SOURCES) $(tst_psMetadata_06_SOURCES) $(tst_psMetadata_07_SOURCES) $(tst_psTime_01_SOURCES) $(tst_psTime_02_SOURCES) $(tst_psTime_03_SOURCES) $(tst_psTime_04_SOURCES) + +srcdir = . +top_srcdir = ../.. + +pkgdatadir = $(datadir)/pslib +pkglibdir = $(libdir)/pslib +pkgincludedir = $(includedir)/pslib +top_builddir = ../.. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = /usr/bin/install -c +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = x86_64-unknown-linux-gnu +host_triplet = x86_64-unknown-linux-gnu +check_PROGRAMS = tst_psTime_01$(EXEEXT) tst_psTime_02$(EXEEXT) \ + tst_psTime_03$(EXEEXT) tst_psTime_04$(EXEEXT) \ + tst_psMetadataIO$(EXEEXT) tst_psMetadata_01$(EXEEXT) \ + tst_psMetadata_02$(EXEEXT) tst_psMetadata_03$(EXEEXT) \ + tst_psMetadata_04$(EXEEXT) tst_psMetadata_05$(EXEEXT) \ + tst_psMetadata_06$(EXEEXT) tst_psMetadata_07$(EXEEXT) \ + tst_psAstrometry$(EXEEXT) tst_psCoord$(EXEEXT) \ + tst_psAstrometry01$(EXEEXT) +subdir = test/astronomy +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 = +am_tst_psAstrometry_OBJECTS = tst_psAstrometry.$(OBJEXT) +tst_psAstrometry_OBJECTS = $(am_tst_psAstrometry_OBJECTS) +tst_psAstrometry_LDADD = $(LDADD) +am_tst_psAstrometry01_OBJECTS = tst_psAstrometry01.$(OBJEXT) +tst_psAstrometry01_OBJECTS = $(am_tst_psAstrometry01_OBJECTS) +tst_psAstrometry01_LDADD = $(LDADD) +am_tst_psCoord_OBJECTS = tst_psCoord.$(OBJEXT) +tst_psCoord_OBJECTS = $(am_tst_psCoord_OBJECTS) +tst_psCoord_LDADD = $(LDADD) +am_tst_psMetadataIO_OBJECTS = tst_psMetadataIO.$(OBJEXT) +tst_psMetadataIO_OBJECTS = $(am_tst_psMetadataIO_OBJECTS) +tst_psMetadataIO_LDADD = $(LDADD) +am_tst_psMetadata_01_OBJECTS = tst_psMetadata_01.$(OBJEXT) +tst_psMetadata_01_OBJECTS = $(am_tst_psMetadata_01_OBJECTS) +tst_psMetadata_01_LDADD = $(LDADD) +am_tst_psMetadata_02_OBJECTS = tst_psMetadata_02.$(OBJEXT) +tst_psMetadata_02_OBJECTS = $(am_tst_psMetadata_02_OBJECTS) +tst_psMetadata_02_LDADD = $(LDADD) +am_tst_psMetadata_03_OBJECTS = tst_psMetadata_03.$(OBJEXT) +tst_psMetadata_03_OBJECTS = $(am_tst_psMetadata_03_OBJECTS) +tst_psMetadata_03_LDADD = $(LDADD) +am_tst_psMetadata_04_OBJECTS = tst_psMetadata_04.$(OBJEXT) +tst_psMetadata_04_OBJECTS = $(am_tst_psMetadata_04_OBJECTS) +tst_psMetadata_04_LDADD = $(LDADD) +am_tst_psMetadata_05_OBJECTS = tst_psMetadata_05.$(OBJEXT) +tst_psMetadata_05_OBJECTS = $(am_tst_psMetadata_05_OBJECTS) +tst_psMetadata_05_LDADD = $(LDADD) +am_tst_psMetadata_06_OBJECTS = tst_psMetadata_06.$(OBJEXT) +tst_psMetadata_06_OBJECTS = $(am_tst_psMetadata_06_OBJECTS) +tst_psMetadata_06_LDADD = $(LDADD) +am_tst_psMetadata_07_OBJECTS = tst_psMetadata_07.$(OBJEXT) +tst_psMetadata_07_OBJECTS = $(am_tst_psMetadata_07_OBJECTS) +tst_psMetadata_07_LDADD = $(LDADD) +am_tst_psTime_01_OBJECTS = tst_psTime_01.$(OBJEXT) +tst_psTime_01_OBJECTS = $(am_tst_psTime_01_OBJECTS) +tst_psTime_01_LDADD = $(LDADD) +am_tst_psTime_02_OBJECTS = tst_psTime_02.$(OBJEXT) +tst_psTime_02_OBJECTS = $(am_tst_psTime_02_OBJECTS) +tst_psTime_02_LDADD = $(LDADD) +am_tst_psTime_03_OBJECTS = tst_psTime_03.$(OBJEXT) +tst_psTime_03_OBJECTS = $(am_tst_psTime_03_OBJECTS) +tst_psTime_03_LDADD = $(LDADD) +am_tst_psTime_04_OBJECTS = tst_psTime_04.$(OBJEXT) +tst_psTime_04_OBJECTS = $(am_tst_psTime_04_OBJECTS) +tst_psTime_04_LDADD = $(LDADD) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(tst_psAstrometry_SOURCES) $(tst_psAstrometry01_SOURCES) \ + $(tst_psCoord_SOURCES) $(tst_psMetadataIO_SOURCES) \ + $(tst_psMetadata_01_SOURCES) $(tst_psMetadata_02_SOURCES) \ + $(tst_psMetadata_03_SOURCES) $(tst_psMetadata_04_SOURCES) \ + $(tst_psMetadata_05_SOURCES) $(tst_psMetadata_06_SOURCES) \ + $(tst_psMetadata_07_SOURCES) $(tst_psTime_01_SOURCES) \ + $(tst_psTime_02_SOURCES) $(tst_psTime_03_SOURCES) \ + $(tst_psTime_04_SOURCES) +DIST_SOURCES = $(tst_psAstrometry_SOURCES) \ + $(tst_psAstrometry01_SOURCES) $(tst_psCoord_SOURCES) \ + $(tst_psMetadataIO_SOURCES) $(tst_psMetadata_01_SOURCES) \ + $(tst_psMetadata_02_SOURCES) $(tst_psMetadata_03_SOURCES) \ + $(tst_psMetadata_04_SOURCES) $(tst_psMetadata_05_SOURCES) \ + $(tst_psMetadata_06_SOURCES) $(tst_psMetadata_07_SOURCES) \ + $(tst_psTime_01_SOURCES) $(tst_psTime_02_SOURCES) \ + $(tst_psTime_03_SOURCES) $(tst_psTime_04_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = ${SHELL} /home/desonia/panstarrs/psLib/missing --run aclocal-1.9 +AMDEP_FALSE = # +AMDEP_TRUE = +AMTAR = ${SHELL} /home/desonia/panstarrs/psLib/missing --run tar +AR = ar +AUTOCONF = ${SHELL} /home/desonia/panstarrs/psLib/missing --run autoconf +AUTOHEADER = ${SHELL} /home/desonia/panstarrs/psLib/missing --run autoheader +AUTOMAKE = ${SHELL} /home/desonia/panstarrs/psLib/missing --run automake-1.9 +AWK = gawk +CC = gcc +CCDEPMODE = depmode=gcc3 +CFLAGS = -g -O2 -g2 -Wall -std=c99 -D_GNU_SOURCE -I/usr/include -I/usr/include/libxml2 +CONFIG_FILE = /home/desonia/panstarrs/psLib/config/psTime.config +CPP = gcc -E +CPPFLAGS = +CXX = g++ +CXXCPP = g++ -E +CXXDEPMODE = depmode=gcc3 +CXXFLAGS = -g -O2 +CYGPATH_W = echo +DEFS = -DHAVE_CONFIG_H +DEPDIR = .deps +ECHO = echo +ECHO_C = +ECHO_N = -n +ECHO_T = +EGREP = grep -E +EXEEXT = +F77 = g77 +FFLAGS = -fno-second-underscore -O -fno-f2c +GSL_CONFIG = /usr/bin/gsl-config +INSTALL_DATA = ${INSTALL} -m 644 +INSTALL_PROGRAM = ${INSTALL} +INSTALL_SCRIPT = ${INSTALL} +INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s +LDFLAGS = +LIBOBJS = +LIBS = +LIBTOOL = $(SHELL) $(top_builddir)/libtool +LN_S = ln -s +LTLIBOBJS = +MAKEINFO = ${SHELL} /home/desonia/panstarrs/psLib/missing --run makeinfo +OBJEXT = o +PACKAGE = pslib +PACKAGE_BUGREPORT = +PACKAGE_NAME = +PACKAGE_STRING = +PACKAGE_TARNAME = +PACKAGE_VERSION = +PATH_SEPARATOR = : +PERL = /usr/bin/perl +PSLIB_CFLAGS = -I${prefix}/include +PSLIB_LIBS = `sh $(top_srcdir)/pslib-config --libs` +RANLIB = ranlib +SET_MAKE = +SHELL = /bin/sh +STRIP = strip +SWIG = /usr/bin/swig +VERSION = 1.5 +XML_CONFIG = /usr/bin/xml2-config +ac_ct_AR = ar +ac_ct_CC = gcc +ac_ct_CXX = g++ +ac_ct_F77 = g77 +ac_ct_RANLIB = ranlib +ac_ct_STRIP = strip +am__fastdepCC_FALSE = # +am__fastdepCC_TRUE = +am__fastdepCXX_FALSE = # +am__fastdepCXX_TRUE = +am__include = include +am__leading_dot = . +am__quote = +am__tar = ${AMTAR} chof - "$$tardir" +am__untar = ${AMTAR} xf - +bindir = ${exec_prefix}/bin +build = x86_64-unknown-linux-gnu +build_alias = +build_cpu = x86_64 +build_os = linux-gnu +build_vendor = unknown +datadir = ${prefix}/share +exec_prefix = ${prefix} +host = x86_64-unknown-linux-gnu +host_alias = +host_cpu = x86_64 +host_os = linux-gnu +host_vendor = unknown +includedir = ${prefix}/include +infodir = ${prefix}/info +install_sh = /home/desonia/panstarrs/psLib/install-sh +libdir = ${exec_prefix}/lib +libexecdir = ${exec_prefix}/libexec +localstatedir = ${prefix}/var +mandir = ${prefix}/man +mkdir_p = mkdir -p -- +oldincludedir = /usr/include +prefix = /home/desonia/panstarrs/psLib +program_transform_name = s,x,x, +sbindir = ${exec_prefix}/sbin +sharedstatedir = ${prefix}/com +sysconfdir = ${prefix}/etc +target_alias = + +#Makefile for astronomy functions of psLib +# +INCLUDES = \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/astronomy \ + -I$(top_srcdir)/src/collections \ + -I$(top_srcdir)/src/dataManip \ + -I$(top_srcdir)/src/fileUtils \ + -I$(top_srcdir)/src/image \ + -I$(top_srcdir)/src/sysUtils \ + $(all_includes) + +AM_LDFLAGS = $(PSLIB_LIBS) -L$(top_srcdir)/src +TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest +TESTS = tst_psTime_01 \ tst_psTime_02 \ tst_psTime_03 \ @@ -39,28 +264,418 @@ tst_psAstrometry01 -OBJS = $(addprefix builddir/,$(addsuffix .o,$(TARGET))) - -all: $(TARGET) - sed 's|PREFIX|$(prefix)|' test.psTime.config1.template > test.psTime.config1 - sed 's|PREFIX|$(prefix)|' test.psTime.config2.template > test.psTime.config2 - sed 's|PREFIX|$(prefix)|' test.psTime.config3.template > test.psTime.config3 - sed 's|PREFIX|$(prefix)|' test.psTime.config4.template > test.psTime.config4 - -clean: - @echo " Deleting executable and binary files for 'test/collections'" - $(RM) $(OBJS) - -distclean: clean - $(RM) $(TARGET) - -install: $(testbindir) $(testbindir)/verified $(TARGET) - install test.config header_1.fits header_2.fits $(TARGET) $(testbindir) - install verified/*.stderr verified/*.stdout $(testbindir)/verified - install test.ser7.dat test.psTime.config1 test.psTime.config2 test.psTime.config3 test.psTime.config4 $(testbindir) - -$(testbindir): - mkdir -p $(testbindir) - -$(testbindir)/verified: - mkdir -p $(testbindir)/verified - +tst_psTime_01_SOURCES = tst_psTime_01.c +tst_psTime_02_SOURCES = tst_psTime_02.c +tst_psTime_03_SOURCES = tst_psTime_03.c +tst_psTime_04_SOURCES = tst_psTime_04.c +tst_psMetadataIO_SOURCES = tst_psMetadataIO.c +tst_psMetadata_01_SOURCES = tst_psMetadata_01.c +tst_psMetadata_02_SOURCES = tst_psMetadata_02.c +tst_psMetadata_03_SOURCES = tst_psMetadata_03.c +tst_psMetadata_04_SOURCES = tst_psMetadata_04.c +tst_psMetadata_05_SOURCES = tst_psMetadata_05.c +tst_psMetadata_06_SOURCES = tst_psMetadata_06.c +tst_psMetadata_07_SOURCES = tst_psMetadata_07.c +tst_psAstrometry_SOURCES = tst_psAstrometry.c +tst_psCoord_SOURCES = tst_psCoord.c +tst_psAstrometry01_SOURCES = tst_psAstrometry01.c +BUILT_SOURCES = test.psTime.config1 test.psTime.config2 test.psTime.config3 test.psTime.config4 +all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(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/astronomy/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu test/astronomy/Makefile +.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 + +clean-checkPROGRAMS: + @list='$(check_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done +tst_psAstrometry$(EXEEXT): $(tst_psAstrometry_OBJECTS) $(tst_psAstrometry_DEPENDENCIES) + @rm -f tst_psAstrometry$(EXEEXT) + $(LINK) $(tst_psAstrometry_LDFLAGS) $(tst_psAstrometry_OBJECTS) $(tst_psAstrometry_LDADD) $(LIBS) +tst_psAstrometry01$(EXEEXT): $(tst_psAstrometry01_OBJECTS) $(tst_psAstrometry01_DEPENDENCIES) + @rm -f tst_psAstrometry01$(EXEEXT) + $(LINK) $(tst_psAstrometry01_LDFLAGS) $(tst_psAstrometry01_OBJECTS) $(tst_psAstrometry01_LDADD) $(LIBS) +tst_psCoord$(EXEEXT): $(tst_psCoord_OBJECTS) $(tst_psCoord_DEPENDENCIES) + @rm -f tst_psCoord$(EXEEXT) + $(LINK) $(tst_psCoord_LDFLAGS) $(tst_psCoord_OBJECTS) $(tst_psCoord_LDADD) $(LIBS) +tst_psMetadataIO$(EXEEXT): $(tst_psMetadataIO_OBJECTS) $(tst_psMetadataIO_DEPENDENCIES) + @rm -f tst_psMetadataIO$(EXEEXT) + $(LINK) $(tst_psMetadataIO_LDFLAGS) $(tst_psMetadataIO_OBJECTS) $(tst_psMetadataIO_LDADD) $(LIBS) +tst_psMetadata_01$(EXEEXT): $(tst_psMetadata_01_OBJECTS) $(tst_psMetadata_01_DEPENDENCIES) + @rm -f tst_psMetadata_01$(EXEEXT) + $(LINK) $(tst_psMetadata_01_LDFLAGS) $(tst_psMetadata_01_OBJECTS) $(tst_psMetadata_01_LDADD) $(LIBS) +tst_psMetadata_02$(EXEEXT): $(tst_psMetadata_02_OBJECTS) $(tst_psMetadata_02_DEPENDENCIES) + @rm -f tst_psMetadata_02$(EXEEXT) + $(LINK) $(tst_psMetadata_02_LDFLAGS) $(tst_psMetadata_02_OBJECTS) $(tst_psMetadata_02_LDADD) $(LIBS) +tst_psMetadata_03$(EXEEXT): $(tst_psMetadata_03_OBJECTS) $(tst_psMetadata_03_DEPENDENCIES) + @rm -f tst_psMetadata_03$(EXEEXT) + $(LINK) $(tst_psMetadata_03_LDFLAGS) $(tst_psMetadata_03_OBJECTS) $(tst_psMetadata_03_LDADD) $(LIBS) +tst_psMetadata_04$(EXEEXT): $(tst_psMetadata_04_OBJECTS) $(tst_psMetadata_04_DEPENDENCIES) + @rm -f tst_psMetadata_04$(EXEEXT) + $(LINK) $(tst_psMetadata_04_LDFLAGS) $(tst_psMetadata_04_OBJECTS) $(tst_psMetadata_04_LDADD) $(LIBS) +tst_psMetadata_05$(EXEEXT): $(tst_psMetadata_05_OBJECTS) $(tst_psMetadata_05_DEPENDENCIES) + @rm -f tst_psMetadata_05$(EXEEXT) + $(LINK) $(tst_psMetadata_05_LDFLAGS) $(tst_psMetadata_05_OBJECTS) $(tst_psMetadata_05_LDADD) $(LIBS) +tst_psMetadata_06$(EXEEXT): $(tst_psMetadata_06_OBJECTS) $(tst_psMetadata_06_DEPENDENCIES) + @rm -f tst_psMetadata_06$(EXEEXT) + $(LINK) $(tst_psMetadata_06_LDFLAGS) $(tst_psMetadata_06_OBJECTS) $(tst_psMetadata_06_LDADD) $(LIBS) +tst_psMetadata_07$(EXEEXT): $(tst_psMetadata_07_OBJECTS) $(tst_psMetadata_07_DEPENDENCIES) + @rm -f tst_psMetadata_07$(EXEEXT) + $(LINK) $(tst_psMetadata_07_LDFLAGS) $(tst_psMetadata_07_OBJECTS) $(tst_psMetadata_07_LDADD) $(LIBS) +tst_psTime_01$(EXEEXT): $(tst_psTime_01_OBJECTS) $(tst_psTime_01_DEPENDENCIES) + @rm -f tst_psTime_01$(EXEEXT) + $(LINK) $(tst_psTime_01_LDFLAGS) $(tst_psTime_01_OBJECTS) $(tst_psTime_01_LDADD) $(LIBS) +tst_psTime_02$(EXEEXT): $(tst_psTime_02_OBJECTS) $(tst_psTime_02_DEPENDENCIES) + @rm -f tst_psTime_02$(EXEEXT) + $(LINK) $(tst_psTime_02_LDFLAGS) $(tst_psTime_02_OBJECTS) $(tst_psTime_02_LDADD) $(LIBS) +tst_psTime_03$(EXEEXT): $(tst_psTime_03_OBJECTS) $(tst_psTime_03_DEPENDENCIES) + @rm -f tst_psTime_03$(EXEEXT) + $(LINK) $(tst_psTime_03_LDFLAGS) $(tst_psTime_03_OBJECTS) $(tst_psTime_03_LDADD) $(LIBS) +tst_psTime_04$(EXEEXT): $(tst_psTime_04_OBJECTS) $(tst_psTime_04_DEPENDENCIES) + @rm -f tst_psTime_04$(EXEEXT) + $(LINK) $(tst_psTime_04_LDFLAGS) $(tst_psTime_04_OBJECTS) $(tst_psTime_04_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +include ./$(DEPDIR)/tst_psAstrometry.Po +include ./$(DEPDIR)/tst_psAstrometry01.Po +include ./$(DEPDIR)/tst_psCoord.Po +include ./$(DEPDIR)/tst_psMetadataIO.Po +include ./$(DEPDIR)/tst_psMetadata_01.Po +include ./$(DEPDIR)/tst_psMetadata_02.Po +include ./$(DEPDIR)/tst_psMetadata_03.Po +include ./$(DEPDIR)/tst_psMetadata_04.Po +include ./$(DEPDIR)/tst_psMetadata_05.Po +include ./$(DEPDIR)/tst_psMetadata_06.Po +include ./$(DEPDIR)/tst_psMetadata_07.Po +include ./$(DEPDIR)/tst_psTime_01.Po +include ./$(DEPDIR)/tst_psTime_02.Po +include ./$(DEPDIR)/tst_psTime_03.Po +include ./$(DEPDIR)/tst_psTime_04.Po + +.c.o: + 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 \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(COMPILE) -c $< + +.c.obj: + 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 \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: + 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 \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + 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; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(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; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +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: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +check-TESTS: $(TESTS) + @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list='$(TESTS)'; \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ + elif test -f $$tst; then dir=; \ + else dir="$(srcdir)/"; fi; \ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *" $$tst "*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ + ;; \ + *) \ + echo "PASS: $$tst"; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *" $$tst "*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ + *) \ + failed=`expr $$failed + 1`; \ + echo "FAIL: $$tst"; \ + ;; \ + esac; \ + else \ + skip=`expr $$skip + 1`; \ + echo "SKIP: $$tst"; \ + fi; \ + done; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ + banner="All $$all tests passed"; \ + else \ + banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ + banner="$$failed of $$all tests failed"; \ + else \ + banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ + skipped="($$skip tests were not run)"; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ + report=""; \ + if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ + report="Please report to $(PACKAGE_BUGREPORT)"; \ + test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$report"; \ + fi; \ + dashes=`echo "$$dashes" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ + test -z "$$skipped" || echo "$$skipped"; \ + test -z "$$report" || echo "$$report"; \ + echo "$$dashes"; \ + test "$$failed" -eq 0; \ + else :; fi + +distdir: $(DISTFILES) + @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"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) + $(MAKE) $(AM_MAKEFLAGS) check-TESTS +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am +all-am: Makefile +installdirs: +install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +clean: clean-am + +clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-libtool distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am + +.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ + clean-checkPROGRAMS 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-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-info-am + +tests: $(TESTS) + +test.psTime.config1: test.psTime.config1.template + sed 's|PREFIX|$(prefix)|' $? > $@ + +test.psTime.config2: test.psTime.config2.template + sed 's|PREFIX|$(prefix)|' $? > $@ + +test.psTime.config3: test.psTime.config3.template + sed 's|PREFIX|$(prefix)|' $? > $@ + +test.psTime.config4: test.psTime.config4.template + sed 's|PREFIX|$(prefix)|' $? > $@ +# 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. +.NOEXPORT: Index: trunk/psLib/test/astronomy/Makefile.am =================================================================== --- trunk/psLib/test/astronomy/Makefile.am (revision 3115) +++ trunk/psLib/test/astronomy/Makefile.am (revision 3115) @@ -0,0 +1,79 @@ +#Makefile for astronomy functions of psLib +# +INCLUDES = \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/astronomy \ + -I$(top_srcdir)/src/collections \ + -I$(top_srcdir)/src/dataManip \ + -I$(top_srcdir)/src/fileUtils \ + -I$(top_srcdir)/src/image \ + -I$(top_srcdir)/src/sysUtils \ + $(all_includes) + +PSLIB_LIBS = `sh $(top_srcdir)/pslib-config --libs` +AM_LDFLAGS = $(PSLIB_LIBS) -L$(top_srcdir)/src + +check_PROGRAMS = tst_psTime_01 \ + tst_psTime_02 \ + tst_psTime_03 \ + tst_psTime_04 \ + tst_psMetadataIO \ + tst_psMetadata_01 \ + tst_psMetadata_02 \ + tst_psMetadata_03 \ + tst_psMetadata_04 \ + tst_psMetadata_05 \ + tst_psMetadata_06 \ + tst_psMetadata_07 \ + tst_psAstrometry \ + tst_psCoord \ + tst_psAstrometry01 + +TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest +TESTS = tst_psTime_01 \ + tst_psTime_02 \ + tst_psTime_03 \ + tst_psTime_04 \ + tst_psMetadataIO \ + tst_psMetadata_01 \ + tst_psMetadata_02 \ + tst_psMetadata_03 \ + tst_psMetadata_04 \ + tst_psMetadata_05 \ + tst_psMetadata_06 \ + tst_psMetadata_07 \ + tst_psAstrometry \ + tst_psCoord \ + tst_psAstrometry01 +tests: $(TESTS) + +tst_psTime_01_SOURCES = tst_psTime_01.c +tst_psTime_02_SOURCES = tst_psTime_02.c +tst_psTime_03_SOURCES = tst_psTime_03.c +tst_psTime_04_SOURCES = tst_psTime_04.c +tst_psMetadataIO_SOURCES = tst_psMetadataIO.c +tst_psMetadata_01_SOURCES = tst_psMetadata_01.c +tst_psMetadata_02_SOURCES = tst_psMetadata_02.c +tst_psMetadata_03_SOURCES = tst_psMetadata_03.c +tst_psMetadata_04_SOURCES = tst_psMetadata_04.c +tst_psMetadata_05_SOURCES = tst_psMetadata_05.c +tst_psMetadata_06_SOURCES = tst_psMetadata_06.c +tst_psMetadata_07_SOURCES = tst_psMetadata_07.c +tst_psAstrometry_SOURCES = tst_psAstrometry.c +tst_psCoord_SOURCES = tst_psCoord.c +tst_psAstrometry01_SOURCES = tst_psAstrometry01.c + +BUILT_SOURCES = test.psTime.config1 test.psTime.config2 test.psTime.config3 test.psTime.config4 + +test.psTime.config1: test.psTime.config1.template + sed 's|PREFIX|$(prefix)|' $? > $@ + +test.psTime.config2: test.psTime.config2.template + sed 's|PREFIX|$(prefix)|' $? > $@ + +test.psTime.config3: test.psTime.config3.template + sed 's|PREFIX|$(prefix)|' $? > $@ + +test.psTime.config4: test.psTime.config4.template + sed 's|PREFIX|$(prefix)|' $? > $@ + Index: trunk/psLib/test/astronomy/test.psTime.config2 =================================================================== --- trunk/psLib/test/astronomy/test.psTime.config2 (revision 3112) +++ trunk/psLib/test/astronomy/test.psTime.config2 (revision 3115) @@ -1,4 +1,4 @@ # This configuration file specifies values required for time calculations by psLib. -psLib.time.tables.dir STR /home/desonia/psLib/data # Directory for time tables +psLib.time.tables.dir STR /home/desonia/panstarrs/psLib/data # Directory for time tables psLib.time.tables.n S32 4 # Number of time tables psLib.time.tables.files STR eopc01_1900_2004.dat finals_all.dat tai_utc.dat # These are the table file names Index: trunk/psLib/test/astronomy/test.psTime.config3 =================================================================== --- trunk/psLib/test/astronomy/test.psTime.config3 (revision 3112) +++ trunk/psLib/test/astronomy/test.psTime.config3 (revision 3115) @@ -1,4 +1,4 @@ # This configuration file specifies values required for time calculations by psLib. -psLib.time.tables.dir STR /home/desonia/psLib/data # Directory for time tables +psLib.time.tables.dir STR /home/desonia/panstarrs/psLib/data # Directory for time tables psLib.time.tables.n S32 4 # Number of time tables psLib.time.tables.files STR ser7.dat eopc01_1900_2004.dat finals_all.dat tai_utc.dat # These are the table file names Index: trunk/psLib/test/astronomy/tst_psMetadataIO.c =================================================================== --- trunk/psLib/test/astronomy/tst_psMetadataIO.c (revision 3112) +++ trunk/psLib/test/astronomy/tst_psMetadataIO.c (revision 3115) @@ -13,6 +13,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-02-02 20:20:55 $ +* @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-03 00:54:12 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -20,7 +20,7 @@ */ +#include #include "pslib.h" #include "psTest.h" -#include static void printMetadataItem(psMetadataItem *metadataItem, char *spaces); Index: trunk/psLib/test/astronomy/tst_psMetadata_01.c =================================================================== --- trunk/psLib/test/astronomy/tst_psMetadata_01.c (revision 3112) +++ trunk/psLib/test/astronomy/tst_psMetadata_01.c (revision 3115) @@ -18,6 +18,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-02-02 20:20:55 $ +* @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-03 00:54:12 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -25,7 +25,7 @@ */ +#include #include "pslib.h" #include "psTest.h" -#include static void printMetadataItem(psMetadataItem *metadataItem, char *spaces); Index: trunk/psLib/test/astronomy/tst_psMetadata_02.c =================================================================== --- trunk/psLib/test/astronomy/tst_psMetadata_02.c (revision 3112) +++ trunk/psLib/test/astronomy/tst_psMetadata_02.c (revision 3115) @@ -14,6 +14,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-12-03 23:19:07 $ +* @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-03 00:54:12 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -21,7 +21,7 @@ */ +#include #include "pslib.h" #include "psTest.h" -#include static void printMetadataItem(psMetadataItem *metadataItem) Index: trunk/psLib/test/astronomy/tst_psMetadata_03.c =================================================================== --- trunk/psLib/test/astronomy/tst_psMetadata_03.c (revision 3112) +++ trunk/psLib/test/astronomy/tst_psMetadata_03.c (revision 3115) @@ -18,6 +18,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-12-03 23:19:07 $ +* @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-03 00:54:12 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -25,7 +25,7 @@ */ +#include #include "pslib.h" #include "psTest.h" -#include static void printMetadataItem(psMetadataItem *metadataItem) Index: trunk/psLib/test/astronomy/tst_psMetadata_04.c =================================================================== --- trunk/psLib/test/astronomy/tst_psMetadata_04.c (revision 3112) +++ trunk/psLib/test/astronomy/tst_psMetadata_04.c (revision 3115) @@ -23,6 +23,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-01-13 21:19:31 $ +* @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-03 00:54:12 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -30,7 +30,7 @@ */ +#include #include "pslib.h" #include "psTest.h" -#include static void printMetadataItem(psMetadataItem *metadataItem) Index: trunk/psLib/test/astronomy/tst_psMetadata_05.c =================================================================== --- trunk/psLib/test/astronomy/tst_psMetadata_05.c (revision 3112) +++ trunk/psLib/test/astronomy/tst_psMetadata_05.c (revision 3115) @@ -22,6 +22,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-01-13 23:34:56 $ +* @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-03 00:54:12 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -29,7 +29,7 @@ */ +#include #include "pslib.h" #include "psTest.h" -#include static void printMetadataItem(psMetadataItem *metadataItem) Index: trunk/psLib/test/astronomy/tst_psMetadata_06.c =================================================================== --- trunk/psLib/test/astronomy/tst_psMetadata_06.c (revision 3112) +++ trunk/psLib/test/astronomy/tst_psMetadata_06.c (revision 3115) @@ -13,6 +13,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-12-03 23:19:07 $ +* @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-03 00:54:12 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -20,7 +20,7 @@ */ +#include #include "pslib.h" #include "psTest.h" -#include static void printMetadataItem(psMetadataItem *metadataItem) Index: trunk/psLib/test/astronomy/tst_psMetadata_07.c =================================================================== --- trunk/psLib/test/astronomy/tst_psMetadata_07.c (revision 3112) +++ trunk/psLib/test/astronomy/tst_psMetadata_07.c (revision 3115) @@ -9,18 +9,13 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-01-19 01:53:00 $ +* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-03 00:54:12 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii * */ +#include "config.h" #include "pslib.h" #include "psTest.h" - -#ifndef TIME_XML_FILE -#define TIME_XML_FILE "../../config/psTime.xml" -#pragma warning TIME_XML_FILE was not defined in the makefile. -#endif - int main(int argc, char* argv[]) @@ -31,5 +26,5 @@ psU32 nFail = 0; psMetadata *md = NULL; - md = psMetadataParseConfigXml(md, &nFail, TIME_XML_FILE, true); + md = psMetadataParseConfigXml(md, &nFail, XML_CONFIG_FILE, true); if (nFail != 0) { printf("psMetadataParseConfigXml returned error %d\n", res); Index: trunk/psLib/test/astronomy/tst_psTime_01.c =================================================================== --- trunk/psLib/test/astronomy/tst_psTime_01.c (revision 3112) +++ trunk/psLib/test/astronomy/tst_psTime_01.c (revision 3115) @@ -23,6 +23,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-12-10 02:50:15 $ + * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:12 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -30,7 +30,7 @@ */ +#include #include "pslib.h" #include "psTest.h" -#include psS32 main(psS32 argc, char* argv[]) Index: trunk/psLib/test/astronomy/tst_psTime_04.c =================================================================== --- trunk/psLib/test/astronomy/tst_psTime_04.c (revision 3112) +++ trunk/psLib/test/astronomy/tst_psTime_04.c (revision 3115) @@ -14,10 +14,11 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-19 01:53:00 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:12 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii * */ +#include "config.h" #include "pslib.h" @@ -29,5 +30,5 @@ // Test A - Initialize time printPositiveTestHeader(stdout, "psTime", "Test A - Initialize time"); - psLibInit(true, TIME_CONFIG_FILE); + psLibInit(true, CONFIG_FILE); psLibFinalize(); printFooter(stdout, "psTime", "Test A - Initialize time", true); Index: trunk/psLib/test/collections/Makefile =================================================================== --- trunk/psLib/test/collections/Makefile (revision 3112) +++ trunk/psLib/test/collections/Makefile (revision 3115) @@ -1,23 +1,262 @@ -################################################################################ -## -## Makefile: test/collections -## -## $Revision: 1.27 $ $Name: not supported by cvs2svn $ -## $Date: 2005-01-03 20:28:07 $ -## -## Copyright 2004 Maui High Performance Computing Center, University of Hawaii -## -############################################################################### - -ifndef prefix - export prefix=$(shell cd ../..;pwd) -endif - -include ../../src/Makefile.Globals - -CFLAGS := -I../../include $(CFLAGS) -LDFLAGS := -L../../lib -lpslib -lpstest $(LDFLAGS) - -TARGET = tst_psVector \ +# Makefile.in generated by automake 1.9.1 from Makefile.am. +# test/collections/Makefile. Generated from Makefile.in by configure. + +# 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, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + +SOURCES = $(tst_psArray_SOURCES) $(tst_psArray01_SOURCES) $(tst_psArray02_SOURCES) $(tst_psBitSet_SOURCES) $(tst_psHash00_SOURCES) $(tst_psHash01_SOURCES) $(tst_psHash02_SOURCES) $(tst_psHash03_SOURCES) $(tst_psHash04_SOURCES) $(tst_psHash05_SOURCES) $(tst_psList_SOURCES) $(tst_psScalar_SOURCES) $(tst_psVector_SOURCES) $(tst_psVectorSort_01_SOURCES) $(tst_psVectorSort_02_SOURCES) $(tst_psVectorSort_03_SOURCES) $(tst_psVectorSort_04_SOURCES) + +srcdir = . +top_srcdir = ../.. + +pkgdatadir = $(datadir)/pslib +pkglibdir = $(libdir)/pslib +pkgincludedir = $(includedir)/pslib +top_builddir = ../.. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = /usr/bin/install -c +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = x86_64-unknown-linux-gnu +host_triplet = x86_64-unknown-linux-gnu +check_PROGRAMS = tst_psVector$(EXEEXT) tst_psArray$(EXEEXT) \ + tst_psArray01$(EXEEXT) tst_psArray02$(EXEEXT) \ + tst_psBitSet$(EXEEXT) tst_psVectorSort_01$(EXEEXT) \ + tst_psVectorSort_02$(EXEEXT) tst_psVectorSort_03$(EXEEXT) \ + tst_psVectorSort_04$(EXEEXT) tst_psList$(EXEEXT) \ + tst_psHash00$(EXEEXT) tst_psHash01$(EXEEXT) \ + tst_psHash02$(EXEEXT) tst_psHash03$(EXEEXT) \ + tst_psHash04$(EXEEXT) tst_psHash05$(EXEEXT) \ + tst_psScalar$(EXEEXT) +subdir = test/collections +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 = +am_tst_psArray_OBJECTS = tst_psArray.$(OBJEXT) +tst_psArray_OBJECTS = $(am_tst_psArray_OBJECTS) +tst_psArray_LDADD = $(LDADD) +am_tst_psArray01_OBJECTS = tst_psArray01.$(OBJEXT) +tst_psArray01_OBJECTS = $(am_tst_psArray01_OBJECTS) +tst_psArray01_LDADD = $(LDADD) +am_tst_psArray02_OBJECTS = tst_psArray02.$(OBJEXT) +tst_psArray02_OBJECTS = $(am_tst_psArray02_OBJECTS) +tst_psArray02_LDADD = $(LDADD) +am_tst_psBitSet_OBJECTS = tst_psBitSet.$(OBJEXT) +tst_psBitSet_OBJECTS = $(am_tst_psBitSet_OBJECTS) +tst_psBitSet_LDADD = $(LDADD) +am_tst_psHash00_OBJECTS = tst_psHash00.$(OBJEXT) +tst_psHash00_OBJECTS = $(am_tst_psHash00_OBJECTS) +tst_psHash00_LDADD = $(LDADD) +am_tst_psHash01_OBJECTS = tst_psHash01.$(OBJEXT) +tst_psHash01_OBJECTS = $(am_tst_psHash01_OBJECTS) +tst_psHash01_LDADD = $(LDADD) +am_tst_psHash02_OBJECTS = tst_psHash02.$(OBJEXT) +tst_psHash02_OBJECTS = $(am_tst_psHash02_OBJECTS) +tst_psHash02_LDADD = $(LDADD) +am_tst_psHash03_OBJECTS = tst_psHash03.$(OBJEXT) +tst_psHash03_OBJECTS = $(am_tst_psHash03_OBJECTS) +tst_psHash03_LDADD = $(LDADD) +am_tst_psHash04_OBJECTS = tst_psHash04.$(OBJEXT) +tst_psHash04_OBJECTS = $(am_tst_psHash04_OBJECTS) +tst_psHash04_LDADD = $(LDADD) +am_tst_psHash05_OBJECTS = tst_psHash05.$(OBJEXT) +tst_psHash05_OBJECTS = $(am_tst_psHash05_OBJECTS) +tst_psHash05_LDADD = $(LDADD) +am_tst_psList_OBJECTS = tst_psList.$(OBJEXT) +tst_psList_OBJECTS = $(am_tst_psList_OBJECTS) +tst_psList_LDADD = $(LDADD) +am_tst_psScalar_OBJECTS = tst_psScalar.$(OBJEXT) +tst_psScalar_OBJECTS = $(am_tst_psScalar_OBJECTS) +tst_psScalar_LDADD = $(LDADD) +am_tst_psVector_OBJECTS = tst_psVector.$(OBJEXT) +tst_psVector_OBJECTS = $(am_tst_psVector_OBJECTS) +tst_psVector_LDADD = $(LDADD) +am_tst_psVectorSort_01_OBJECTS = tst_psVectorSort_01.$(OBJEXT) +tst_psVectorSort_01_OBJECTS = $(am_tst_psVectorSort_01_OBJECTS) +tst_psVectorSort_01_LDADD = $(LDADD) +am_tst_psVectorSort_02_OBJECTS = tst_psVectorSort_02.$(OBJEXT) +tst_psVectorSort_02_OBJECTS = $(am_tst_psVectorSort_02_OBJECTS) +tst_psVectorSort_02_LDADD = $(LDADD) +am_tst_psVectorSort_03_OBJECTS = tst_psVectorSort_03.$(OBJEXT) +tst_psVectorSort_03_OBJECTS = $(am_tst_psVectorSort_03_OBJECTS) +tst_psVectorSort_03_LDADD = $(LDADD) +am_tst_psVectorSort_04_OBJECTS = tst_psVectorSort_04.$(OBJEXT) +tst_psVectorSort_04_OBJECTS = $(am_tst_psVectorSort_04_OBJECTS) +tst_psVectorSort_04_LDADD = $(LDADD) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(tst_psArray_SOURCES) $(tst_psArray01_SOURCES) \ + $(tst_psArray02_SOURCES) $(tst_psBitSet_SOURCES) \ + $(tst_psHash00_SOURCES) $(tst_psHash01_SOURCES) \ + $(tst_psHash02_SOURCES) $(tst_psHash03_SOURCES) \ + $(tst_psHash04_SOURCES) $(tst_psHash05_SOURCES) \ + $(tst_psList_SOURCES) $(tst_psScalar_SOURCES) \ + $(tst_psVector_SOURCES) $(tst_psVectorSort_01_SOURCES) \ + $(tst_psVectorSort_02_SOURCES) $(tst_psVectorSort_03_SOURCES) \ + $(tst_psVectorSort_04_SOURCES) +DIST_SOURCES = $(tst_psArray_SOURCES) $(tst_psArray01_SOURCES) \ + $(tst_psArray02_SOURCES) $(tst_psBitSet_SOURCES) \ + $(tst_psHash00_SOURCES) $(tst_psHash01_SOURCES) \ + $(tst_psHash02_SOURCES) $(tst_psHash03_SOURCES) \ + $(tst_psHash04_SOURCES) $(tst_psHash05_SOURCES) \ + $(tst_psList_SOURCES) $(tst_psScalar_SOURCES) \ + $(tst_psVector_SOURCES) $(tst_psVectorSort_01_SOURCES) \ + $(tst_psVectorSort_02_SOURCES) $(tst_psVectorSort_03_SOURCES) \ + $(tst_psVectorSort_04_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = ${SHELL} /home/desonia/panstarrs/psLib/missing --run aclocal-1.9 +AMDEP_FALSE = # +AMDEP_TRUE = +AMTAR = ${SHELL} /home/desonia/panstarrs/psLib/missing --run tar +AR = ar +AUTOCONF = ${SHELL} /home/desonia/panstarrs/psLib/missing --run autoconf +AUTOHEADER = ${SHELL} /home/desonia/panstarrs/psLib/missing --run autoheader +AUTOMAKE = ${SHELL} /home/desonia/panstarrs/psLib/missing --run automake-1.9 +AWK = gawk +CC = gcc +CCDEPMODE = depmode=gcc3 +CFLAGS = -g -O2 -g2 -Wall -std=c99 -D_GNU_SOURCE -I/usr/include -I/usr/include/libxml2 +CONFIG_FILE = /home/desonia/panstarrs/psLib/config/psTime.config +CPP = gcc -E +CPPFLAGS = +CXX = g++ +CXXCPP = g++ -E +CXXDEPMODE = depmode=gcc3 +CXXFLAGS = -g -O2 +CYGPATH_W = echo +DEFS = -DHAVE_CONFIG_H +DEPDIR = .deps +ECHO = echo +ECHO_C = +ECHO_N = -n +ECHO_T = +EGREP = grep -E +EXEEXT = +F77 = g77 +FFLAGS = -fno-second-underscore -O -fno-f2c +GSL_CONFIG = /usr/bin/gsl-config +INSTALL_DATA = ${INSTALL} -m 644 +INSTALL_PROGRAM = ${INSTALL} +INSTALL_SCRIPT = ${INSTALL} +INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s +LDFLAGS = +LIBOBJS = +LIBS = +LIBTOOL = $(SHELL) $(top_builddir)/libtool +LN_S = ln -s +LTLIBOBJS = +MAKEINFO = ${SHELL} /home/desonia/panstarrs/psLib/missing --run makeinfo +OBJEXT = o +PACKAGE = pslib +PACKAGE_BUGREPORT = +PACKAGE_NAME = +PACKAGE_STRING = +PACKAGE_TARNAME = +PACKAGE_VERSION = +PATH_SEPARATOR = : +PERL = /usr/bin/perl +PSLIB_CFLAGS = -I${prefix}/include +PSLIB_LIBS = -L${exec_prefix}/lib -lpslib -lcfitsio -lfftw3f -L/usr/lib64 -lgsl -lgslcblas -lm -lxml2 -lz -lpthread -lm +RANLIB = ranlib +SET_MAKE = +SHELL = /bin/sh +STRIP = strip +SWIG = /usr/bin/swig +VERSION = 1.5 +XML_CONFIG = /usr/bin/xml2-config +ac_ct_AR = ar +ac_ct_CC = gcc +ac_ct_CXX = g++ +ac_ct_F77 = g77 +ac_ct_RANLIB = ranlib +ac_ct_STRIP = strip +am__fastdepCC_FALSE = # +am__fastdepCC_TRUE = +am__fastdepCXX_FALSE = # +am__fastdepCXX_TRUE = +am__include = include +am__leading_dot = . +am__quote = +am__tar = ${AMTAR} chof - "$$tardir" +am__untar = ${AMTAR} xf - +bindir = ${exec_prefix}/bin +build = x86_64-unknown-linux-gnu +build_alias = +build_cpu = x86_64 +build_os = linux-gnu +build_vendor = unknown +datadir = ${prefix}/share +exec_prefix = ${prefix} +host = x86_64-unknown-linux-gnu +host_alias = +host_cpu = x86_64 +host_os = linux-gnu +host_vendor = unknown +includedir = ${prefix}/include +infodir = ${prefix}/info +install_sh = /home/desonia/panstarrs/psLib/install-sh +libdir = ${exec_prefix}/lib +libexecdir = ${exec_prefix}/libexec +localstatedir = ${prefix}/var +mandir = ${prefix}/man +mkdir_p = mkdir -p -- +oldincludedir = /usr/include +prefix = /home/desonia/panstarrs/psLib +program_transform_name = s,x,x, +sbindir = ${exec_prefix}/sbin +sharedstatedir = ${prefix}/com +sysconfdir = ${prefix}/etc +target_alias = + +#Makefile for astronomy functions of psLib +# +INCLUDES = \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/astronomy \ + -I$(top_srcdir)/src/collections \ + -I$(top_srcdir)/src/dataManip \ + -I$(top_srcdir)/src/fileUtils \ + -I$(top_srcdir)/src/image \ + -I$(top_srcdir)/src/sysUtils \ + $(all_includes) + +AM_LDFLAGS = -L$(top_srcdir)/src `sh $(top_srcdir)/pslib-config --libs` +TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest +TESTS = \ + tst_psVector \ tst_psArray \ tst_psArray01 \ @@ -37,24 +276,411 @@ tst_psScalar -OBJS = $(addsuffix .o,$(TARGET)) - -all: $(TARGET) - -clean: - @echo " Deleting executable and binary files for 'test/collections'" - $(RM) $(OBJS) - -distclean: clean - $(RM) $(TARGET) - -install: $(testbindir) $(testbindir)/verified $(TARGET) - install $(TARGET) $(testbindir) - install verified/*.stderr verified/*.stdout $(testbindir)/verified - -$(testbindir): - mkdir -p $(testbindir) - -$(testbindir)/verified: - mkdir -p $(testbindir)/verified - - +tst_psVector_SOURCES = tst_psVector.c +tst_psArray_SOURCES = tst_psArray.c +tst_psArray01_SOURCES = tst_psArray01.c +tst_psArray02_SOURCES = tst_psArray02.c +tst_psBitSet_SOURCES = tst_psBitSet.c +tst_psVectorSort_01_SOURCES = tst_psVectorSort_01.c +tst_psVectorSort_02_SOURCES = tst_psVectorSort_02.c +tst_psVectorSort_03_SOURCES = tst_psVectorSort_03.c +tst_psVectorSort_04_SOURCES = tst_psVectorSort_04.c +tst_psList_SOURCES = tst_psList.c +tst_psHash00_SOURCES = tst_psHash00.c +tst_psHash01_SOURCES = tst_psHash01.c +tst_psHash02_SOURCES = tst_psHash02.c +tst_psHash03_SOURCES = tst_psHash03.c +tst_psHash04_SOURCES = tst_psHash04.c +tst_psHash05_SOURCES = tst_psHash05.c +tst_psScalar_SOURCES = tst_psScalar.c +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(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/collections/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu test/collections/Makefile +.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 + +clean-checkPROGRAMS: + @list='$(check_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done +tst_psArray$(EXEEXT): $(tst_psArray_OBJECTS) $(tst_psArray_DEPENDENCIES) + @rm -f tst_psArray$(EXEEXT) + $(LINK) $(tst_psArray_LDFLAGS) $(tst_psArray_OBJECTS) $(tst_psArray_LDADD) $(LIBS) +tst_psArray01$(EXEEXT): $(tst_psArray01_OBJECTS) $(tst_psArray01_DEPENDENCIES) + @rm -f tst_psArray01$(EXEEXT) + $(LINK) $(tst_psArray01_LDFLAGS) $(tst_psArray01_OBJECTS) $(tst_psArray01_LDADD) $(LIBS) +tst_psArray02$(EXEEXT): $(tst_psArray02_OBJECTS) $(tst_psArray02_DEPENDENCIES) + @rm -f tst_psArray02$(EXEEXT) + $(LINK) $(tst_psArray02_LDFLAGS) $(tst_psArray02_OBJECTS) $(tst_psArray02_LDADD) $(LIBS) +tst_psBitSet$(EXEEXT): $(tst_psBitSet_OBJECTS) $(tst_psBitSet_DEPENDENCIES) + @rm -f tst_psBitSet$(EXEEXT) + $(LINK) $(tst_psBitSet_LDFLAGS) $(tst_psBitSet_OBJECTS) $(tst_psBitSet_LDADD) $(LIBS) +tst_psHash00$(EXEEXT): $(tst_psHash00_OBJECTS) $(tst_psHash00_DEPENDENCIES) + @rm -f tst_psHash00$(EXEEXT) + $(LINK) $(tst_psHash00_LDFLAGS) $(tst_psHash00_OBJECTS) $(tst_psHash00_LDADD) $(LIBS) +tst_psHash01$(EXEEXT): $(tst_psHash01_OBJECTS) $(tst_psHash01_DEPENDENCIES) + @rm -f tst_psHash01$(EXEEXT) + $(LINK) $(tst_psHash01_LDFLAGS) $(tst_psHash01_OBJECTS) $(tst_psHash01_LDADD) $(LIBS) +tst_psHash02$(EXEEXT): $(tst_psHash02_OBJECTS) $(tst_psHash02_DEPENDENCIES) + @rm -f tst_psHash02$(EXEEXT) + $(LINK) $(tst_psHash02_LDFLAGS) $(tst_psHash02_OBJECTS) $(tst_psHash02_LDADD) $(LIBS) +tst_psHash03$(EXEEXT): $(tst_psHash03_OBJECTS) $(tst_psHash03_DEPENDENCIES) + @rm -f tst_psHash03$(EXEEXT) + $(LINK) $(tst_psHash03_LDFLAGS) $(tst_psHash03_OBJECTS) $(tst_psHash03_LDADD) $(LIBS) +tst_psHash04$(EXEEXT): $(tst_psHash04_OBJECTS) $(tst_psHash04_DEPENDENCIES) + @rm -f tst_psHash04$(EXEEXT) + $(LINK) $(tst_psHash04_LDFLAGS) $(tst_psHash04_OBJECTS) $(tst_psHash04_LDADD) $(LIBS) +tst_psHash05$(EXEEXT): $(tst_psHash05_OBJECTS) $(tst_psHash05_DEPENDENCIES) + @rm -f tst_psHash05$(EXEEXT) + $(LINK) $(tst_psHash05_LDFLAGS) $(tst_psHash05_OBJECTS) $(tst_psHash05_LDADD) $(LIBS) +tst_psList$(EXEEXT): $(tst_psList_OBJECTS) $(tst_psList_DEPENDENCIES) + @rm -f tst_psList$(EXEEXT) + $(LINK) $(tst_psList_LDFLAGS) $(tst_psList_OBJECTS) $(tst_psList_LDADD) $(LIBS) +tst_psScalar$(EXEEXT): $(tst_psScalar_OBJECTS) $(tst_psScalar_DEPENDENCIES) + @rm -f tst_psScalar$(EXEEXT) + $(LINK) $(tst_psScalar_LDFLAGS) $(tst_psScalar_OBJECTS) $(tst_psScalar_LDADD) $(LIBS) +tst_psVector$(EXEEXT): $(tst_psVector_OBJECTS) $(tst_psVector_DEPENDENCIES) + @rm -f tst_psVector$(EXEEXT) + $(LINK) $(tst_psVector_LDFLAGS) $(tst_psVector_OBJECTS) $(tst_psVector_LDADD) $(LIBS) +tst_psVectorSort_01$(EXEEXT): $(tst_psVectorSort_01_OBJECTS) $(tst_psVectorSort_01_DEPENDENCIES) + @rm -f tst_psVectorSort_01$(EXEEXT) + $(LINK) $(tst_psVectorSort_01_LDFLAGS) $(tst_psVectorSort_01_OBJECTS) $(tst_psVectorSort_01_LDADD) $(LIBS) +tst_psVectorSort_02$(EXEEXT): $(tst_psVectorSort_02_OBJECTS) $(tst_psVectorSort_02_DEPENDENCIES) + @rm -f tst_psVectorSort_02$(EXEEXT) + $(LINK) $(tst_psVectorSort_02_LDFLAGS) $(tst_psVectorSort_02_OBJECTS) $(tst_psVectorSort_02_LDADD) $(LIBS) +tst_psVectorSort_03$(EXEEXT): $(tst_psVectorSort_03_OBJECTS) $(tst_psVectorSort_03_DEPENDENCIES) + @rm -f tst_psVectorSort_03$(EXEEXT) + $(LINK) $(tst_psVectorSort_03_LDFLAGS) $(tst_psVectorSort_03_OBJECTS) $(tst_psVectorSort_03_LDADD) $(LIBS) +tst_psVectorSort_04$(EXEEXT): $(tst_psVectorSort_04_OBJECTS) $(tst_psVectorSort_04_DEPENDENCIES) + @rm -f tst_psVectorSort_04$(EXEEXT) + $(LINK) $(tst_psVectorSort_04_LDFLAGS) $(tst_psVectorSort_04_OBJECTS) $(tst_psVectorSort_04_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +include ./$(DEPDIR)/tst_psArray.Po +include ./$(DEPDIR)/tst_psArray01.Po +include ./$(DEPDIR)/tst_psArray02.Po +include ./$(DEPDIR)/tst_psBitSet.Po +include ./$(DEPDIR)/tst_psHash00.Po +include ./$(DEPDIR)/tst_psHash01.Po +include ./$(DEPDIR)/tst_psHash02.Po +include ./$(DEPDIR)/tst_psHash03.Po +include ./$(DEPDIR)/tst_psHash04.Po +include ./$(DEPDIR)/tst_psHash05.Po +include ./$(DEPDIR)/tst_psList.Po +include ./$(DEPDIR)/tst_psScalar.Po +include ./$(DEPDIR)/tst_psVector.Po +include ./$(DEPDIR)/tst_psVectorSort_01.Po +include ./$(DEPDIR)/tst_psVectorSort_02.Po +include ./$(DEPDIR)/tst_psVectorSort_03.Po +include ./$(DEPDIR)/tst_psVectorSort_04.Po + +.c.o: + 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 \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(COMPILE) -c $< + +.c.obj: + 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 \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: + 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 \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + 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; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(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; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +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: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +check-TESTS: $(TESTS) + @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list='$(TESTS)'; \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ + elif test -f $$tst; then dir=; \ + else dir="$(srcdir)/"; fi; \ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *" $$tst "*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ + ;; \ + *) \ + echo "PASS: $$tst"; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *" $$tst "*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ + *) \ + failed=`expr $$failed + 1`; \ + echo "FAIL: $$tst"; \ + ;; \ + esac; \ + else \ + skip=`expr $$skip + 1`; \ + echo "SKIP: $$tst"; \ + fi; \ + done; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ + banner="All $$all tests passed"; \ + else \ + banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ + banner="$$failed of $$all tests failed"; \ + else \ + banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ + skipped="($$skip tests were not run)"; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ + report=""; \ + if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ + report="Please report to $(PACKAGE_BUGREPORT)"; \ + test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$report"; \ + fi; \ + dashes=`echo "$$dashes" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ + test -z "$$skipped" || echo "$$skipped"; \ + test -z "$$report" || echo "$$report"; \ + echo "$$dashes"; \ + test "$$failed" -eq 0; \ + else :; fi + +distdir: $(DISTFILES) + @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"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) + $(MAKE) $(AM_MAKEFLAGS) check-TESTS +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-libtool distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am + +.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ + clean-checkPROGRAMS 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-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-info-am + +tests: $(TESTS) +# 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. +.NOEXPORT: Index: trunk/psLib/test/collections/Makefile.am =================================================================== --- trunk/psLib/test/collections/Makefile.am (revision 3115) +++ trunk/psLib/test/collections/Makefile.am (revision 3115) @@ -0,0 +1,72 @@ +#Makefile for astronomy functions of psLib +# +INCLUDES = \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/astronomy \ + -I$(top_srcdir)/src/collections \ + -I$(top_srcdir)/src/dataManip \ + -I$(top_srcdir)/src/fileUtils \ + -I$(top_srcdir)/src/image \ + -I$(top_srcdir)/src/sysUtils \ + $(all_includes) + +AM_LDFLAGS = -L$(top_srcdir)/src `sh $(top_srcdir)/pslib-config --libs` + +check_PROGRAMS = \ + tst_psVector \ + tst_psArray \ + tst_psArray01 \ + tst_psArray02 \ + tst_psBitSet \ + tst_psVectorSort_01 \ + tst_psVectorSort_02 \ + tst_psVectorSort_03 \ + tst_psVectorSort_04 \ + tst_psList \ + tst_psHash00 \ + tst_psHash01 \ + tst_psHash02 \ + tst_psHash03 \ + tst_psHash04 \ + tst_psHash05 \ + tst_psScalar + +TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest +TESTS = \ + tst_psVector \ + tst_psArray \ + tst_psArray01 \ + tst_psArray02 \ + tst_psBitSet \ + tst_psVectorSort_01 \ + tst_psVectorSort_02 \ + tst_psVectorSort_03 \ + tst_psVectorSort_04 \ + tst_psList \ + tst_psHash00 \ + tst_psHash01 \ + tst_psHash02 \ + tst_psHash03 \ + tst_psHash04 \ + tst_psHash05 \ + tst_psScalar +tests: $(TESTS) + +tst_psVector_SOURCES = tst_psVector.c +tst_psArray_SOURCES = tst_psArray.c +tst_psArray01_SOURCES = tst_psArray01.c +tst_psArray02_SOURCES = tst_psArray02.c +tst_psBitSet_SOURCES = tst_psBitSet.c +tst_psVectorSort_01_SOURCES = tst_psVectorSort_01.c +tst_psVectorSort_02_SOURCES = tst_psVectorSort_02.c +tst_psVectorSort_03_SOURCES = tst_psVectorSort_03.c +tst_psVectorSort_04_SOURCES = tst_psVectorSort_04.c +tst_psList_SOURCES = tst_psList.c +tst_psHash00_SOURCES = tst_psHash00.c +tst_psHash01_SOURCES = tst_psHash01.c +tst_psHash02_SOURCES = tst_psHash02.c +tst_psHash03_SOURCES = tst_psHash03.c +tst_psHash04_SOURCES = tst_psHash04.c +tst_psHash05_SOURCES = tst_psHash05.c +tst_psScalar_SOURCES = tst_psScalar.c + Index: trunk/psLib/test/collections/tst_psMetadataIO.c =================================================================== --- trunk/psLib/test/collections/tst_psMetadataIO.c (revision 3112) +++ trunk/psLib/test/collections/tst_psMetadataIO.c (revision 3115) @@ -13,6 +13,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-02-02 20:20:55 $ +* @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-03 00:54:12 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -20,7 +20,7 @@ */ +#include #include "pslib.h" #include "psTest.h" -#include static void printMetadataItem(psMetadataItem *metadataItem, char *spaces); Index: trunk/psLib/test/collections/tst_psMetadata_01.c =================================================================== --- trunk/psLib/test/collections/tst_psMetadata_01.c (revision 3112) +++ trunk/psLib/test/collections/tst_psMetadata_01.c (revision 3115) @@ -18,6 +18,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-02-02 20:20:55 $ +* @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-03 00:54:12 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -25,7 +25,7 @@ */ +#include #include "pslib.h" #include "psTest.h" -#include static void printMetadataItem(psMetadataItem *metadataItem, char *spaces); Index: trunk/psLib/test/collections/tst_psMetadata_02.c =================================================================== --- trunk/psLib/test/collections/tst_psMetadata_02.c (revision 3112) +++ trunk/psLib/test/collections/tst_psMetadata_02.c (revision 3115) @@ -14,6 +14,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-12-03 23:19:07 $ +* @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-03 00:54:12 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -21,7 +21,7 @@ */ +#include #include "pslib.h" #include "psTest.h" -#include static void printMetadataItem(psMetadataItem *metadataItem) Index: trunk/psLib/test/collections/tst_psMetadata_03.c =================================================================== --- trunk/psLib/test/collections/tst_psMetadata_03.c (revision 3112) +++ trunk/psLib/test/collections/tst_psMetadata_03.c (revision 3115) @@ -18,6 +18,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-12-03 23:19:07 $ +* @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-03 00:54:12 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -25,7 +25,7 @@ */ +#include #include "pslib.h" #include "psTest.h" -#include static void printMetadataItem(psMetadataItem *metadataItem) Index: trunk/psLib/test/collections/tst_psMetadata_04.c =================================================================== --- trunk/psLib/test/collections/tst_psMetadata_04.c (revision 3112) +++ trunk/psLib/test/collections/tst_psMetadata_04.c (revision 3115) @@ -23,6 +23,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-01-13 21:19:31 $ +* @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-03 00:54:12 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -30,7 +30,7 @@ */ +#include #include "pslib.h" #include "psTest.h" -#include static void printMetadataItem(psMetadataItem *metadataItem) Index: trunk/psLib/test/collections/tst_psMetadata_05.c =================================================================== --- trunk/psLib/test/collections/tst_psMetadata_05.c (revision 3112) +++ trunk/psLib/test/collections/tst_psMetadata_05.c (revision 3115) @@ -22,6 +22,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-01-13 23:34:56 $ +* @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-03 00:54:12 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -29,7 +29,7 @@ */ +#include #include "pslib.h" #include "psTest.h" -#include static void printMetadataItem(psMetadataItem *metadataItem) Index: trunk/psLib/test/collections/tst_psMetadata_06.c =================================================================== --- trunk/psLib/test/collections/tst_psMetadata_06.c (revision 3112) +++ trunk/psLib/test/collections/tst_psMetadata_06.c (revision 3115) @@ -13,6 +13,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-12-03 23:19:07 $ +* @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-03 00:54:12 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -20,7 +20,7 @@ */ +#include #include "pslib.h" #include "psTest.h" -#include static void printMetadataItem(psMetadataItem *metadataItem) Index: trunk/psLib/test/collections/tst_psMetadata_07.c =================================================================== --- trunk/psLib/test/collections/tst_psMetadata_07.c (revision 3112) +++ trunk/psLib/test/collections/tst_psMetadata_07.c (revision 3115) @@ -9,18 +9,13 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-01-19 01:53:00 $ +* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-03 00:54:12 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii * */ +#include "config.h" #include "pslib.h" #include "psTest.h" - -#ifndef TIME_XML_FILE -#define TIME_XML_FILE "../../config/psTime.xml" -#pragma warning TIME_XML_FILE was not defined in the makefile. -#endif - int main(int argc, char* argv[]) @@ -31,5 +26,5 @@ psU32 nFail = 0; psMetadata *md = NULL; - md = psMetadataParseConfigXml(md, &nFail, TIME_XML_FILE, true); + md = psMetadataParseConfigXml(md, &nFail, XML_CONFIG_FILE, true); if (nFail != 0) { printf("psMetadataParseConfigXml returned error %d\n", res); Index: trunk/psLib/test/dataIO/Makefile =================================================================== --- trunk/psLib/test/dataIO/Makefile (revision 3112) +++ trunk/psLib/test/dataIO/Makefile (revision 3115) @@ -1,44 +1,527 @@ -################################################################################ -## -## Makefile: test/fileUtils -## -## $Revision: 1.3 $ $Name: not supported by cvs2svn $ -## $Date: 2005-01-19 01:53:00 $ -## -## Copyright 2004 Maui High Performance Computing Center, University of Hawaii -## -############################################################################### - -ifndef prefix - export prefix=$(shell cd ../..;pwd) -endif - -include ../../src/Makefile.Globals - -CFLAGS := -I../../include -DUTC_DAT_FILE="\"$(prefix)/data/tai_utc.dat\"" $(CFLAGS) -LDFLAGS := -L../../lib -lpslib -lpstest $(LDFLAGS) - -TARGET = tst_psLookupTable_01 \ +# Makefile.in generated by automake 1.9.1 from Makefile.am. +# test/fileUtils/Makefile. Generated from Makefile.in by configure. + +# 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, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + +SOURCES = $(tst_psFits_SOURCES) $(tst_psLookupTable_01_SOURCES) + +srcdir = . +top_srcdir = ../.. + +pkgdatadir = $(datadir)/pslib +pkglibdir = $(libdir)/pslib +pkgincludedir = $(includedir)/pslib +top_builddir = ../.. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = /usr/bin/install -c +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = x86_64-unknown-linux-gnu +host_triplet = x86_64-unknown-linux-gnu +check_PROGRAMS = tst_psLookupTable_01$(EXEEXT) tst_psFits$(EXEEXT) +subdir = test/fileUtils +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 = +am_tst_psFits_OBJECTS = tst_psFits.$(OBJEXT) +tst_psFits_OBJECTS = $(am_tst_psFits_OBJECTS) +tst_psFits_LDADD = $(LDADD) +am_tst_psLookupTable_01_OBJECTS = tst_psLookupTable_01.$(OBJEXT) +tst_psLookupTable_01_OBJECTS = $(am_tst_psLookupTable_01_OBJECTS) +tst_psLookupTable_01_LDADD = $(LDADD) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(tst_psFits_SOURCES) $(tst_psLookupTable_01_SOURCES) +DIST_SOURCES = $(tst_psFits_SOURCES) $(tst_psLookupTable_01_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = ${SHELL} /home/desonia/panstarrs/psLib/missing --run aclocal-1.9 +AMDEP_FALSE = # +AMDEP_TRUE = +AMTAR = ${SHELL} /home/desonia/panstarrs/psLib/missing --run tar +AR = ar +AUTOCONF = ${SHELL} /home/desonia/panstarrs/psLib/missing --run autoconf +AUTOHEADER = ${SHELL} /home/desonia/panstarrs/psLib/missing --run autoheader +AUTOMAKE = ${SHELL} /home/desonia/panstarrs/psLib/missing --run automake-1.9 +AWK = gawk +CC = gcc +CCDEPMODE = depmode=gcc3 +CFLAGS = -g -O2 -g2 -Wall -std=c99 -D_GNU_SOURCE -I/usr/include -I/usr/include/libxml2 +CONFIG_FILE = /home/desonia/panstarrs/psLib/config/psTime.config +CPP = gcc -E +CPPFLAGS = +CXX = g++ +CXXCPP = g++ -E +CXXDEPMODE = depmode=gcc3 +CXXFLAGS = -g -O2 +CYGPATH_W = echo +DEFS = -DHAVE_CONFIG_H +DEPDIR = .deps +ECHO = echo +ECHO_C = +ECHO_N = -n +ECHO_T = +EGREP = grep -E +EXEEXT = +F77 = g77 +FFLAGS = -fno-second-underscore -O -fno-f2c +GSL_CONFIG = /usr/bin/gsl-config +INSTALL_DATA = ${INSTALL} -m 644 +INSTALL_PROGRAM = ${INSTALL} +INSTALL_SCRIPT = ${INSTALL} +INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s +LDFLAGS = +LIBOBJS = +LIBS = +LIBTOOL = $(SHELL) $(top_builddir)/libtool +LN_S = ln -s +LTLIBOBJS = +MAKEINFO = ${SHELL} /home/desonia/panstarrs/psLib/missing --run makeinfo +OBJEXT = o +PACKAGE = pslib +PACKAGE_BUGREPORT = +PACKAGE_NAME = +PACKAGE_STRING = +PACKAGE_TARNAME = +PACKAGE_VERSION = +PATH_SEPARATOR = : +PERL = /usr/bin/perl +PSLIB_CFLAGS = -I${prefix}/include +PSLIB_LIBS = -L${exec_prefix}/lib -lpslib -lcfitsio -lfftw3f -L/usr/lib64 -lgsl -lgslcblas -lm -lxml2 -lz -lpthread -lm +RANLIB = ranlib +SET_MAKE = +SHELL = /bin/sh +STRIP = strip +SWIG = /usr/bin/swig +VERSION = 1.5 +XML_CONFIG = /usr/bin/xml2-config +ac_ct_AR = ar +ac_ct_CC = gcc +ac_ct_CXX = g++ +ac_ct_F77 = g77 +ac_ct_RANLIB = ranlib +ac_ct_STRIP = strip +am__fastdepCC_FALSE = # +am__fastdepCC_TRUE = +am__fastdepCXX_FALSE = # +am__fastdepCXX_TRUE = +am__include = include +am__leading_dot = . +am__quote = +am__tar = ${AMTAR} chof - "$$tardir" +am__untar = ${AMTAR} xf - +bindir = ${exec_prefix}/bin +build = x86_64-unknown-linux-gnu +build_alias = +build_cpu = x86_64 +build_os = linux-gnu +build_vendor = unknown +datadir = ${prefix}/share +exec_prefix = ${prefix} +host = x86_64-unknown-linux-gnu +host_alias = +host_cpu = x86_64 +host_os = linux-gnu +host_vendor = unknown +includedir = ${prefix}/include +infodir = ${prefix}/info +install_sh = /home/desonia/panstarrs/psLib/install-sh +libdir = ${exec_prefix}/lib +libexecdir = ${exec_prefix}/libexec +localstatedir = ${prefix}/var +mandir = ${prefix}/man +mkdir_p = mkdir -p -- +oldincludedir = /usr/include +prefix = /home/desonia/panstarrs/psLib +program_transform_name = s,x,x, +sbindir = ${exec_prefix}/sbin +sharedstatedir = ${prefix}/com +sysconfdir = ${prefix}/etc +target_alias = + +#Makefile for astronomy functions of psLib +# +INCLUDES = \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/astronomy \ + -I$(top_srcdir)/src/collections \ + -I$(top_srcdir)/src/dataManip \ + -I$(top_srcdir)/src/fileUtils \ + -I$(top_srcdir)/src/image \ + -I$(top_srcdir)/src/sysUtils \ + $(all_includes) + +AM_LDFLAGS = -L$(top_srcdir)/src `sh $(top_srcdir)/pslib-config --libs` +TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest +TESTS = \ + tst_psLookupTable_01 \ tst_psFits -OBJS = $(addprefix builddir/,$(addsuffix .o,$(TARGET))) - -all: $(TARGET) - -clean: - @echo " Deleting executable and binary files for 'test/fileUtils'" - $(RM) $(OBJS) - -distclean: clean - $(RM) $(TARGET) - -install: $(testbindir) $(testbindir)/verified $(TARGET) - install $(TARGET) $(testbindir) - install verified/*.stderr verified/*.stdout $(testbindir)/verified - -$(testbindir): - mkdir -p $(testbindir) - -$(testbindir)/verified: - mkdir -p $(testbindir)/verified - +tst_psLookupTable_01_SOURCES = tst_psLookupTable_01.c +tst_psFits_SOURCES = tst_psFits.c +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(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/fileUtils/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu test/fileUtils/Makefile +.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 + +clean-checkPROGRAMS: + @list='$(check_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done +tst_psFits$(EXEEXT): $(tst_psFits_OBJECTS) $(tst_psFits_DEPENDENCIES) + @rm -f tst_psFits$(EXEEXT) + $(LINK) $(tst_psFits_LDFLAGS) $(tst_psFits_OBJECTS) $(tst_psFits_LDADD) $(LIBS) +tst_psLookupTable_01$(EXEEXT): $(tst_psLookupTable_01_OBJECTS) $(tst_psLookupTable_01_DEPENDENCIES) + @rm -f tst_psLookupTable_01$(EXEEXT) + $(LINK) $(tst_psLookupTable_01_LDFLAGS) $(tst_psLookupTable_01_OBJECTS) $(tst_psLookupTable_01_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +include ./$(DEPDIR)/tst_psFits.Po +include ./$(DEPDIR)/tst_psLookupTable_01.Po + +.c.o: + 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 \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(COMPILE) -c $< + +.c.obj: + 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 \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: + 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 \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + 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; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(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; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +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: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +check-TESTS: $(TESTS) + @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list='$(TESTS)'; \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ + elif test -f $$tst; then dir=; \ + else dir="$(srcdir)/"; fi; \ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *" $$tst "*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ + ;; \ + *) \ + echo "PASS: $$tst"; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *" $$tst "*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ + *) \ + failed=`expr $$failed + 1`; \ + echo "FAIL: $$tst"; \ + ;; \ + esac; \ + else \ + skip=`expr $$skip + 1`; \ + echo "SKIP: $$tst"; \ + fi; \ + done; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ + banner="All $$all tests passed"; \ + else \ + banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ + banner="$$failed of $$all tests failed"; \ + else \ + banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ + skipped="($$skip tests were not run)"; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ + report=""; \ + if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ + report="Please report to $(PACKAGE_BUGREPORT)"; \ + test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$report"; \ + fi; \ + dashes=`echo "$$dashes" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ + test -z "$$skipped" || echo "$$skipped"; \ + test -z "$$report" || echo "$$report"; \ + echo "$$dashes"; \ + test "$$failed" -eq 0; \ + else :; fi + +distdir: $(DISTFILES) + @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"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) + $(MAKE) $(AM_MAKEFLAGS) check-TESTS +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-libtool distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am + +.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ + clean-checkPROGRAMS 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-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-info-am + +tests: $(TESTS) +# 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. +.NOEXPORT: Index: trunk/psLib/test/dataIO/Makefile.am =================================================================== --- trunk/psLib/test/dataIO/Makefile.am (revision 3115) +++ trunk/psLib/test/dataIO/Makefile.am (revision 3115) @@ -0,0 +1,26 @@ +#Makefile for astronomy functions of psLib +# +INCLUDES = \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/astronomy \ + -I$(top_srcdir)/src/collections \ + -I$(top_srcdir)/src/dataManip \ + -I$(top_srcdir)/src/fileUtils \ + -I$(top_srcdir)/src/image \ + -I$(top_srcdir)/src/sysUtils \ + $(all_includes) + +AM_LDFLAGS = -L$(top_srcdir)/src `sh $(top_srcdir)/pslib-config --libs` + +check_PROGRAMS = \ + tst_psLookupTable_01 \ + tst_psFits + +TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest +TESTS = \ + tst_psLookupTable_01 \ + tst_psFits +tests: $(TESTS) + +tst_psLookupTable_01_SOURCES = tst_psLookupTable_01.c +tst_psFits_SOURCES = tst_psFits.c Index: trunk/psLib/test/dataIO/tst_psFits.c =================================================================== --- trunk/psLib/test/dataIO/tst_psFits.c (revision 3112) +++ trunk/psLib/test/dataIO/tst_psFits.c (revision 3115) @@ -6,12 +6,9 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-01-18 19:35:24 $ +* @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-03 00:54:12 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii */ - -#include "psTest.h" -#include "pslib.h" #include @@ -20,4 +17,6 @@ #include +#include "psTest.h" +#include "pslib.h" #define GENIMAGE(img,c,r,TYP, valueFcn) \ Index: trunk/psLib/test/dataIO/tst_psLookupTable_01.c =================================================================== --- trunk/psLib/test/dataIO/tst_psLookupTable_01.c (revision 3112) +++ trunk/psLib/test/dataIO/tst_psLookupTable_01.c (revision 3115) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-01-19 01:53:00 $ +* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-03 00:54:12 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -19,9 +19,8 @@ */ +#include +#include "config.h" #include "pslib.h" #include "psTest.h" -#include - - int main(int argc, char* argv[]) Index: trunk/psLib/test/dataManip/Makefile =================================================================== --- trunk/psLib/test/dataManip/Makefile (revision 3112) +++ trunk/psLib/test/dataManip/Makefile (revision 3115) @@ -1,87 +1,938 @@ -################################################################################ -## -## Makefile: test/sysUtils -## -## $Revision: 1.54 $ $Name: not supported by cvs2svn $ -## $Date: 2004-12-21 23:24:49 $ -## -## Copyright 2004 Maui High Performance Computing Center, University of Hawaii -## -############################################################################### - -ifndef prefix - export prefix=$(shell cd ../..;pwd) -endif - -include ../../src/Makefile.Globals - -CFLAGS := -I../../include $(CFLAGS) -LDFLAGS := -L../../lib -lpslib -lpstest $(LDFLAGS) -TARGET = \ -tst_psFunc00 \ -tst_psFunc01 \ -tst_psFunc02 \ -tst_psFunc03 \ -tst_psFunc04 \ -tst_psFunc05 \ -tst_psFunc07 \ -tst_psHist00 \ -tst_psHist01 \ -tst_psHist02 \ -tst_psHist03 \ -tst_psMatrix01 \ -tst_psMatrix02 \ -tst_psMatrix03 \ -tst_psMatrix04 \ -tst_psMatrix05 \ -tst_psMatrix06 \ -tst_psMatrix07 \ -tst_psMatrixVectorArithmetic01 \ -tst_psMatrixVectorArithmetic02 \ -tst_psMatrixVectorArithmetic03 \ -tst_psMatrixVectorArithmetic04 \ -tst_psMinimize04 \ -tst_psMinimize04_F32 \ -tst_psMinimize04b \ -tst_psMinimize04b_F32 \ -tst_psMinimize05 \ -tst_psMinimize06 \ -tst_psMinimize07 \ -tst_psStats00 \ -tst_psStats01 \ -tst_psStats02 \ -tst_psStats03 \ -tst_psStats05 \ -tst_psStats06 \ -tst_psStats07 \ -tst_psStats08 \ -tst_psStats09 \ -tst_psRandom \ -tst_psVectorFFT -# tst_psFunc06 \ -# tst_psMinimize04b \ - -OBJS = $(addsuffix .o,$(TARGET)) - -all: $(TARGET) - -# include $(DEPENDENCIES) - -clean: - @echo " Deleting executable and binary files for 'test/collections'" - $(RM) $(OBJS) - -distclean: clean - $(RM) $(TARGET) - -install: $(testbindir) $(testbindir)/verified $(TARGET) - install $(TARGET) $(testbindir) - install verified/*.stderr verified/*.stdout $(testbindir)/verified - -$(testbindir): - mkdir -p $(testbindir) - -$(testbindir)/verified: - mkdir -p $(testbindir)/verified - - +# Makefile.in generated by automake 1.9.1 from Makefile.am. +# test/dataManip/Makefile. Generated from Makefile.in by configure. + +# 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, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + +SOURCES = $(tst_psFunc00_SOURCES) $(tst_psFunc01_SOURCES) $(tst_psFunc02_SOURCES) $(tst_psFunc03_SOURCES) $(tst_psFunc04_SOURCES) $(tst_psFunc05_SOURCES) $(tst_psFunc07_SOURCES) $(tst_psHist00_SOURCES) $(tst_psHist01_SOURCES) $(tst_psHist02_SOURCES) $(tst_psHist03_SOURCES) $(tst_psMatrix01_SOURCES) $(tst_psMatrix02_SOURCES) $(tst_psMatrix03_SOURCES) $(tst_psMatrix04_SOURCES) $(tst_psMatrix05_SOURCES) $(tst_psMatrix06_SOURCES) $(tst_psMatrix07_SOURCES) $(tst_psMatrixVectorArithmetic01_SOURCES) $(tst_psMatrixVectorArithmetic02_SOURCES) $(tst_psMatrixVectorArithmetic03_SOURCES) $(tst_psMatrixVectorArithmetic04_SOURCES) $(tst_psMinimize04_SOURCES) $(tst_psMinimize04_F32_SOURCES) $(tst_psMinimize04b_SOURCES) $(tst_psMinimize04b_F32_SOURCES) $(tst_psMinimize05_SOURCES) $(tst_psMinimize06_SOURCES) $(tst_psMinimize07_SOURCES) $(tst_psRandom_SOURCES) $(tst_psStats00_SOURCES) $(tst_psStats01_SOURCES) $(tst_psStats02_SOURCES) $(tst_psStats03_SOURCES) $(tst_psStats05_SOURCES) $(tst_psStats06_SOURCES) $(tst_psStats07_SOURCES) $(tst_psStats08_SOURCES) $(tst_psStats09_SOURCES) $(tst_psVectorFFT_SOURCES) + +srcdir = . +top_srcdir = ../.. + +pkgdatadir = $(datadir)/pslib +pkglibdir = $(libdir)/pslib +pkgincludedir = $(includedir)/pslib +top_builddir = ../.. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = /usr/bin/install -c +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = x86_64-unknown-linux-gnu +host_triplet = x86_64-unknown-linux-gnu +check_PROGRAMS = tst_psFunc00$(EXEEXT) tst_psFunc01$(EXEEXT) \ + tst_psFunc02$(EXEEXT) tst_psFunc03$(EXEEXT) \ + tst_psFunc04$(EXEEXT) tst_psFunc05$(EXEEXT) \ + tst_psFunc07$(EXEEXT) tst_psHist00$(EXEEXT) \ + tst_psHist01$(EXEEXT) tst_psHist02$(EXEEXT) \ + tst_psHist03$(EXEEXT) tst_psMatrix01$(EXEEXT) \ + tst_psMatrix02$(EXEEXT) tst_psMatrix03$(EXEEXT) \ + tst_psMatrix04$(EXEEXT) tst_psMatrix05$(EXEEXT) \ + tst_psMatrix06$(EXEEXT) tst_psMatrix07$(EXEEXT) \ + tst_psMatrixVectorArithmetic01$(EXEEXT) \ + tst_psMatrixVectorArithmetic02$(EXEEXT) \ + tst_psMatrixVectorArithmetic03$(EXEEXT) \ + tst_psMatrixVectorArithmetic04$(EXEEXT) \ + tst_psMinimize04$(EXEEXT) tst_psMinimize04_F32$(EXEEXT) \ + tst_psMinimize04b$(EXEEXT) tst_psMinimize04b_F32$(EXEEXT) \ + tst_psMinimize05$(EXEEXT) tst_psMinimize06$(EXEEXT) \ + tst_psMinimize07$(EXEEXT) tst_psStats00$(EXEEXT) \ + tst_psStats01$(EXEEXT) tst_psStats02$(EXEEXT) \ + tst_psStats03$(EXEEXT) tst_psStats05$(EXEEXT) \ + tst_psStats06$(EXEEXT) tst_psStats07$(EXEEXT) \ + tst_psStats08$(EXEEXT) tst_psStats09$(EXEEXT) \ + tst_psRandom$(EXEEXT) tst_psVectorFFT$(EXEEXT) +subdir = test/dataManip +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 = +am_tst_psFunc00_OBJECTS = tst_psFunc00.$(OBJEXT) +tst_psFunc00_OBJECTS = $(am_tst_psFunc00_OBJECTS) +tst_psFunc00_LDADD = $(LDADD) +am_tst_psFunc01_OBJECTS = tst_psFunc01.$(OBJEXT) +tst_psFunc01_OBJECTS = $(am_tst_psFunc01_OBJECTS) +tst_psFunc01_LDADD = $(LDADD) +am_tst_psFunc02_OBJECTS = tst_psFunc02.$(OBJEXT) +tst_psFunc02_OBJECTS = $(am_tst_psFunc02_OBJECTS) +tst_psFunc02_LDADD = $(LDADD) +am_tst_psFunc03_OBJECTS = tst_psFunc03.$(OBJEXT) +tst_psFunc03_OBJECTS = $(am_tst_psFunc03_OBJECTS) +tst_psFunc03_LDADD = $(LDADD) +am_tst_psFunc04_OBJECTS = tst_psFunc04.$(OBJEXT) +tst_psFunc04_OBJECTS = $(am_tst_psFunc04_OBJECTS) +tst_psFunc04_LDADD = $(LDADD) +am_tst_psFunc05_OBJECTS = tst_psFunc05.$(OBJEXT) +tst_psFunc05_OBJECTS = $(am_tst_psFunc05_OBJECTS) +tst_psFunc05_LDADD = $(LDADD) +am_tst_psFunc07_OBJECTS = tst_psFunc07.$(OBJEXT) +tst_psFunc07_OBJECTS = $(am_tst_psFunc07_OBJECTS) +tst_psFunc07_LDADD = $(LDADD) +am_tst_psHist00_OBJECTS = tst_psHist00.$(OBJEXT) +tst_psHist00_OBJECTS = $(am_tst_psHist00_OBJECTS) +tst_psHist00_LDADD = $(LDADD) +am_tst_psHist01_OBJECTS = tst_psHist01.$(OBJEXT) +tst_psHist01_OBJECTS = $(am_tst_psHist01_OBJECTS) +tst_psHist01_LDADD = $(LDADD) +am_tst_psHist02_OBJECTS = tst_psHist02.$(OBJEXT) +tst_psHist02_OBJECTS = $(am_tst_psHist02_OBJECTS) +tst_psHist02_LDADD = $(LDADD) +am_tst_psHist03_OBJECTS = tst_psHist03.$(OBJEXT) +tst_psHist03_OBJECTS = $(am_tst_psHist03_OBJECTS) +tst_psHist03_LDADD = $(LDADD) +am_tst_psMatrix01_OBJECTS = tst_psMatrix01.$(OBJEXT) +tst_psMatrix01_OBJECTS = $(am_tst_psMatrix01_OBJECTS) +tst_psMatrix01_LDADD = $(LDADD) +am_tst_psMatrix02_OBJECTS = tst_psMatrix02.$(OBJEXT) +tst_psMatrix02_OBJECTS = $(am_tst_psMatrix02_OBJECTS) +tst_psMatrix02_LDADD = $(LDADD) +am_tst_psMatrix03_OBJECTS = tst_psMatrix03.$(OBJEXT) +tst_psMatrix03_OBJECTS = $(am_tst_psMatrix03_OBJECTS) +tst_psMatrix03_LDADD = $(LDADD) +am_tst_psMatrix04_OBJECTS = tst_psMatrix04.$(OBJEXT) +tst_psMatrix04_OBJECTS = $(am_tst_psMatrix04_OBJECTS) +tst_psMatrix04_LDADD = $(LDADD) +am_tst_psMatrix05_OBJECTS = tst_psMatrix05.$(OBJEXT) +tst_psMatrix05_OBJECTS = $(am_tst_psMatrix05_OBJECTS) +tst_psMatrix05_LDADD = $(LDADD) +am_tst_psMatrix06_OBJECTS = tst_psMatrix06.$(OBJEXT) +tst_psMatrix06_OBJECTS = $(am_tst_psMatrix06_OBJECTS) +tst_psMatrix06_LDADD = $(LDADD) +am_tst_psMatrix07_OBJECTS = tst_psMatrix07.$(OBJEXT) +tst_psMatrix07_OBJECTS = $(am_tst_psMatrix07_OBJECTS) +tst_psMatrix07_LDADD = $(LDADD) +am_tst_psMatrixVectorArithmetic01_OBJECTS = \ + tst_psMatrixVectorArithmetic01.$(OBJEXT) +tst_psMatrixVectorArithmetic01_OBJECTS = \ + $(am_tst_psMatrixVectorArithmetic01_OBJECTS) +tst_psMatrixVectorArithmetic01_LDADD = $(LDADD) +am_tst_psMatrixVectorArithmetic02_OBJECTS = \ + tst_psMatrixVectorArithmetic02.$(OBJEXT) +tst_psMatrixVectorArithmetic02_OBJECTS = \ + $(am_tst_psMatrixVectorArithmetic02_OBJECTS) +tst_psMatrixVectorArithmetic02_LDADD = $(LDADD) +am_tst_psMatrixVectorArithmetic03_OBJECTS = \ + tst_psMatrixVectorArithmetic03.$(OBJEXT) +tst_psMatrixVectorArithmetic03_OBJECTS = \ + $(am_tst_psMatrixVectorArithmetic03_OBJECTS) +tst_psMatrixVectorArithmetic03_LDADD = $(LDADD) +am_tst_psMatrixVectorArithmetic04_OBJECTS = \ + tst_psMatrixVectorArithmetic04.$(OBJEXT) +tst_psMatrixVectorArithmetic04_OBJECTS = \ + $(am_tst_psMatrixVectorArithmetic04_OBJECTS) +tst_psMatrixVectorArithmetic04_LDADD = $(LDADD) +am_tst_psMinimize04_OBJECTS = tst_psMinimize04.$(OBJEXT) +tst_psMinimize04_OBJECTS = $(am_tst_psMinimize04_OBJECTS) +tst_psMinimize04_LDADD = $(LDADD) +am_tst_psMinimize04_F32_OBJECTS = tst_psMinimize04.$(OBJEXT) +tst_psMinimize04_F32_OBJECTS = $(am_tst_psMinimize04_F32_OBJECTS) +tst_psMinimize04_F32_LDADD = $(LDADD) +am_tst_psMinimize04b_OBJECTS = tst_psMinimize04b.$(OBJEXT) +tst_psMinimize04b_OBJECTS = $(am_tst_psMinimize04b_OBJECTS) +tst_psMinimize04b_LDADD = $(LDADD) +am_tst_psMinimize04b_F32_OBJECTS = tst_psMinimize04b.$(OBJEXT) +tst_psMinimize04b_F32_OBJECTS = $(am_tst_psMinimize04b_F32_OBJECTS) +tst_psMinimize04b_F32_LDADD = $(LDADD) +am_tst_psMinimize05_OBJECTS = tst_psMinimize05.$(OBJEXT) +tst_psMinimize05_OBJECTS = $(am_tst_psMinimize05_OBJECTS) +tst_psMinimize05_LDADD = $(LDADD) +am_tst_psMinimize06_OBJECTS = tst_psMinimize06.$(OBJEXT) +tst_psMinimize06_OBJECTS = $(am_tst_psMinimize06_OBJECTS) +tst_psMinimize06_LDADD = $(LDADD) +am_tst_psMinimize07_OBJECTS = tst_psMinimize07.$(OBJEXT) +tst_psMinimize07_OBJECTS = $(am_tst_psMinimize07_OBJECTS) +tst_psMinimize07_LDADD = $(LDADD) +am_tst_psRandom_OBJECTS = tst_psRandom.$(OBJEXT) +tst_psRandom_OBJECTS = $(am_tst_psRandom_OBJECTS) +tst_psRandom_LDADD = $(LDADD) +am_tst_psStats00_OBJECTS = tst_psStats00.$(OBJEXT) +tst_psStats00_OBJECTS = $(am_tst_psStats00_OBJECTS) +tst_psStats00_LDADD = $(LDADD) +am_tst_psStats01_OBJECTS = tst_psStats01.$(OBJEXT) +tst_psStats01_OBJECTS = $(am_tst_psStats01_OBJECTS) +tst_psStats01_LDADD = $(LDADD) +am_tst_psStats02_OBJECTS = tst_psStats02.$(OBJEXT) +tst_psStats02_OBJECTS = $(am_tst_psStats02_OBJECTS) +tst_psStats02_LDADD = $(LDADD) +am_tst_psStats03_OBJECTS = tst_psStats03.$(OBJEXT) +tst_psStats03_OBJECTS = $(am_tst_psStats03_OBJECTS) +tst_psStats03_LDADD = $(LDADD) +am_tst_psStats05_OBJECTS = tst_psStats05.$(OBJEXT) +tst_psStats05_OBJECTS = $(am_tst_psStats05_OBJECTS) +tst_psStats05_LDADD = $(LDADD) +am_tst_psStats06_OBJECTS = tst_psStats06.$(OBJEXT) +tst_psStats06_OBJECTS = $(am_tst_psStats06_OBJECTS) +tst_psStats06_LDADD = $(LDADD) +am_tst_psStats07_OBJECTS = tst_psStats07.$(OBJEXT) +tst_psStats07_OBJECTS = $(am_tst_psStats07_OBJECTS) +tst_psStats07_LDADD = $(LDADD) +am_tst_psStats08_OBJECTS = tst_psStats08.$(OBJEXT) +tst_psStats08_OBJECTS = $(am_tst_psStats08_OBJECTS) +tst_psStats08_LDADD = $(LDADD) +am_tst_psStats09_OBJECTS = tst_psStats09.$(OBJEXT) +tst_psStats09_OBJECTS = $(am_tst_psStats09_OBJECTS) +tst_psStats09_LDADD = $(LDADD) +am_tst_psVectorFFT_OBJECTS = tst_psVectorFFT.$(OBJEXT) +tst_psVectorFFT_OBJECTS = $(am_tst_psVectorFFT_OBJECTS) +tst_psVectorFFT_LDADD = $(LDADD) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(tst_psFunc00_SOURCES) $(tst_psFunc01_SOURCES) \ + $(tst_psFunc02_SOURCES) $(tst_psFunc03_SOURCES) \ + $(tst_psFunc04_SOURCES) $(tst_psFunc05_SOURCES) \ + $(tst_psFunc07_SOURCES) $(tst_psHist00_SOURCES) \ + $(tst_psHist01_SOURCES) $(tst_psHist02_SOURCES) \ + $(tst_psHist03_SOURCES) $(tst_psMatrix01_SOURCES) \ + $(tst_psMatrix02_SOURCES) $(tst_psMatrix03_SOURCES) \ + $(tst_psMatrix04_SOURCES) $(tst_psMatrix05_SOURCES) \ + $(tst_psMatrix06_SOURCES) $(tst_psMatrix07_SOURCES) \ + $(tst_psMatrixVectorArithmetic01_SOURCES) \ + $(tst_psMatrixVectorArithmetic02_SOURCES) \ + $(tst_psMatrixVectorArithmetic03_SOURCES) \ + $(tst_psMatrixVectorArithmetic04_SOURCES) \ + $(tst_psMinimize04_SOURCES) $(tst_psMinimize04_F32_SOURCES) \ + $(tst_psMinimize04b_SOURCES) $(tst_psMinimize04b_F32_SOURCES) \ + $(tst_psMinimize05_SOURCES) $(tst_psMinimize06_SOURCES) \ + $(tst_psMinimize07_SOURCES) $(tst_psRandom_SOURCES) \ + $(tst_psStats00_SOURCES) $(tst_psStats01_SOURCES) \ + $(tst_psStats02_SOURCES) $(tst_psStats03_SOURCES) \ + $(tst_psStats05_SOURCES) $(tst_psStats06_SOURCES) \ + $(tst_psStats07_SOURCES) $(tst_psStats08_SOURCES) \ + $(tst_psStats09_SOURCES) $(tst_psVectorFFT_SOURCES) +DIST_SOURCES = $(tst_psFunc00_SOURCES) $(tst_psFunc01_SOURCES) \ + $(tst_psFunc02_SOURCES) $(tst_psFunc03_SOURCES) \ + $(tst_psFunc04_SOURCES) $(tst_psFunc05_SOURCES) \ + $(tst_psFunc07_SOURCES) $(tst_psHist00_SOURCES) \ + $(tst_psHist01_SOURCES) $(tst_psHist02_SOURCES) \ + $(tst_psHist03_SOURCES) $(tst_psMatrix01_SOURCES) \ + $(tst_psMatrix02_SOURCES) $(tst_psMatrix03_SOURCES) \ + $(tst_psMatrix04_SOURCES) $(tst_psMatrix05_SOURCES) \ + $(tst_psMatrix06_SOURCES) $(tst_psMatrix07_SOURCES) \ + $(tst_psMatrixVectorArithmetic01_SOURCES) \ + $(tst_psMatrixVectorArithmetic02_SOURCES) \ + $(tst_psMatrixVectorArithmetic03_SOURCES) \ + $(tst_psMatrixVectorArithmetic04_SOURCES) \ + $(tst_psMinimize04_SOURCES) $(tst_psMinimize04_F32_SOURCES) \ + $(tst_psMinimize04b_SOURCES) $(tst_psMinimize04b_F32_SOURCES) \ + $(tst_psMinimize05_SOURCES) $(tst_psMinimize06_SOURCES) \ + $(tst_psMinimize07_SOURCES) $(tst_psRandom_SOURCES) \ + $(tst_psStats00_SOURCES) $(tst_psStats01_SOURCES) \ + $(tst_psStats02_SOURCES) $(tst_psStats03_SOURCES) \ + $(tst_psStats05_SOURCES) $(tst_psStats06_SOURCES) \ + $(tst_psStats07_SOURCES) $(tst_psStats08_SOURCES) \ + $(tst_psStats09_SOURCES) $(tst_psVectorFFT_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = ${SHELL} /home/desonia/panstarrs/psLib/missing --run aclocal-1.9 +AMDEP_FALSE = # +AMDEP_TRUE = +AMTAR = ${SHELL} /home/desonia/panstarrs/psLib/missing --run tar +AR = ar +AUTOCONF = ${SHELL} /home/desonia/panstarrs/psLib/missing --run autoconf +AUTOHEADER = ${SHELL} /home/desonia/panstarrs/psLib/missing --run autoheader +AUTOMAKE = ${SHELL} /home/desonia/panstarrs/psLib/missing --run automake-1.9 +AWK = gawk +CC = gcc +CCDEPMODE = depmode=gcc3 +CFLAGS = -g -O2 -g2 -Wall -std=c99 -D_GNU_SOURCE -I/usr/include -I/usr/include/libxml2 +CONFIG_FILE = /home/desonia/panstarrs/psLib/config/psTime.config +CPP = gcc -E +CPPFLAGS = +CXX = g++ +CXXCPP = g++ -E +CXXDEPMODE = depmode=gcc3 +CXXFLAGS = -g -O2 +CYGPATH_W = echo +DEFS = -DHAVE_CONFIG_H +DEPDIR = .deps +ECHO = echo +ECHO_C = +ECHO_N = -n +ECHO_T = +EGREP = grep -E +EXEEXT = +F77 = g77 +FFLAGS = -fno-second-underscore -O -fno-f2c +GSL_CONFIG = /usr/bin/gsl-config +INSTALL_DATA = ${INSTALL} -m 644 +INSTALL_PROGRAM = ${INSTALL} +INSTALL_SCRIPT = ${INSTALL} +INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s +LDFLAGS = +LIBOBJS = +LIBS = +LIBTOOL = $(SHELL) $(top_builddir)/libtool +LN_S = ln -s +LTLIBOBJS = +MAKEINFO = ${SHELL} /home/desonia/panstarrs/psLib/missing --run makeinfo +OBJEXT = o +PACKAGE = pslib +PACKAGE_BUGREPORT = +PACKAGE_NAME = +PACKAGE_STRING = +PACKAGE_TARNAME = +PACKAGE_VERSION = +PATH_SEPARATOR = : +PERL = /usr/bin/perl +PSLIB_CFLAGS = -I${prefix}/include +PSLIB_LIBS = -L${exec_prefix}/lib -lpslib -lcfitsio -lfftw3f -L/usr/lib64 -lgsl -lgslcblas -lm -lxml2 -lz -lpthread -lm +RANLIB = ranlib +SET_MAKE = +SHELL = /bin/sh +STRIP = strip +SWIG = /usr/bin/swig +VERSION = 1.5 +XML_CONFIG = /usr/bin/xml2-config +ac_ct_AR = ar +ac_ct_CC = gcc +ac_ct_CXX = g++ +ac_ct_F77 = g77 +ac_ct_RANLIB = ranlib +ac_ct_STRIP = strip +am__fastdepCC_FALSE = # +am__fastdepCC_TRUE = +am__fastdepCXX_FALSE = # +am__fastdepCXX_TRUE = +am__include = include +am__leading_dot = . +am__quote = +am__tar = ${AMTAR} chof - "$$tardir" +am__untar = ${AMTAR} xf - +bindir = ${exec_prefix}/bin +build = x86_64-unknown-linux-gnu +build_alias = +build_cpu = x86_64 +build_os = linux-gnu +build_vendor = unknown +datadir = ${prefix}/share +exec_prefix = ${prefix} +host = x86_64-unknown-linux-gnu +host_alias = +host_cpu = x86_64 +host_os = linux-gnu +host_vendor = unknown +includedir = ${prefix}/include +infodir = ${prefix}/info +install_sh = /home/desonia/panstarrs/psLib/install-sh +libdir = ${exec_prefix}/lib +libexecdir = ${exec_prefix}/libexec +localstatedir = ${prefix}/var +mandir = ${prefix}/man +mkdir_p = mkdir -p -- +oldincludedir = /usr/include +prefix = /home/desonia/panstarrs/psLib +program_transform_name = s,x,x, +sbindir = ${exec_prefix}/sbin +sharedstatedir = ${prefix}/com +sysconfdir = ${prefix}/etc +target_alias = + +#Makefile for astronomy functions of psLib +# +INCLUDES = \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/astronomy \ + -I$(top_srcdir)/src/collections \ + -I$(top_srcdir)/src/dataManip \ + -I$(top_srcdir)/src/fileUtils \ + -I$(top_srcdir)/src/image \ + -I$(top_srcdir)/src/sysUtils \ + $(all_includes) + +AM_LDFLAGS = -L$(top_srcdir)/src `sh $(top_srcdir)/pslib-config --libs` +TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest +TESTS = \ + tst_psFunc00 \ + tst_psFunc01 \ + tst_psFunc02 \ + tst_psFunc03 \ + tst_psFunc04 \ + tst_psFunc05 \ + tst_psFunc07 \ + tst_psHist00 \ + tst_psHist01 \ + tst_psHist02 \ + tst_psHist03 \ + tst_psMatrix01 \ + tst_psMatrix02 \ + tst_psMatrix03 \ + tst_psMatrix04 \ + tst_psMatrix05 \ + tst_psMatrix06 \ + tst_psMatrix07 \ + tst_psMatrixVectorArithmetic01 \ + tst_psMatrixVectorArithmetic02 \ + tst_psMatrixVectorArithmetic03 \ + tst_psMatrixVectorArithmetic04 \ + tst_psMinimize04 \ + tst_psMinimize04_F32 \ + tst_psMinimize04b \ + tst_psMinimize04b_F32 \ + tst_psMinimize05 \ + tst_psMinimize06 \ + tst_psMinimize07 \ + tst_psStats00 \ + tst_psStats01 \ + tst_psStats02 \ + tst_psStats03 \ + tst_psStats05 \ + tst_psStats06 \ + tst_psStats07 \ + tst_psStats08 \ + tst_psStats09 \ + tst_psRandom \ + tst_psVectorFFT + +tst_psFunc00_SOURCES = tst_psFunc00.c +tst_psFunc01_SOURCES = tst_psFunc01.c +tst_psFunc02_SOURCES = tst_psFunc02.c +tst_psFunc03_SOURCES = tst_psFunc03.c +tst_psFunc04_SOURCES = tst_psFunc04.c +tst_psFunc05_SOURCES = tst_psFunc05.c +tst_psFunc07_SOURCES = tst_psFunc07.c +tst_psHist00_SOURCES = tst_psHist00.c +tst_psHist01_SOURCES = tst_psHist01.c +tst_psHist02_SOURCES = tst_psHist02.c +tst_psHist03_SOURCES = tst_psHist03.c +tst_psMatrix01_SOURCES = tst_psMatrix01.c +tst_psMatrix02_SOURCES = tst_psMatrix02.c +tst_psMatrix03_SOURCES = tst_psMatrix03.c +tst_psMatrix04_SOURCES = tst_psMatrix04.c +tst_psMatrix05_SOURCES = tst_psMatrix05.c +tst_psMatrix06_SOURCES = tst_psMatrix06.c +tst_psMatrix07_SOURCES = tst_psMatrix07.c +tst_psMatrixVectorArithmetic01_SOURCES = tst_psMatrixVectorArithmetic01.c +tst_psMatrixVectorArithmetic02_SOURCES = tst_psMatrixVectorArithmetic02.c +tst_psMatrixVectorArithmetic03_SOURCES = tst_psMatrixVectorArithmetic03.c +tst_psMatrixVectorArithmetic04_SOURCES = tst_psMatrixVectorArithmetic04.c +tst_psMinimize04_SOURCES = tst_psMinimize04.c +tst_psMinimize04_F32_SOURCES = tst_psMinimize04.c +tst_psMinimize04b_SOURCES = tst_psMinimize04b.c +tst_psMinimize04b_F32_SOURCES = tst_psMinimize04b.c +tst_psMinimize05_SOURCES = tst_psMinimize05.c +tst_psMinimize06_SOURCES = tst_psMinimize06.c +tst_psMinimize07_SOURCES = tst_psMinimize07.c +tst_psStats00_SOURCES = tst_psStats00.c +tst_psStats01_SOURCES = tst_psStats01.c +tst_psStats02_SOURCES = tst_psStats02.c +tst_psStats03_SOURCES = tst_psStats03.c +tst_psStats05_SOURCES = tst_psStats05.c +tst_psStats06_SOURCES = tst_psStats06.c +tst_psStats07_SOURCES = tst_psStats07.c +tst_psStats08_SOURCES = tst_psStats08.c +tst_psStats09_SOURCES = tst_psStats09.c +tst_psRandom_SOURCES = tst_psRandom.c +tst_psVectorFFT_SOURCES = tst_psVectorFFT.c +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(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/dataManip/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu test/dataManip/Makefile +.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 + +clean-checkPROGRAMS: + @list='$(check_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done +tst_psFunc00$(EXEEXT): $(tst_psFunc00_OBJECTS) $(tst_psFunc00_DEPENDENCIES) + @rm -f tst_psFunc00$(EXEEXT) + $(LINK) $(tst_psFunc00_LDFLAGS) $(tst_psFunc00_OBJECTS) $(tst_psFunc00_LDADD) $(LIBS) +tst_psFunc01$(EXEEXT): $(tst_psFunc01_OBJECTS) $(tst_psFunc01_DEPENDENCIES) + @rm -f tst_psFunc01$(EXEEXT) + $(LINK) $(tst_psFunc01_LDFLAGS) $(tst_psFunc01_OBJECTS) $(tst_psFunc01_LDADD) $(LIBS) +tst_psFunc02$(EXEEXT): $(tst_psFunc02_OBJECTS) $(tst_psFunc02_DEPENDENCIES) + @rm -f tst_psFunc02$(EXEEXT) + $(LINK) $(tst_psFunc02_LDFLAGS) $(tst_psFunc02_OBJECTS) $(tst_psFunc02_LDADD) $(LIBS) +tst_psFunc03$(EXEEXT): $(tst_psFunc03_OBJECTS) $(tst_psFunc03_DEPENDENCIES) + @rm -f tst_psFunc03$(EXEEXT) + $(LINK) $(tst_psFunc03_LDFLAGS) $(tst_psFunc03_OBJECTS) $(tst_psFunc03_LDADD) $(LIBS) +tst_psFunc04$(EXEEXT): $(tst_psFunc04_OBJECTS) $(tst_psFunc04_DEPENDENCIES) + @rm -f tst_psFunc04$(EXEEXT) + $(LINK) $(tst_psFunc04_LDFLAGS) $(tst_psFunc04_OBJECTS) $(tst_psFunc04_LDADD) $(LIBS) +tst_psFunc05$(EXEEXT): $(tst_psFunc05_OBJECTS) $(tst_psFunc05_DEPENDENCIES) + @rm -f tst_psFunc05$(EXEEXT) + $(LINK) $(tst_psFunc05_LDFLAGS) $(tst_psFunc05_OBJECTS) $(tst_psFunc05_LDADD) $(LIBS) +tst_psFunc07$(EXEEXT): $(tst_psFunc07_OBJECTS) $(tst_psFunc07_DEPENDENCIES) + @rm -f tst_psFunc07$(EXEEXT) + $(LINK) $(tst_psFunc07_LDFLAGS) $(tst_psFunc07_OBJECTS) $(tst_psFunc07_LDADD) $(LIBS) +tst_psHist00$(EXEEXT): $(tst_psHist00_OBJECTS) $(tst_psHist00_DEPENDENCIES) + @rm -f tst_psHist00$(EXEEXT) + $(LINK) $(tst_psHist00_LDFLAGS) $(tst_psHist00_OBJECTS) $(tst_psHist00_LDADD) $(LIBS) +tst_psHist01$(EXEEXT): $(tst_psHist01_OBJECTS) $(tst_psHist01_DEPENDENCIES) + @rm -f tst_psHist01$(EXEEXT) + $(LINK) $(tst_psHist01_LDFLAGS) $(tst_psHist01_OBJECTS) $(tst_psHist01_LDADD) $(LIBS) +tst_psHist02$(EXEEXT): $(tst_psHist02_OBJECTS) $(tst_psHist02_DEPENDENCIES) + @rm -f tst_psHist02$(EXEEXT) + $(LINK) $(tst_psHist02_LDFLAGS) $(tst_psHist02_OBJECTS) $(tst_psHist02_LDADD) $(LIBS) +tst_psHist03$(EXEEXT): $(tst_psHist03_OBJECTS) $(tst_psHist03_DEPENDENCIES) + @rm -f tst_psHist03$(EXEEXT) + $(LINK) $(tst_psHist03_LDFLAGS) $(tst_psHist03_OBJECTS) $(tst_psHist03_LDADD) $(LIBS) +tst_psMatrix01$(EXEEXT): $(tst_psMatrix01_OBJECTS) $(tst_psMatrix01_DEPENDENCIES) + @rm -f tst_psMatrix01$(EXEEXT) + $(LINK) $(tst_psMatrix01_LDFLAGS) $(tst_psMatrix01_OBJECTS) $(tst_psMatrix01_LDADD) $(LIBS) +tst_psMatrix02$(EXEEXT): $(tst_psMatrix02_OBJECTS) $(tst_psMatrix02_DEPENDENCIES) + @rm -f tst_psMatrix02$(EXEEXT) + $(LINK) $(tst_psMatrix02_LDFLAGS) $(tst_psMatrix02_OBJECTS) $(tst_psMatrix02_LDADD) $(LIBS) +tst_psMatrix03$(EXEEXT): $(tst_psMatrix03_OBJECTS) $(tst_psMatrix03_DEPENDENCIES) + @rm -f tst_psMatrix03$(EXEEXT) + $(LINK) $(tst_psMatrix03_LDFLAGS) $(tst_psMatrix03_OBJECTS) $(tst_psMatrix03_LDADD) $(LIBS) +tst_psMatrix04$(EXEEXT): $(tst_psMatrix04_OBJECTS) $(tst_psMatrix04_DEPENDENCIES) + @rm -f tst_psMatrix04$(EXEEXT) + $(LINK) $(tst_psMatrix04_LDFLAGS) $(tst_psMatrix04_OBJECTS) $(tst_psMatrix04_LDADD) $(LIBS) +tst_psMatrix05$(EXEEXT): $(tst_psMatrix05_OBJECTS) $(tst_psMatrix05_DEPENDENCIES) + @rm -f tst_psMatrix05$(EXEEXT) + $(LINK) $(tst_psMatrix05_LDFLAGS) $(tst_psMatrix05_OBJECTS) $(tst_psMatrix05_LDADD) $(LIBS) +tst_psMatrix06$(EXEEXT): $(tst_psMatrix06_OBJECTS) $(tst_psMatrix06_DEPENDENCIES) + @rm -f tst_psMatrix06$(EXEEXT) + $(LINK) $(tst_psMatrix06_LDFLAGS) $(tst_psMatrix06_OBJECTS) $(tst_psMatrix06_LDADD) $(LIBS) +tst_psMatrix07$(EXEEXT): $(tst_psMatrix07_OBJECTS) $(tst_psMatrix07_DEPENDENCIES) + @rm -f tst_psMatrix07$(EXEEXT) + $(LINK) $(tst_psMatrix07_LDFLAGS) $(tst_psMatrix07_OBJECTS) $(tst_psMatrix07_LDADD) $(LIBS) +tst_psMatrixVectorArithmetic01$(EXEEXT): $(tst_psMatrixVectorArithmetic01_OBJECTS) $(tst_psMatrixVectorArithmetic01_DEPENDENCIES) + @rm -f tst_psMatrixVectorArithmetic01$(EXEEXT) + $(LINK) $(tst_psMatrixVectorArithmetic01_LDFLAGS) $(tst_psMatrixVectorArithmetic01_OBJECTS) $(tst_psMatrixVectorArithmetic01_LDADD) $(LIBS) +tst_psMatrixVectorArithmetic02$(EXEEXT): $(tst_psMatrixVectorArithmetic02_OBJECTS) $(tst_psMatrixVectorArithmetic02_DEPENDENCIES) + @rm -f tst_psMatrixVectorArithmetic02$(EXEEXT) + $(LINK) $(tst_psMatrixVectorArithmetic02_LDFLAGS) $(tst_psMatrixVectorArithmetic02_OBJECTS) $(tst_psMatrixVectorArithmetic02_LDADD) $(LIBS) +tst_psMatrixVectorArithmetic03$(EXEEXT): $(tst_psMatrixVectorArithmetic03_OBJECTS) $(tst_psMatrixVectorArithmetic03_DEPENDENCIES) + @rm -f tst_psMatrixVectorArithmetic03$(EXEEXT) + $(LINK) $(tst_psMatrixVectorArithmetic03_LDFLAGS) $(tst_psMatrixVectorArithmetic03_OBJECTS) $(tst_psMatrixVectorArithmetic03_LDADD) $(LIBS) +tst_psMatrixVectorArithmetic04$(EXEEXT): $(tst_psMatrixVectorArithmetic04_OBJECTS) $(tst_psMatrixVectorArithmetic04_DEPENDENCIES) + @rm -f tst_psMatrixVectorArithmetic04$(EXEEXT) + $(LINK) $(tst_psMatrixVectorArithmetic04_LDFLAGS) $(tst_psMatrixVectorArithmetic04_OBJECTS) $(tst_psMatrixVectorArithmetic04_LDADD) $(LIBS) +tst_psMinimize04$(EXEEXT): $(tst_psMinimize04_OBJECTS) $(tst_psMinimize04_DEPENDENCIES) + @rm -f tst_psMinimize04$(EXEEXT) + $(LINK) $(tst_psMinimize04_LDFLAGS) $(tst_psMinimize04_OBJECTS) $(tst_psMinimize04_LDADD) $(LIBS) +tst_psMinimize04_F32$(EXEEXT): $(tst_psMinimize04_F32_OBJECTS) $(tst_psMinimize04_F32_DEPENDENCIES) + @rm -f tst_psMinimize04_F32$(EXEEXT) + $(LINK) $(tst_psMinimize04_F32_LDFLAGS) $(tst_psMinimize04_F32_OBJECTS) $(tst_psMinimize04_F32_LDADD) $(LIBS) +tst_psMinimize04b$(EXEEXT): $(tst_psMinimize04b_OBJECTS) $(tst_psMinimize04b_DEPENDENCIES) + @rm -f tst_psMinimize04b$(EXEEXT) + $(LINK) $(tst_psMinimize04b_LDFLAGS) $(tst_psMinimize04b_OBJECTS) $(tst_psMinimize04b_LDADD) $(LIBS) +tst_psMinimize04b_F32$(EXEEXT): $(tst_psMinimize04b_F32_OBJECTS) $(tst_psMinimize04b_F32_DEPENDENCIES) + @rm -f tst_psMinimize04b_F32$(EXEEXT) + $(LINK) $(tst_psMinimize04b_F32_LDFLAGS) $(tst_psMinimize04b_F32_OBJECTS) $(tst_psMinimize04b_F32_LDADD) $(LIBS) +tst_psMinimize05$(EXEEXT): $(tst_psMinimize05_OBJECTS) $(tst_psMinimize05_DEPENDENCIES) + @rm -f tst_psMinimize05$(EXEEXT) + $(LINK) $(tst_psMinimize05_LDFLAGS) $(tst_psMinimize05_OBJECTS) $(tst_psMinimize05_LDADD) $(LIBS) +tst_psMinimize06$(EXEEXT): $(tst_psMinimize06_OBJECTS) $(tst_psMinimize06_DEPENDENCIES) + @rm -f tst_psMinimize06$(EXEEXT) + $(LINK) $(tst_psMinimize06_LDFLAGS) $(tst_psMinimize06_OBJECTS) $(tst_psMinimize06_LDADD) $(LIBS) +tst_psMinimize07$(EXEEXT): $(tst_psMinimize07_OBJECTS) $(tst_psMinimize07_DEPENDENCIES) + @rm -f tst_psMinimize07$(EXEEXT) + $(LINK) $(tst_psMinimize07_LDFLAGS) $(tst_psMinimize07_OBJECTS) $(tst_psMinimize07_LDADD) $(LIBS) +tst_psRandom$(EXEEXT): $(tst_psRandom_OBJECTS) $(tst_psRandom_DEPENDENCIES) + @rm -f tst_psRandom$(EXEEXT) + $(LINK) $(tst_psRandom_LDFLAGS) $(tst_psRandom_OBJECTS) $(tst_psRandom_LDADD) $(LIBS) +tst_psStats00$(EXEEXT): $(tst_psStats00_OBJECTS) $(tst_psStats00_DEPENDENCIES) + @rm -f tst_psStats00$(EXEEXT) + $(LINK) $(tst_psStats00_LDFLAGS) $(tst_psStats00_OBJECTS) $(tst_psStats00_LDADD) $(LIBS) +tst_psStats01$(EXEEXT): $(tst_psStats01_OBJECTS) $(tst_psStats01_DEPENDENCIES) + @rm -f tst_psStats01$(EXEEXT) + $(LINK) $(tst_psStats01_LDFLAGS) $(tst_psStats01_OBJECTS) $(tst_psStats01_LDADD) $(LIBS) +tst_psStats02$(EXEEXT): $(tst_psStats02_OBJECTS) $(tst_psStats02_DEPENDENCIES) + @rm -f tst_psStats02$(EXEEXT) + $(LINK) $(tst_psStats02_LDFLAGS) $(tst_psStats02_OBJECTS) $(tst_psStats02_LDADD) $(LIBS) +tst_psStats03$(EXEEXT): $(tst_psStats03_OBJECTS) $(tst_psStats03_DEPENDENCIES) + @rm -f tst_psStats03$(EXEEXT) + $(LINK) $(tst_psStats03_LDFLAGS) $(tst_psStats03_OBJECTS) $(tst_psStats03_LDADD) $(LIBS) +tst_psStats05$(EXEEXT): $(tst_psStats05_OBJECTS) $(tst_psStats05_DEPENDENCIES) + @rm -f tst_psStats05$(EXEEXT) + $(LINK) $(tst_psStats05_LDFLAGS) $(tst_psStats05_OBJECTS) $(tst_psStats05_LDADD) $(LIBS) +tst_psStats06$(EXEEXT): $(tst_psStats06_OBJECTS) $(tst_psStats06_DEPENDENCIES) + @rm -f tst_psStats06$(EXEEXT) + $(LINK) $(tst_psStats06_LDFLAGS) $(tst_psStats06_OBJECTS) $(tst_psStats06_LDADD) $(LIBS) +tst_psStats07$(EXEEXT): $(tst_psStats07_OBJECTS) $(tst_psStats07_DEPENDENCIES) + @rm -f tst_psStats07$(EXEEXT) + $(LINK) $(tst_psStats07_LDFLAGS) $(tst_psStats07_OBJECTS) $(tst_psStats07_LDADD) $(LIBS) +tst_psStats08$(EXEEXT): $(tst_psStats08_OBJECTS) $(tst_psStats08_DEPENDENCIES) + @rm -f tst_psStats08$(EXEEXT) + $(LINK) $(tst_psStats08_LDFLAGS) $(tst_psStats08_OBJECTS) $(tst_psStats08_LDADD) $(LIBS) +tst_psStats09$(EXEEXT): $(tst_psStats09_OBJECTS) $(tst_psStats09_DEPENDENCIES) + @rm -f tst_psStats09$(EXEEXT) + $(LINK) $(tst_psStats09_LDFLAGS) $(tst_psStats09_OBJECTS) $(tst_psStats09_LDADD) $(LIBS) +tst_psVectorFFT$(EXEEXT): $(tst_psVectorFFT_OBJECTS) $(tst_psVectorFFT_DEPENDENCIES) + @rm -f tst_psVectorFFT$(EXEEXT) + $(LINK) $(tst_psVectorFFT_LDFLAGS) $(tst_psVectorFFT_OBJECTS) $(tst_psVectorFFT_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +include ./$(DEPDIR)/tst_psFunc00.Po +include ./$(DEPDIR)/tst_psFunc01.Po +include ./$(DEPDIR)/tst_psFunc02.Po +include ./$(DEPDIR)/tst_psFunc03.Po +include ./$(DEPDIR)/tst_psFunc04.Po +include ./$(DEPDIR)/tst_psFunc05.Po +include ./$(DEPDIR)/tst_psFunc07.Po +include ./$(DEPDIR)/tst_psHist00.Po +include ./$(DEPDIR)/tst_psHist01.Po +include ./$(DEPDIR)/tst_psHist02.Po +include ./$(DEPDIR)/tst_psHist03.Po +include ./$(DEPDIR)/tst_psMatrix01.Po +include ./$(DEPDIR)/tst_psMatrix02.Po +include ./$(DEPDIR)/tst_psMatrix03.Po +include ./$(DEPDIR)/tst_psMatrix04.Po +include ./$(DEPDIR)/tst_psMatrix05.Po +include ./$(DEPDIR)/tst_psMatrix06.Po +include ./$(DEPDIR)/tst_psMatrix07.Po +include ./$(DEPDIR)/tst_psMatrixVectorArithmetic01.Po +include ./$(DEPDIR)/tst_psMatrixVectorArithmetic02.Po +include ./$(DEPDIR)/tst_psMatrixVectorArithmetic03.Po +include ./$(DEPDIR)/tst_psMatrixVectorArithmetic04.Po +include ./$(DEPDIR)/tst_psMinimize04.Po +include ./$(DEPDIR)/tst_psMinimize04b.Po +include ./$(DEPDIR)/tst_psMinimize05.Po +include ./$(DEPDIR)/tst_psMinimize06.Po +include ./$(DEPDIR)/tst_psMinimize07.Po +include ./$(DEPDIR)/tst_psRandom.Po +include ./$(DEPDIR)/tst_psStats00.Po +include ./$(DEPDIR)/tst_psStats01.Po +include ./$(DEPDIR)/tst_psStats02.Po +include ./$(DEPDIR)/tst_psStats03.Po +include ./$(DEPDIR)/tst_psStats05.Po +include ./$(DEPDIR)/tst_psStats06.Po +include ./$(DEPDIR)/tst_psStats07.Po +include ./$(DEPDIR)/tst_psStats08.Po +include ./$(DEPDIR)/tst_psStats09.Po +include ./$(DEPDIR)/tst_psVectorFFT.Po + +.c.o: + 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 \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(COMPILE) -c $< + +.c.obj: + 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 \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: + 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 \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + 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; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(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; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +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: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +check-TESTS: $(TESTS) + @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list='$(TESTS)'; \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ + elif test -f $$tst; then dir=; \ + else dir="$(srcdir)/"; fi; \ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *" $$tst "*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ + ;; \ + *) \ + echo "PASS: $$tst"; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *" $$tst "*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ + *) \ + failed=`expr $$failed + 1`; \ + echo "FAIL: $$tst"; \ + ;; \ + esac; \ + else \ + skip=`expr $$skip + 1`; \ + echo "SKIP: $$tst"; \ + fi; \ + done; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ + banner="All $$all tests passed"; \ + else \ + banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ + banner="$$failed of $$all tests failed"; \ + else \ + banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ + skipped="($$skip tests were not run)"; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ + report=""; \ + if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ + report="Please report to $(PACKAGE_BUGREPORT)"; \ + test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$report"; \ + fi; \ + dashes=`echo "$$dashes" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ + test -z "$$skipped" || echo "$$skipped"; \ + test -z "$$report" || echo "$$report"; \ + echo "$$dashes"; \ + test "$$failed" -eq 0; \ + else :; fi + +distdir: $(DISTFILES) + @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"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) + $(MAKE) $(AM_MAKEFLAGS) check-TESTS +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-libtool distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am + +.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ + clean-checkPROGRAMS 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-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-info-am + +tests: $(TESTS) +# 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. +.NOEXPORT: Index: trunk/psLib/test/dataManip/Makefile.am =================================================================== --- trunk/psLib/test/dataManip/Makefile.am (revision 3115) +++ trunk/psLib/test/dataManip/Makefile.am (revision 3115) @@ -0,0 +1,141 @@ +#Makefile for astronomy functions of psLib +# +INCLUDES = \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/astronomy \ + -I$(top_srcdir)/src/collections \ + -I$(top_srcdir)/src/dataManip \ + -I$(top_srcdir)/src/fileUtils \ + -I$(top_srcdir)/src/image \ + -I$(top_srcdir)/src/sysUtils \ + $(all_includes) + +AM_LDFLAGS = -L$(top_srcdir)/src `sh $(top_srcdir)/pslib-config --libs` + +check_PROGRAMS = \ + tst_psFunc00 \ + tst_psFunc01 \ + tst_psFunc02 \ + tst_psFunc03 \ + tst_psFunc04 \ + tst_psFunc05 \ + tst_psFunc07 \ + tst_psHist00 \ + tst_psHist01 \ + tst_psHist02 \ + tst_psHist03 \ + tst_psMatrix01 \ + tst_psMatrix02 \ + tst_psMatrix03 \ + tst_psMatrix04 \ + tst_psMatrix05 \ + tst_psMatrix06 \ + tst_psMatrix07 \ + tst_psMatrixVectorArithmetic01 \ + tst_psMatrixVectorArithmetic02 \ + tst_psMatrixVectorArithmetic03 \ + tst_psMatrixVectorArithmetic04 \ + tst_psMinimize04 \ + tst_psMinimize04_F32 \ + tst_psMinimize04b \ + tst_psMinimize04b_F32 \ + tst_psMinimize05 \ + tst_psMinimize06 \ + tst_psMinimize07 \ + tst_psStats00 \ + tst_psStats01 \ + tst_psStats02 \ + tst_psStats03 \ + tst_psStats05 \ + tst_psStats06 \ + tst_psStats07 \ + tst_psStats08 \ + tst_psStats09 \ + tst_psRandom \ + tst_psVectorFFT + +TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest +TESTS = \ + tst_psFunc00 \ + tst_psFunc01 \ + tst_psFunc02 \ + tst_psFunc03 \ + tst_psFunc04 \ + tst_psFunc05 \ + tst_psFunc07 \ + tst_psHist00 \ + tst_psHist01 \ + tst_psHist02 \ + tst_psHist03 \ + tst_psMatrix01 \ + tst_psMatrix02 \ + tst_psMatrix03 \ + tst_psMatrix04 \ + tst_psMatrix05 \ + tst_psMatrix06 \ + tst_psMatrix07 \ + tst_psMatrixVectorArithmetic01 \ + tst_psMatrixVectorArithmetic02 \ + tst_psMatrixVectorArithmetic03 \ + tst_psMatrixVectorArithmetic04 \ + tst_psMinimize04 \ + tst_psMinimize04_F32 \ + tst_psMinimize04b \ + tst_psMinimize04b_F32 \ + tst_psMinimize05 \ + tst_psMinimize06 \ + tst_psMinimize07 \ + tst_psStats00 \ + tst_psStats01 \ + tst_psStats02 \ + tst_psStats03 \ + tst_psStats05 \ + tst_psStats06 \ + tst_psStats07 \ + tst_psStats08 \ + tst_psStats09 \ + tst_psRandom \ + tst_psVectorFFT +tests: $(TESTS) + +tst_psFunc00_SOURCES = tst_psFunc00.c +tst_psFunc01_SOURCES = tst_psFunc01.c +tst_psFunc02_SOURCES = tst_psFunc02.c +tst_psFunc03_SOURCES = tst_psFunc03.c +tst_psFunc04_SOURCES = tst_psFunc04.c +tst_psFunc05_SOURCES = tst_psFunc05.c +tst_psFunc07_SOURCES = tst_psFunc07.c +tst_psHist00_SOURCES = tst_psHist00.c +tst_psHist01_SOURCES = tst_psHist01.c +tst_psHist02_SOURCES = tst_psHist02.c +tst_psHist03_SOURCES = tst_psHist03.c +tst_psMatrix01_SOURCES = tst_psMatrix01.c +tst_psMatrix02_SOURCES = tst_psMatrix02.c +tst_psMatrix03_SOURCES = tst_psMatrix03.c +tst_psMatrix04_SOURCES = tst_psMatrix04.c +tst_psMatrix05_SOURCES = tst_psMatrix05.c +tst_psMatrix06_SOURCES = tst_psMatrix06.c +tst_psMatrix07_SOURCES = tst_psMatrix07.c +tst_psMatrixVectorArithmetic01_SOURCES = tst_psMatrixVectorArithmetic01.c +tst_psMatrixVectorArithmetic02_SOURCES = tst_psMatrixVectorArithmetic02.c +tst_psMatrixVectorArithmetic03_SOURCES = tst_psMatrixVectorArithmetic03.c +tst_psMatrixVectorArithmetic04_SOURCES = tst_psMatrixVectorArithmetic04.c +tst_psMinimize04_SOURCES = tst_psMinimize04.c +tst_psMinimize04_F32_SOURCES = tst_psMinimize04.c +tst_psMinimize04b_SOURCES = tst_psMinimize04b.c +tst_psMinimize04b_F32_SOURCES = tst_psMinimize04b.c +tst_psMinimize05_SOURCES = tst_psMinimize05.c +tst_psMinimize06_SOURCES = tst_psMinimize06.c +tst_psMinimize07_SOURCES = tst_psMinimize07.c +tst_psStats00_SOURCES = tst_psStats00.c +tst_psStats01_SOURCES = tst_psStats01.c +tst_psStats02_SOURCES = tst_psStats02.c +tst_psStats03_SOURCES = tst_psStats03.c +tst_psStats05_SOURCES = tst_psStats05.c +tst_psStats06_SOURCES = tst_psStats06.c +tst_psStats07_SOURCES = tst_psStats07.c +tst_psStats08_SOURCES = tst_psStats08.c +tst_psStats09_SOURCES = tst_psStats09.c +tst_psRandom_SOURCES = tst_psRandom.c +tst_psVectorFFT_SOURCES = tst_psVectorFFT.c + Index: trunk/psLib/test/dataManip/verified/tst_psFunc02.stdout =================================================================== --- trunk/psLib/test/dataManip/verified/tst_psFunc02.stdout (revision 3112) +++ trunk/psLib/test/dataManip/verified/tst_psFunc02.stdout (revision 3115) @@ -5,9 +5,9 @@ \**********************************************************************************/ -psSpline1D->domains[0] is 1.000000 -psSpline1D->domains[1] is 3.250000 -psSpline1D->domains[2] is 5.500000 -psSpline1D->domains[3] is 7.750000 -psSpline1D->domains[4] is 10.000000 +psSpline1D->knots->data.F32[0] is 1.000000 +psSpline1D->knots->data.F32[1] is 3.250000 +psSpline1D->knots->data.F32[2] is 5.500000 +psSpline1D->knots->data.F32[3] is 7.750000 +psSpline1D->knots->data.F32[4] is 10.000000 ---> TESTPOINT PASSED (psFunctions functions{psSpline1DAlloc(): linear, normal} | tst_psFunc02.c) @@ -28,9 +28,9 @@ \**********************************************************************************/ -psSpline1D->domains[0] is 1.000000 -psSpline1D->domains[1] is 0.500000 -psSpline1D->domains[2] is 0.000000 -psSpline1D->domains[3] is -0.500000 -psSpline1D->domains[4] is -1.000000 +psSpline1D->knots->data.F32[0] is 1.000000 +psSpline1D->knots->data.F32[1] is 0.500000 +psSpline1D->knots->data.F32[2] is 0.000000 +psSpline1D->knots->data.F32[3] is -0.500000 +psSpline1D->knots->data.F32[4] is -1.000000 ---> TESTPOINT PASSED (psFunctions functions{psSpline1DAlloc(): linear, min > max.} | tst_psFunc02.c) @@ -42,9 +42,9 @@ \**********************************************************************************/ -psSpline1D->domains[0] is 1.000000 -psSpline1D->domains[1] is 3.250000 -psSpline1D->domains[2] is 5.500000 -psSpline1D->domains[3] is 7.750000 -psSpline1D->domains[4] is 10.000000 +psSpline1D->data.F32[0] is 1.000000 +psSpline1D->data.F32[1] is 3.250000 +psSpline1D->data.F32[2] is 5.500000 +psSpline1D->data.F32[3] is 7.750000 +psSpline1D->data.F32[4] is 10.000000 ---> TESTPOINT PASSED (psFunctions functions{psSpline1DAlloc(): cubic, normal} | tst_psFunc02.c) @@ -65,9 +65,9 @@ \**********************************************************************************/ -psSpline1D->domains[0] is 1.000000 -psSpline1D->domains[1] is 0.500000 -psSpline1D->domains[2] is 0.000000 -psSpline1D->domains[3] is -0.500000 -psSpline1D->domains[4] is -1.000000 +psSpline1D->knots->data.F32[0] is 1.000000 +psSpline1D->knots->data.F32[1] is 0.500000 +psSpline1D->knots->data.F32[2] is 0.000000 +psSpline1D->knots->data.F32[3] is -0.500000 +psSpline1D->knots->data.F32[4] is -1.000000 ---> TESTPOINT PASSED (psFunctions functions{psSpline1DAlloc(): cubic, min > max.} | tst_psFunc02.c) @@ -79,9 +79,9 @@ \**********************************************************************************/ -psSpline1D->domains[0] is 2.000000 -psSpline1D->domains[1] is 4.000000 -psSpline1D->domains[2] is 6.000000 -psSpline1D->domains[3] is 8.000000 -psSpline1D->domains[4] is 10.000000 +psSpline1D->knots->data.F32[0] is 2.000000 +psSpline1D->knots->data.F32[1] is 4.000000 +psSpline1D->knots->data.F32[2] is 6.000000 +psSpline1D->knots->data.F32[3] is 8.000000 +psSpline1D->knots->data.F32[4] is 10.000000 ---> TESTPOINT PASSED (psFunctions functions{psSpline1DAllocGeneric(): linear, normal} | tst_psFunc02.c) Index: trunk/psLib/test/dataManip/verified/tst_psMinimize04_F32.stderr =================================================================== --- trunk/psLib/test/dataManip/verified/tst_psMinimize04_F32.stderr (revision 3112) +++ trunk/psLib/test/dataManip/verified/tst_psMinimize04_F32.stderr (revision 3115) @@ -1,4 +1,4 @@