Index: trunk/psLib/src/Doxyfile =================================================================== --- trunk/psLib/src/Doxyfile (revision 3114) +++ trunk/psLib/src/Doxyfile (revision 3115) @@ -366,4 +366,5 @@ sysUtils \ image \ + fileUtils \ dataManip \ collections \ Index: trunk/psLib/src/Makefile =================================================================== --- trunk/psLib/src/Makefile (revision 3114) +++ trunk/psLib/src/Makefile (revision 3115) @@ -1,232 +1,605 @@ -############################################################################### -## -## Makefile: psLib -## -## $Revision: 1.20 $ $Name: not supported by cvs2svn $ -## $Date: 2005-01-19 01:15:21 $ -## -## Copyright 2004 Maui High Performance Computing Center, University of Hawaii -## -############################################################################### - -# Define variable prefix to the top level project - psLib -# This is necessary for definition in Makefile.Globals - -ifndef prefix - export prefix=$(shell cd ..;pwd) -endif - -# Include the make global definitions for the project - -include Makefile.Globals - -# Detect and save the CVS for this makefile - -NAME:= "$Name: not supported by cvs2svn $ " -ifeq ($(NAME), "ame: $ ") - VERSION:= ": Project Version: Unknown " -else - VERSION:= ": Project Version: $(NAME) " -endif - -# Define the target to build - -ALLTARGETS = sysUtils collections image dataManip astronomy fileUtils - -TARGET_DYNAMIC = libpslib.$(DLL) -TARGET_STATIC = libpslib.a - -# Define the installation targets - -INSTALLTARGETS = installSysUtils installCollections installImage installDataManip installAstronomy installFileUtils - -# Define the clean up targets - -CLEANTARGETS = cleanSysUtils cleanCollections cleanImage cleanDataManip cleanAstronomy cleanFileUtils - -CLEANDEPTARGETS = cleandepSysUtils cleandepCollections cleandepImage cleandepDataManip cleandepAstronomy cleandepFileUtils - -# Define the distribution clean up targets - -DISTCLEANTARGETS = distcleanSysUtils distcleanCollections distcleanImage distcleanDataManip distcleanAstronomy distcleanFileUtils - -# Define PHONY target "all" which will make all necessary items - -all: $(ALLTARGETS) - sed 's|PREFIX|$(prefix)|' $(TIME_CONFIG_FILE).template > $(TIME_CONFIG_FILE) - $(BUILD_DYNAMIC1) $(TARGET_STATIC) $(BUILD_DYNAMIC2) $(TARGET_DYNAMIC) - @echo "" - @echo " ---- All targets built successfully $(VERSION) ----" - @echo "" - -# Define PHONY target "sysUtils" which will make the system utilites -# portion of the psLib - -sysUtils: - $(MAKE) --directory=sysUtils all - -image: - $(MAKE) --directory=image all - -collections: - $(MAKE) --directory=collections all - -dataManip: - $(MAKE) --directory=dataManip all - -astronomy: - $(MAKE) --directory=astronomy all - -fileUtils: - $(MAKE) --directory=fileUtils all - -## ADD ADDITIONAL PORTIONS OF PSLIB HERE - -# Define PHONY target "installSysUtils" which will install all the necessary -# files for system utilities portion of psLib - -installSysUtils: - $(MAKE) --directory=sysUtils install - -installImage: - $(MAKE) --directory=image install - -installCollections: - $(MAKE) --directory=collections install - -installDataManip: - $(MAKE) --directory=dataManip install - -installAstronomy: - $(MAKE) --directory=astronomy install - -installFileUtils: - $(MAKE) --directory=fileUtils install - -# Define PHONY target "cleanSysUtils" which will clean up the development -# area for system utilites - -cleanSysUtils: - $(MAKE) --directory=sysUtils clean - -cleanImage: - $(MAKE) --directory=image clean - -cleanCollections: - $(MAKE) --directory=collections clean - -cleanDataManip: - $(MAKE) --directory=dataManip clean - -cleanAstronomy: - $(MAKE) --directory=astronomy clean - -cleanFileUtils: - $(MAKE) --directory=fileUtils clean - -#Define PHONY target "cleandep*" which will clean up the dependency files - -cleandepSysUtils: - $(MAKE) --directory=sysUtils cleandep - -cleandepImage: - $(MAKE) --directory=image cleandep - -cleandepCollections: - $(MAKE) --directory=collections cleandep - -cleandepDataManip: - $(MAKE) --directory=dataManip cleandep - -cleandepAstronomy: - $(MAKE) --directory=astronomy cleandep - -cleandepFileUtils: - $(MAKE) --directory=fileUtils cleandep - -# Define PHONY target "distcleanSysUtils which will clean up the distribution -# files related to system utilities - -distcleanSysUtils: - $(MAKE) --directory=sysUtils distclean - -distcleanImage: - $(MAKE) --directory=image distclean - -distcleanCollections: - $(MAKE) --directory=collections distclean - -distcleanDataManip: - $(MAKE) --directory=dataManip distclean - -distcleanAstronomy: - $(MAKE) --directory=astronomy distclean - -distcleanFileUtils: - $(MAKE) --directory=fileUtils distclean - - -# Rule to make include directory if needed - -$(includedir): - mkdir -p $(includedir) - -# Rule to make bin directory if needed - -$(bindir): - mkdir -p $(bindir) - -# Rule to make lib directory if needed - -$(libexecdir): - mkdir -p $(libexecdir) - -# Rule to make man directory if needed - -$(mandir): - mkdir -p $(mandir) - -$(mandir)/man3: $(mandir) - mkdir -p $(mandir)/man3 - -# Rule to make the installation directories if needed - -installdirs: $(includedir) $(bindir) $(libexecdir) $(mandir) - -# Define PHONY target "install" to make the necessary directories for -# the installation - -install: all installdirs $(INSTALLTARGETS) - install *.h $(includedir) - install $(TARGET_STATIC) $(libexecdir) - install $(TARGET_DYNAMIC) $(libexecdir) - install $(TARGET_DYNAMIC) $(libexecdir) - -# Define PHONY target "clean" to clean up the development areas for -# psLib - -clean: $(CLEANTARGETS) - $(RM) -f $(TARGET_STATIC) - $(RM) -f $(TARGET_DYNAMIC) - -cleandep: $(CLEANDEPTARGETS) - -# Define PHONY target "distclean" to clean up the distribution area for -# psLib - -distclean: $(DISTCLEANTARGETS) - $(RM) -f $(libexecdir)/$(TARGET_STATIC) - $(RM) -f $(libexecdir)/$(TARGET_DYNAMIC) - $(RM) -f $(TARGET_DYNAMIC) - $(RM) -f $(TARGET_STATIC) - -# Define PHONY target "docs" to generate the Doxygen files for psLib - -docs: - $(DOCS) - -tags: - etags `find . \( -name \*.[chy] \) -print` - -# List of PHONY targets with make file -.PHONY: sysUtils collections image dataManip astronomy fileUtils +# Makefile.in generated by automake 1.9.1 from Makefile.am. +# src/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 = $(libpslib_la_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 +subdir = src +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/config.h.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = config.h +CONFIG_CLEAN_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(libdir)" +libLTLIBRARIES_INSTALL = $(INSTALL) +LTLIBRARIES = $(lib_LTLIBRARIES) +libpslib_la_DEPENDENCIES = \ + $(top_builddir)/src/astronomy/libpslibastronomy.la \ + $(top_builddir)/src/collections/libpslibcollections.la \ + $(top_builddir)/src/dataManip/libpslibdataManip.la \ + $(top_builddir)/src/fileUtils/libpslibfileUtils.la \ + $(top_builddir)/src/image/libpslibimage.la \ + $(top_builddir)/src/sysUtils/libpslibsysUtils.la +am_libpslib_la_OBJECTS = psTest.lo +libpslib_la_OBJECTS = $(am_libpslib_la_OBJECTS) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I. +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 = $(libpslib_la_SOURCES) +DIST_SOURCES = $(libpslib_la_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 swig +INCLUDES = \ + -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) + +lib_LTLIBRARIES = libpslib.la +libpslib_la_LIBADD = \ + $(top_builddir)/src/astronomy/libpslibastronomy.la \ + $(top_builddir)/src/collections/libpslibcollections.la \ + $(top_builddir)/src/dataManip/libpslibdataManip.la \ + $(top_builddir)/src/fileUtils/libpslibfileUtils.la \ + $(top_builddir)/src/image/libpslibimage.la \ + $(top_builddir)/src/sysUtils/libpslibsysUtils.la + +libpslib_la_SOURCES = psTest.c +EXTRA_DIST = parseErrorCodes.pl mainpage.dox Doxyfile psErrorCodes.dat psTest.h +all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + +.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) --foreign src/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/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 + +config.h: stamp-h1 + @if test ! -f $@; then \ + rm -f stamp-h1; \ + $(MAKE) stamp-h1; \ + else :; fi + +stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status src/config.h +$(srcdir)/config.h.in: $(am__configure_deps) + cd $(top_srcdir) && $(AUTOHEADER) + rm -f stamp-h1 + touch $@ + +distclean-hdr: + -rm -f config.h stamp-h1 +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ + echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + else :; fi; \ + done + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + done + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libpslib.la: $(libpslib_la_OBJECTS) $(libpslib_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libpslib_la_LDFLAGS) $(libpslib_la_OBJECTS) $(libpslib_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +include ./$(DEPDIR)/psTest.Plo + +.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: + +# 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) config.h.in $(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) config.h.in $(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) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) config.h.in $(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 $(LTLIBRARIES) config.h +installdirs: installdirs-recursive +installdirs-am: + for dir in "$(DESTDIR)$(libdir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done +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-libLTLIBRARIES clean-libtool \ + mostlyclean-am + +distclean: distclean-recursive + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-hdr distclean-libtool distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +info: info-recursive + +info-am: + +install-data-am: + +install-exec-am: install-libLTLIBRARIES + +install-info: install-info-recursive + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES + +uninstall-info: uninstall-info-recursive + +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ + clean clean-generic clean-libLTLIBRARIES clean-libtool \ + clean-recursive ctags ctags-recursive distclean \ + distclean-compile distclean-generic distclean-hdr \ + 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-libLTLIBRARIES \ + install-man install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am uninstall-info-am \ + uninstall-libLTLIBRARIES + +# 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/src/Makefile.Globals =================================================================== --- trunk/psLib/src/Makefile.Globals (revision 3114) +++ trunk/psLib/src/Makefile.Globals (revision 3115) @@ -6,6 +6,6 @@ ## Assumptions: Variable "prefix" already defined ## -## $Revision: 1.39 $ $Name: not supported by cvs2svn $ -## $Date: 2005-01-19 01:53:09 $ +## $Revision: 1.40 $ $Name: not supported by cvs2svn $ +## $Date: 2005-02-03 00:54:10 $ ## ## Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -50,5 +50,5 @@ ifndef PS_LIB_VERSION - export PS_LIB_VERSION = rel4 + export PS_LIB_VERSION = post_rel4 endif @@ -61,4 +61,8 @@ endif +ifndef PERL_CORE + export PERL_CORE = `find /usr/lib -name CORE 2> /dev/null | tail -n 1` +endif + SLA_LINK := $(shell $(sladir)/bin/sla_link) XML2_LINK := $(shell $(xml2config) --libs) @@ -69,4 +73,5 @@ GCOVFLAGS := CFLAGS := -O0 -g2 -Wall -Werror -std=c99 -D_GNU_SOURCE -pipe $(GCOVFLAGS) $(XML2_CFLAGS) +SWIG_CFLAGS := -std=c99 -D_GNU_SOURCE -pipe $(GCOVFLAGS) $(XML2_CFLAGS) ifdef NO_TRACE Index: trunk/psLib/src/Makefile.am =================================================================== --- trunk/psLib/src/Makefile.am (revision 3115) +++ trunk/psLib/src/Makefile.am (revision 3115) @@ -0,0 +1,28 @@ +# 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 swig + +INCLUDES = \ + -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) + +lib_LTLIBRARIES = libpslib.la + +libpslib_la_LIBADD = \ + $(top_builddir)/src/astronomy/libpslibastronomy.la \ + $(top_builddir)/src/collections/libpslibcollections.la \ + $(top_builddir)/src/dataManip/libpslibdataManip.la \ + $(top_builddir)/src/fileUtils/libpslibfileUtils.la \ + $(top_builddir)/src/image/libpslibimage.la \ + $(top_builddir)/src/sysUtils/libpslibsysUtils.la + +libpslib_la_SOURCES = psTest.c + +EXTRA_DIST = parseErrorCodes.pl mainpage.dox Doxyfile psErrorCodes.dat psTest.h Index: trunk/psLib/src/astronomy/Makefile =================================================================== --- trunk/psLib/src/astronomy/Makefile (revision 3114) +++ trunk/psLib/src/astronomy/Makefile (revision 3115) @@ -1,65 +1,520 @@ -ifndef prefix - export prefix=$(shell cd ../..;pwd) -endif - -TARGET_STATIC = libpslib.a -include ../Makefile.Globals - -CFLAGS := $(CFLAGS_RELOC) -I. -I../sysUtils -I../collections -I../dataManip \ - -I.. -I../image -I../fileUtils \ - -DTIME_CONFIG_FILE="\"$(TIME_CONFIG_FILE)\"" - -SRC_OBJS = psTime.o \ - psMetadata.o \ - psMetadataIO.o \ - psCoord.o \ - psAstrometry.o - -OBJS = $(addprefix makedir/,$(SRC_OBJS)) - -HEADERS = $(SRC_OBJS:.o=.h) psPhotometry.h slalib.h - -all: $(TARGET_STATIC) +# Makefile.in generated by automake 1.9.1 from Makefile.am. +# src/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 = $(libpslibastronomy_la_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 +subdir = src/astronomy +DIST_COMMON = $(pslibinclude_HEADERS) $(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 = +LTLIBRARIES = $(noinst_LTLIBRARIES) +libpslibastronomy_la_LIBADD = +am_libpslibastronomy_la_OBJECTS = psTime.lo psMetadata.lo \ + psMetadataIO.lo psCoord.lo psAstrometry.lo aoppa.lo aopqk.lo \ + oapqk.lo airmas.lo eqeqx.lo geoc.lo refco.lo aoppat.lo \ + dranrm.lo dcs2c.lo refz.lo refro.lo dcc2s.lo gmst.lo atms.lo \ + atmt.lo nutc.lo drange.lo +libpslibastronomy_la_OBJECTS = $(am_libpslibastronomy_la_OBJECTS) +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 $@ +F77COMPILE = $(F77) $(AM_FFLAGS) $(FFLAGS) +LTF77COMPILE = $(LIBTOOL) --mode=compile --tag=F77 $(F77) $(AM_FFLAGS) \ + $(FFLAGS) +F77LD = $(F77) +F77LINK = $(LIBTOOL) --mode=link --tag=F77 $(F77LD) $(AM_FFLAGS) \ + $(FFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(libpslibastronomy_la_SOURCES) +DIST_SOURCES = $(libpslibastronomy_la_SOURCES) +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(pslibincludedir)" +pslibincludeHEADERS_INSTALL = $(INSTALL_HEADER) +HEADERS = $(pslibinclude_HEADERS) +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/collections \ + -I$(top_srcdir)/src/dataManip \ + -I$(top_srcdir)/src/fileUtils \ + -I$(top_srcdir)/src/image \ + -I$(top_srcdir)/src/sysUtils \ + $(all_includes) + +noinst_LTLIBRARIES = libpslibastronomy.la +libpslibastronomy_la_SOURCES = \ + psTime.c \ + psMetadata.c \ + psMetadataIO.c \ + psCoord.c \ + psAstrometry.c \ + aoppa.f aopqk.f oapqk.f airmas.f eqeqx.f geoc.f refco.f aoppat.f \ + dranrm.f dcs2c.f refz.f refro.f dcc2s.f gmst.f atms.f atmt.f nutc.f drange.f + +BUILT_SOURCES = psAstronomyErrors.h +EXTRA_DIST = psAstronomyErrors.dat psAstronomyErrors.h +pslibincludedir = $(includedir)/pslib +pslibinclude_HEADERS = \ + psTime.h \ + psMetadata.h \ + psMetadataIO.h \ + psCoord.h \ + psAstrometry.h \ + psPhotometry.h \ + slalib.h + +all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + +.SUFFIXES: +.SUFFIXES: .c .f .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 src/astronomy/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/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-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libpslibastronomy.la: $(libpslibastronomy_la_OBJECTS) $(libpslibastronomy_la_DEPENDENCIES) + $(F77LINK) $(libpslibastronomy_la_LDFLAGS) $(libpslibastronomy_la_OBJECTS) $(libpslibastronomy_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +include ./$(DEPDIR)/psAstrometry.Plo +include ./$(DEPDIR)/psCoord.Plo +include ./$(DEPDIR)/psMetadata.Plo +include ./$(DEPDIR)/psMetadataIO.Plo +include ./$(DEPDIR)/psTime.Plo + +.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 $@ $< + +.f.o: + $(F77COMPILE) -c -o $@ $< + +.f.obj: + $(F77COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.f.lo: + $(LTF77COMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: +install-pslibincludeHEADERS: $(pslibinclude_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(pslibincludedir)" || $(mkdir_p) "$(DESTDIR)$(pslibincludedir)" + @list='$(pslibinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(pslibincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pslibincludedir)/$$f'"; \ + $(pslibincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pslibincludedir)/$$f"; \ + done + +uninstall-pslibincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(pslibinclude_HEADERS)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(pslibincludedir)/$$f'"; \ + rm -f "$(DESTDIR)$(pslibincludedir)/$$f"; \ + 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: $(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 + +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 +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am +all-am: Makefile $(LTLIBRARIES) $(HEADERS) +installdirs: + for dir in "$(DESTDIR)$(pslibincludedir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done +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-generic clean-libtool clean-noinstLTLIBRARIES \ + 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-pslibincludeHEADERS + +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 uninstall-pslibincludeHEADERS + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES 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-pslibincludeHEADERS 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 \ + uninstall-pslibincludeHEADERS + psAstronomyErrors.h: psAstronomyErrors.dat - perl ../parseErrorCodes.pl --data=$? $@ - - -# Rule to make static library - -libpslib.a: $(OBJS) -# The ar option -r is to add/replace object and -s is to create -# a symbol table in the archive - $(AR) rcs ../$@ $(OBJS) - -# Define PHONY target "install" which will install necessary files -install: $(TARGET_STATIC) - install $(HEADERS) $(includedir) - -# Define PHONY target "distclean" which will cleanup the distribution -distclean: clean - $(RM) ../$(TARGET_STATIC) - -# Define PHONY target "clean" which will cleanup the development area -clean: - @echo " Deleting intermediate files for 'astronomy'" - $(RM) $(OBJS) *.lint $(SRC_OBJS:.o=.i) - -cleandep: - $(RM) $(OBJS:.o=.d) - -%.lint: %.c - splint +posixlib -exportlocal -realcompare $(INCLUDE_GLOBAL) $? > $@; cat $@ - -%.i: %.c - $(CC) -E $(CFLAGS) -o $@ $< - -makedir/%.o: %.c - $(CC) -c $(CFLAGS) -o $@ $< - -makedir/%.d: %.c - $(CC) -MM $(CFLAGS) $< > $@.tmp - sed 's|\($*\)\.o[ :]*|\1.o $@ : |g' $@.tmp | sed 's|[A-Za-z0-9\/\.]*libxml[A-Za-z0-9\/\.]*||g' > $@ - $(RM) -f $@.tmp - -include $(OBJS:.o=.d) + perl $(top_srcdir)/src/parseErrorCodes.pl --data=$? $@ +# 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/src/collections/Makefile =================================================================== --- trunk/psLib/src/collections/Makefile (revision 3114) +++ trunk/psLib/src/collections/Makefile (revision 3115) @@ -1,92 +1,504 @@ -############################################################################### -## -## Makefile: collections -## -## $Revision: 1.31 $ $Name: not supported by cvs2svn $ -## $Date: 2004-09-11 00:43:54 $ -## -## 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 = libpslib.a - -# Include the make global definitions for the project - -include ../Makefile.Globals - -# Set CFLAGS used by the implicit rule to compile .c - -CFLAGS := $(CFLAGS_RELOC) -I../sysUtils -I.. - -# Define the source objects - -SRC_OBJS = psBitSet.o \ - psVector.o \ - psList.o \ - psScalar.o \ - psCompare.o \ - psArray.o \ - psHash.o - -OBJS = $(addprefix makedir/,$(SRC_OBJS)) - -HEADERS = $(SRC_OBJS:.o=.h) - - -# Define PHONY target "all" which will make all the necessary items - -all: $(TARGET_STATIC) - -psCollectionsErrors.h: psCollectionsErrors.dat - perl ../parseErrorCodes.pl --data=$? $@ - -# Rule to make static library - -libpslib.a: $(OBJS) -# The ar option -r is to add/replace object and -s is to create -# a symbol table in the archive - $(AR) rcs ../$@ $(OBJS) - -# Define PHONY target "install" which will install necessary files - -install: $(TARGET_STATIC) - install $(HEADERS) $(includedir) - -# Define PHONY target "distclean" which will cleanup the distribution - -distclean: clean - $(RM) ../$(TARGET_STATIC) - -# Define PHONY target "clean" which will cleanup the development area - -clean: - @echo " Deleting intermediate files for 'collections'" - $(RM) $(OBJS) *.lint $(SRC_OBJS:.o=.i) - -cleandep: - $(RM) $(OBJS:.o=.d) - -%.lint: %.c - splint +posixlib -exportlocal -realcompare $(INCLUDE_GLOBAL) $? > $@; cat $@ - -%.i: %.c - $(CC) -E $(CFLAGS) -o $@ $< - -makedir/%.o: %.c - $(CC) -c $(CFLAGS) -o $@ $< - -makedir/%.d: %.c - $(CC) -MM $(CFLAGS) $< > $@.tmp - sed 's|\($*\)\.o[ :]*|\1.o $@ : |g' $@.tmp > $@ - $(RM) -f $@.tmp - -include $(OBJS:.o=.d) +# Makefile.in generated by automake 1.9.1 from Makefile.am. +# src/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 = $(libpslibcollections_la_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 +subdir = src/collections +DIST_COMMON = $(pslibinclude_HEADERS) $(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 = +LTLIBRARIES = $(noinst_LTLIBRARIES) +libpslibcollections_la_LIBADD = +am_libpslibcollections_la_OBJECTS = psBitSet.lo psVector.lo psList.lo \ + psScalar.lo psCompare.lo psArray.lo psHash.lo +libpslibcollections_la_OBJECTS = $(am_libpslibcollections_la_OBJECTS) +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 = $(libpslibcollections_la_SOURCES) +DIST_SOURCES = $(libpslibcollections_la_SOURCES) +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(pslibincludedir)" +pslibincludeHEADERS_INSTALL = $(INSTALL_HEADER) +HEADERS = $(pslibinclude_HEADERS) +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 collections functions of psLib +# +INCLUDES = \ + -I$(top_srcdir)/src/astronomy \ + -I$(top_srcdir)/src/dataManip \ + -I$(top_srcdir)/src/fileUtils \ + -I$(top_srcdir)/src/image \ + -I$(top_srcdir)/src/sysUtils \ + $(all_includes) + +noinst_LTLIBRARIES = libpslibcollections.la +libpslibcollections_la_SOURCES = \ + psBitSet.c \ + psVector.c \ + psList.c \ + psScalar.c \ + psCompare.c \ + psArray.c \ + psHash.c + +BUILT_SOURCES = psCollectionsErrors.h +EXTRA_DIST = psCollectionsErrors.dat psCollectionsErrors.h +pslibincludedir = $(includedir)/pslib +pslibinclude_HEADERS = \ + psBitSet.h \ + psVector.h \ + psList.h \ + psScalar.h \ + psCompare.h \ + psArray.h \ + psHash.h + +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 src/collections/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/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-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libpslibcollections.la: $(libpslibcollections_la_OBJECTS) $(libpslibcollections_la_DEPENDENCIES) + $(LINK) $(libpslibcollections_la_LDFLAGS) $(libpslibcollections_la_OBJECTS) $(libpslibcollections_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +include ./$(DEPDIR)/psArray.Plo +include ./$(DEPDIR)/psBitSet.Plo +include ./$(DEPDIR)/psCompare.Plo +include ./$(DEPDIR)/psHash.Plo +include ./$(DEPDIR)/psList.Plo +include ./$(DEPDIR)/psScalar.Plo +include ./$(DEPDIR)/psVector.Plo + +.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: +install-pslibincludeHEADERS: $(pslibinclude_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(pslibincludedir)" || $(mkdir_p) "$(DESTDIR)$(pslibincludedir)" + @list='$(pslibinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(pslibincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pslibincludedir)/$$f'"; \ + $(pslibincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pslibincludedir)/$$f"; \ + done + +uninstall-pslibincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(pslibinclude_HEADERS)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(pslibincludedir)/$$f'"; \ + rm -f "$(DESTDIR)$(pslibincludedir)/$$f"; \ + 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: $(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 + +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 +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am +all-am: Makefile $(LTLIBRARIES) $(HEADERS) +installdirs: + for dir in "$(DESTDIR)$(pslibincludedir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done +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-generic clean-libtool clean-noinstLTLIBRARIES \ + 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-pslibincludeHEADERS + +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 uninstall-pslibincludeHEADERS + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES 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-pslibincludeHEADERS 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 \ + uninstall-pslibincludeHEADERS + + +psCollectionsErrors.h:psCollectionsErrors.dat + perl $(top_srcdir)/src/parseErrorCodes.pl --data=$? $@ +# 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/src/collections/Makefile.am =================================================================== --- trunk/psLib/src/collections/Makefile.am (revision 3115) +++ trunk/psLib/src/collections/Makefile.am (revision 3115) @@ -0,0 +1,37 @@ +#Makefile for collections functions of psLib +# +INCLUDES = \ + -I$(top_srcdir)/src/astronomy \ + -I$(top_srcdir)/src/dataManip \ + -I$(top_srcdir)/src/fileUtils \ + -I$(top_srcdir)/src/image \ + -I$(top_srcdir)/src/sysUtils \ + $(all_includes) + +noinst_LTLIBRARIES = libpslibcollections.la + +libpslibcollections_la_SOURCES = \ + psBitSet.c \ + psVector.c \ + psList.c \ + psScalar.c \ + psCompare.c \ + psArray.c \ + psHash.c + +BUILT_SOURCES = psCollectionsErrors.h +EXTRA_DIST = psCollectionsErrors.dat psCollectionsErrors.h + +psCollectionsErrors.h:psCollectionsErrors.dat + perl $(top_srcdir)/src/parseErrorCodes.pl --data=$? $@ + +pslibincludedir = $(includedir)/pslib +pslibinclude_HEADERS = \ + psBitSet.h \ + psVector.h \ + psList.h \ + psScalar.h \ + psCompare.h \ + psArray.h \ + psHash.h + Index: trunk/psLib/src/collections/psArray.c =================================================================== --- trunk/psLib/src/collections/psArray.c (revision 3114) +++ trunk/psLib/src/collections/psArray.c (revision 3115) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.22 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-12-30 20:18:36 $ + * @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:10 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -33,7 +33,7 @@ FUNCTION IMPLEMENTATION - LOCAL *****************************************************************************/ -static void arrayFree(psArray* restrict psArr); +static void arrayFree(psArray* psArr); -static void arrayFree(psArray* restrict psArr) +static void arrayFree(psArray* psArr) { if (psArr == NULL) { @@ -66,5 +66,5 @@ } -psArray* psArrayRealloc(psArray* restrict in, psU32 nalloc) +psArray* psArrayRealloc(psArray* in, psU32 nalloc) { if (in == NULL) { @@ -134,5 +134,5 @@ } -void psArrayElementFree(psArray* restrict psArr) +void psArrayElementFree(psArray* psArr) { Index: trunk/psLib/src/collections/psArray.h =================================================================== --- trunk/psLib/src/collections/psArray.h (revision 3114) +++ trunk/psLib/src/collections/psArray.h (revision 3115) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-12-23 01:14:52 $ + * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:10 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -55,5 +55,5 @@ */ psArray* psArrayAlloc( - psU32 nalloc ///< Total number of elements to make available. + psU32 nalloc ///< Total number of elements to make available. ); @@ -67,5 +67,5 @@ */ psArray* psArrayRealloc( - psArray* restrict psArr, ///< array to reallocate. + psArray* psArr, ///< array to reallocate. psU32 nalloc ///< Total number of elements to make available. ); @@ -104,5 +104,5 @@ */ void psArrayElementFree( - psArray* restrict psArr ///< Void pointer array to destroy. + psArray* psArr ///< Void pointer array to destroy. ); Index: trunk/psLib/src/collections/psBitSet.c =================================================================== --- trunk/psLib/src/collections/psBitSet.c (revision 3114) +++ trunk/psLib/src/collections/psBitSet.c (revision 3115) @@ -11,6 +11,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-11-04 01:04:57 $ + * @version $Revision: 1.21 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:10 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -38,5 +38,5 @@ }; -static void bitSetFree(psBitSet* restrict inBitSet); +static void bitSetFree(psBitSet* inBitSet); /** Private function to create a mask. @@ -58,5 +58,5 @@ } -static void bitSetFree(psBitSet* restrict inBitSet) +static void bitSetFree(psBitSet* inBitSet) { if (inBitSet == NULL) { @@ -161,7 +161,7 @@ psBitSet* psBitSetOp(psBitSet* outBitSet, - const psBitSet* restrict inBitSet1, + const psBitSet* inBitSet1, char *operator, - const psBitSet* restrict inBitSet2) + const psBitSet* inBitSet2) { psS32 i = 0; @@ -264,5 +264,5 @@ break; default: - psAbort(PS_ERRORNAME_DOMAIN "psBitSetOp", + psAbort("psBitSetOp", "Unexpected error - operator parsed successfully but not valid?"); } @@ -272,5 +272,5 @@ psBitSet* psBitSetNot(psBitSet* outBitSet, - const psBitSet* restrict inBitSet) + const psBitSet* inBitSet) { if (inBitSet == NULL) { @@ -291,5 +291,5 @@ } -char *psBitSetToString(const psBitSet* restrict inBitSet) +char *psBitSetToString(const psBitSet* inBitSet) { psS32 i = 0; Index: trunk/psLib/src/collections/psBitSet.h =================================================================== --- trunk/psLib/src/collections/psBitSet.h (revision 3114) +++ trunk/psLib/src/collections/psBitSet.h (revision 3115) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-27 00:57:31 $ + * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:10 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -56,5 +56,5 @@ /*@null@*/ psBitSet* psBitSetAlloc( - psS32 n ///< Number of bits in psBitSet array + psS32 n ///< Number of bits in psBitSet array ); @@ -69,6 +69,6 @@ psBitSet* psBitSetSet( /* @returned@ */ - psBitSet* restrict inMask, ///< Pointer to psBitSet to be set. - psS32 bit ///< Bit to be set. + psBitSet* inMask, ///< Pointer to psBitSet to be set. + psS32 bit ///< Bit to be set. ); @@ -83,6 +83,6 @@ psBitSet* psBitSetClear( /* @returned@ */ - psBitSet* restrict inMask, ///< Pointer to psBitSet to be cleared. - psS32 bit ///< Bit to be cleared. + psBitSet* inMask, ///< Pointer to psBitSet to be cleared. + psS32 bit ///< Bit to be cleared. ); @@ -98,6 +98,6 @@ psBool psBitSetTest( - const psBitSet* restrict inMask, ///< Pointer psBitSet to be tested. - psS32 bit ///< Bit to be tested. + const psBitSet* inMask, ///< Pointer psBitSet to be tested. + psS32 bit ///< Bit to be tested. ); @@ -111,8 +111,8 @@ psBitSet* psBitSetOp( /* @returned@ */ - psBitSet* restrict outMask, ///< Resulting psBitSet from binary operation - const psBitSet* restrict inMask1, ///< First psBitSet on which to operate + psBitSet* outMask, ///< Resulting psBitSet from binary operation + const psBitSet* inMask1, ///< First psBitSet on which to operate char *operator, ///< Bit operation - const psBitSet* restrict inMask2 ///< First psBitSet on which to operate + const psBitSet* inMask2 ///< First psBitSet on which to operate ); @@ -126,5 +126,5 @@ psBitSet* psBitSetNot( psBitSet* outBitSet, ///< Resulting psBitSet from operation - const psBitSet* restrict inBitSet ///< Input psBitSet + const psBitSet* inBitSet ///< Input psBitSet ); @@ -138,5 +138,5 @@ char *psBitSetToString( - const psBitSet* restrict inMask ///< psBitSet to convert */ + const psBitSet* inMask ///< psBitSet to convert */ ); Index: trunk/psLib/src/collections/psVector.c =================================================================== --- trunk/psLib/src/collections/psVector.c (revision 3114) +++ trunk/psLib/src/collections/psVector.c (revision 3115) @@ -10,6 +10,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-12-09 21:30:43 $ +* @version $Revision: 1.33 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-03 00:54:10 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -28,8 +28,8 @@ #include "psCollectionsErrors.h" -static void vectorFree(psVector* restrict psVec); - - -static void vectorFree(psVector* restrict psVec) +static void vectorFree(psVector* psVec); + + +static void vectorFree(psVector* psVec) { if (psVec == NULL) { @@ -64,5 +64,5 @@ } -psVector* psVectorRealloc(psVector* restrict in, psU32 nalloc) +psVector* psVectorRealloc(psVector* in, psU32 nalloc) { psS32 elementSize = 0; @@ -87,5 +87,5 @@ } -psVector* psVectorRecycle(psVector* restrict in, psU32 n, psElemType type) +psVector* psVectorRecycle(psVector* in, psU32 n, psElemType type) { psS32 byteSize; @@ -218,5 +218,5 @@ } -psVector* psVectorSort(psVector* restrict outVector, const psVector* restrict inVector) +psVector* psVectorSort(psVector* outVector, const psVector* inVector) { psS32 N = 0; @@ -302,5 +302,5 @@ } -psVector* psVectorSortIndex(psVector* restrict outVector, const psVector* restrict inVector) +psVector* psVectorSortIndex(psVector* outVector, const psVector* inVector) { psS32 N = 0; Index: trunk/psLib/src/collections/psVector.h =================================================================== --- trunk/psLib/src/collections/psVector.h (revision 3114) +++ trunk/psLib/src/collections/psVector.h (revision 3115) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-17 20:58:21 $ + * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:10 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -84,6 +84,6 @@ */ psVector* psVectorRealloc( - psVector* restrict psVec, ///< Vector to reallocate. - psU32 nalloc ///< Total number of elements to make available. + psVector* psVec, ///< Vector to reallocate. + psU32 nalloc ///< Total number of elements to make available. ); @@ -98,9 +98,9 @@ */ psVector* psVectorRecycle( - psVector* restrict psVec, + psVector* psVec, ///< Vector to recycle. If NULL, a new vector is created. No effort ///< taken to preserve the values. - psU32 nalloc, ///< Total number of elements to make available. + psU32 nalloc, ///< Total number of elements to make available. psElemType type ///< the datatype of the returned vector ); @@ -128,6 +128,6 @@ */ psVector* psVectorSort( - psVector* restrict outVector, ///< the output vector to recycle, or NULL if new vector desired. - const psVector* restrict inVector ///< the vector to sort. + psVector* outVector, ///< the output vector to recycle, or NULL if new vector desired. + const psVector* inVector ///< the vector to sort. ); @@ -140,6 +140,6 @@ */ psVector* psVectorSortIndex( - psVector* restrict outVector, ///< vector to recycle - const psVector* restrict inVector ///< vector to sort + psVector* outVector, ///< vector to recycle + const psVector* inVector ///< vector to sort ); Index: trunk/psLib/src/config.h.in =================================================================== --- trunk/psLib/src/config.h.in (revision 3115) +++ trunk/psLib/src/config.h.in (revision 3115) @@ -0,0 +1,67 @@ +/* src/config.h.in. Generated from configure.in by autoheader. */ + +/* Location of the psTime.config file */ +#undef CONFIG_FILE + +/* Define to 1 if you have the header file. */ +#undef HAVE_DLFCN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the `mx' library (-lmx). */ +#undef HAVE_LIBMX + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Name of package */ +#undef PACKAGE + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Location of the tai_utc.dat file */ +#undef UTC_DAT_FILE + +/* Version number of package */ +#undef VERSION + +/* Location of the psTime.xml file */ +#undef XML_CONFIG_FILE Index: trunk/psLib/src/dataIO/Makefile =================================================================== --- trunk/psLib/src/dataIO/Makefile (revision 3114) +++ trunk/psLib/src/dataIO/Makefile (revision 3115) @@ -1,60 +1,488 @@ -ifndef prefix - export prefix=$(shell cd ../..;pwd) -endif - -TARGET_STATIC = libpslib.a -include ../Makefile.Globals -CFLAGS := $(CFLAGS_RELOC) -I. -I../sysUtils -I../collections -I../dataManip \ - -I.. -I../image -I../astronomy -DSER7_FILE="\"$(SER7_FILE)\"" -DTAIUTC_FILE="\"$(TAIUTC_FILE)\"" - -SRC_OBJS = psLookupTable.o \ - psFits.o - -OBJS = $(addprefix makedir/,$(SRC_OBJS)) - -HEADERS = $(SRC_OBJS:.o=.h) - -all: $(TARGET_STATIC) +# Makefile.in generated by automake 1.9.1 from Makefile.am. +# src/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 = $(libpslibfileUtils_la_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 +subdir = src/fileUtils +DIST_COMMON = $(pslibinclude_HEADERS) $(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 = +LTLIBRARIES = $(noinst_LTLIBRARIES) +libpslibfileUtils_la_LIBADD = +am_libpslibfileUtils_la_OBJECTS = psLookupTable.lo psFits.lo +libpslibfileUtils_la_OBJECTS = $(am_libpslibfileUtils_la_OBJECTS) +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 = $(libpslibfileUtils_la_SOURCES) +DIST_SOURCES = $(libpslibfileUtils_la_SOURCES) +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(pslibincludedir)" +pslibincludeHEADERS_INSTALL = $(INSTALL_HEADER) +HEADERS = $(pslibinclude_HEADERS) +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 fileUtils functions of psLib +# +INCLUDES = \ + -I$(top_srcdir)/src/astronomy \ + -I$(top_srcdir)/src/collections \ + -I$(top_srcdir)/src/dataManip \ + -I$(top_srcdir)/src/image \ + -I$(top_srcdir)/src/sysUtils \ + $(all_includes) + +noinst_LTLIBRARIES = libpslibfileUtils.la +libpslibfileUtils_la_SOURCES = \ + psLookupTable.c \ + psFits.c + +BUILT_SOURCES = psFileUtilsErrors.h +EXTRA_DIST = psFileUtilsErrors.dat psFileUtilsErrors.h +pslibincludedir = $(includedir)/pslib +pslibinclude_HEADERS = \ + psLookupTable.h \ + psFits.h + +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 src/fileUtils/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/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-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libpslibfileUtils.la: $(libpslibfileUtils_la_OBJECTS) $(libpslibfileUtils_la_DEPENDENCIES) + $(LINK) $(libpslibfileUtils_la_LDFLAGS) $(libpslibfileUtils_la_OBJECTS) $(libpslibfileUtils_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +include ./$(DEPDIR)/psFits.Plo +include ./$(DEPDIR)/psLookupTable.Plo + +.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: +install-pslibincludeHEADERS: $(pslibinclude_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(pslibincludedir)" || $(mkdir_p) "$(DESTDIR)$(pslibincludedir)" + @list='$(pslibinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(pslibincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pslibincludedir)/$$f'"; \ + $(pslibincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pslibincludedir)/$$f"; \ + done + +uninstall-pslibincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(pslibinclude_HEADERS)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(pslibincludedir)/$$f'"; \ + rm -f "$(DESTDIR)$(pslibincludedir)/$$f"; \ + 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: $(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 + +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 +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am +all-am: Makefile $(LTLIBRARIES) $(HEADERS) +installdirs: + for dir in "$(DESTDIR)$(pslibincludedir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done +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-generic clean-libtool clean-noinstLTLIBRARIES \ + 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-pslibincludeHEADERS + +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 uninstall-pslibincludeHEADERS + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES 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-pslibincludeHEADERS 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 \ + uninstall-pslibincludeHEADERS + psFileUtilsErrors.h: psFileUtilsErrors.dat - perl ../parseErrorCodes.pl --data=$? $@ - - -# Rule to make static library - -libpslib.a: $(OBJS) -# The ar option -r is to add/replace object and -s is to create -# a symbol table in the archive - $(AR) rcs ../$@ $(OBJS) - -# Define PHONY target "install" which will install necessary files -install: $(TARGET_STATIC) - install $(HEADERS) $(includedir) - -# Define PHONY target "distclean" which will cleanup the distribution -distclean: clean - $(RM) ../$(TARGET_STATIC) - -# Define PHONY target "clean" which will cleanup the development area -clean: - @echo " Deleting intermediate files for 'fileUtils'" - $(RM) $(OBJS) *.lint $(SRC_OBJS:.o=.i) - -cleandep: - $(RM) $(OBJS:.o=.d) - -%.lint: %.c - splint +posixlib -exportlocal -realcompare $(INCLUDE_GLOBAL) $? > $@; cat $@ - -%.i: %.c - $(CC) -E $(CFLAGS) -o $@ $< - -makedir/%.o: %.c - $(CC) -c $(CFLAGS) -o $@ $< - -makedir/%.d: %.c - $(CC) -MM $(CFLAGS) $< > $@.tmp - sed 's|\($*\)\.o[ :]*|\1.o $@ : |g' $@.tmp > $@ - $(RM) -f $@.tmp - -include $(OBJS:.o=.d) + perl $(top_srcdir)/src/parseErrorCodes.pl --data=$? $@ +# 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/src/dataIO/Makefile.am =================================================================== --- trunk/psLib/src/dataIO/Makefile.am (revision 3115) +++ trunk/psLib/src/dataIO/Makefile.am (revision 3115) @@ -0,0 +1,27 @@ +#Makefile for fileUtils functions of psLib +# +INCLUDES = \ + -I$(top_srcdir)/src/astronomy \ + -I$(top_srcdir)/src/collections \ + -I$(top_srcdir)/src/dataManip \ + -I$(top_srcdir)/src/image \ + -I$(top_srcdir)/src/sysUtils \ + $(all_includes) + +noinst_LTLIBRARIES = libpslibfileUtils.la + +libpslibfileUtils_la_SOURCES = \ + psLookupTable.c \ + psFits.c + +BUILT_SOURCES = psFileUtilsErrors.h +EXTRA_DIST = psFileUtilsErrors.dat psFileUtilsErrors.h + +psFileUtilsErrors.h: psFileUtilsErrors.dat + perl $(top_srcdir)/src/parseErrorCodes.pl --data=$? $@ + +pslibincludedir = $(includedir)/pslib +pslibinclude_HEADERS = \ + psLookupTable.h \ + psFits.h + Index: trunk/psLib/src/dataIO/dataIO.i =================================================================== --- trunk/psLib/src/dataIO/dataIO.i (revision 3115) +++ trunk/psLib/src/dataIO/dataIO.i (revision 3115) @@ -0,0 +1,4 @@ +/* fileUtils headers */ +%include "psFileUtilsErrors.h" +%include "psFits.h" +%include "psLookupTable.h" Index: trunk/psLib/src/dataIO/psFileUtilsErrors.h =================================================================== --- trunk/psLib/src/dataIO/psFileUtilsErrors.h (revision 3114) +++ trunk/psLib/src/dataIO/psFileUtilsErrors.h (revision 3115) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-18 03:15:03 $ + * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:11 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -26,6 +26,4 @@ * DO NOT EDIT THE LINES BETWEEN //~Start and //~End! ANY CHANGES WILL BE OVERWRITTEN. */ - -#define PS_ERRORNAME_DOMAIN "psLib.astronomy." //~Start #define PS_ERRORTEXT_$1 "$2" Index: trunk/psLib/src/dataIO/psLookupTable.c =================================================================== --- trunk/psLib/src/dataIO/psLookupTable.c (revision 3114) +++ trunk/psLib/src/dataIO/psLookupTable.c (revision 3115) @@ -7,6 +7,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-12-16 18:53:02 $ +* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-03 00:54:11 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -455,5 +455,5 @@ psU64 failedLines = 0; FILE *fp = NULL; - psElemType elemType; + psElemType elemType = PS_TYPE_PTR; psVector *indexVec = NULL; psVector *valuesVec = NULL; Index: trunk/psLib/src/dataManip/Makefile =================================================================== --- trunk/psLib/src/dataManip/Makefile (revision 3114) +++ trunk/psLib/src/dataManip/Makefile (revision 3115) @@ -1,69 +1,506 @@ -ifndef prefix - export prefix=$(shell cd ../..;pwd) -endif - -TARGET_STATIC = libpslib.a -include ../Makefile.Globals -CFLAGS := $(CFLAGS_RELOC) -I. -I../sysUtils -I../collections -I.. -I../image -I.. - -SRC_OBJS = psStats.o \ - psFunctions.o \ - psMatrix.o \ - psMatrixVectorArithmetic.o \ - psVectorFFT.o \ - psMinimize.o \ - psRandom.o \ - -OBJS = $(addprefix makedir/,$(SRC_OBJS)) - -HEADERS = $(SRC_OBJS:.o=.h) - -all: $(TARGET_STATIC) +# Makefile.in generated by automake 1.9.1 from Makefile.am. +# src/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 = $(libpslibdataManip_la_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 +subdir = src/dataManip +DIST_COMMON = $(pslibinclude_HEADERS) $(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 = +LTLIBRARIES = $(noinst_LTLIBRARIES) +libpslibdataManip_la_LIBADD = +am_libpslibdataManip_la_OBJECTS = psStats.lo psFunctions.lo \ + psMatrix.lo psMatrixVectorArithmetic.lo psVectorFFT.lo \ + psMinimize.lo psRandom.lo +libpslibdataManip_la_OBJECTS = $(am_libpslibdataManip_la_OBJECTS) +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 = $(libpslibdataManip_la_SOURCES) +DIST_SOURCES = $(libpslibdataManip_la_SOURCES) +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(pslibincludedir)" +pslibincludeHEADERS_INSTALL = $(INSTALL_HEADER) +HEADERS = $(pslibinclude_HEADERS) +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 dataManip functions of psLib +# +INCLUDES = \ + -I$(top_srcdir)/src/astronomy \ + -I$(top_srcdir)/src/collections \ + -I$(top_srcdir)/src/fileUtils \ + -I$(top_srcdir)/src/image \ + -I$(top_srcdir)/src/sysUtils \ + $(all_includes) + +noinst_LTLIBRARIES = libpslibdataManip.la +libpslibdataManip_la_SOURCES = \ + psStats.c \ + psFunctions.c \ + psMatrix.c \ + psMatrixVectorArithmetic.c \ + psVectorFFT.c \ + psMinimize.c \ + psRandom.c + +BUILT_SOURCES = psDataManipErrors.h +EXTRA_DIST = psDataManipErrors.dat psDataManipErrors.h +pslibincludedir = $(includedir)/pslib +pslibinclude_HEADERS = \ + psConstants.h \ + psStats.h \ + psFunctions.h \ + psMatrix.h \ + psMatrixVectorArithmetic.h \ + psVectorFFT.h \ + psMinimize.h \ + psRandom.h + +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 src/dataManip/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/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-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libpslibdataManip.la: $(libpslibdataManip_la_OBJECTS) $(libpslibdataManip_la_DEPENDENCIES) + $(LINK) $(libpslibdataManip_la_LDFLAGS) $(libpslibdataManip_la_OBJECTS) $(libpslibdataManip_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +include ./$(DEPDIR)/psFunctions.Plo +include ./$(DEPDIR)/psMatrix.Plo +include ./$(DEPDIR)/psMatrixVectorArithmetic.Plo +include ./$(DEPDIR)/psMinimize.Plo +include ./$(DEPDIR)/psRandom.Plo +include ./$(DEPDIR)/psStats.Plo +include ./$(DEPDIR)/psVectorFFT.Plo + +.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: +install-pslibincludeHEADERS: $(pslibinclude_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(pslibincludedir)" || $(mkdir_p) "$(DESTDIR)$(pslibincludedir)" + @list='$(pslibinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(pslibincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pslibincludedir)/$$f'"; \ + $(pslibincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pslibincludedir)/$$f"; \ + done + +uninstall-pslibincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(pslibinclude_HEADERS)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(pslibincludedir)/$$f'"; \ + rm -f "$(DESTDIR)$(pslibincludedir)/$$f"; \ + 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: $(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 + +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 +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am +all-am: Makefile $(LTLIBRARIES) $(HEADERS) +installdirs: + for dir in "$(DESTDIR)$(pslibincludedir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done +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-generic clean-libtool clean-noinstLTLIBRARIES \ + 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-pslibincludeHEADERS + +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 uninstall-pslibincludeHEADERS + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES 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-pslibincludeHEADERS 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 \ + uninstall-pslibincludeHEADERS + psDataManipErrors.h: psDataManipErrors.dat - perl ../parseErrorCodes.pl --data=$? $@ - -# force the creation of a psImage.i for psImage.o (to expand macros). -psMatrixVectorArithmetic.o: psMatrixVectorArithmetic.i - -# Rule to make static library - -libpslib.a: $(OBJS) -# The ar option -r is to add/replace object and -s is to create -# a symbol table in the archive - $(AR) rcs ../$@ $(OBJS) - -# Define PHONY target "install" which will install necessary files -# XXX: Do the psConstants.h install. -install: $(TARGET_STATIC) - install $(HEADERS) $(includedir) - install psConstants.h $(includedir) - - -# Define PHONY target "distclean" which will cleanup the distribution -distclean: clean - $(RM) ../$(TARGET_STATIC) - -# Define PHONY target "clean" which will cleanup the development area -clean: - @echo " Deleting intermediate files for 'sysUtils'" - $(RM) $(OBJS) *.lint $(SRC_OBJS:.o=.i) - -cleandep: - $(RM) $(OBJS:.o=.d) - -%.lint: %.c - splint +posixlib -exportlocal -realcompare $(INCLUDE_GLOBAL) $? > $@; cat $@ - -%.i: %.c - $(CC) -E $(CFLAGS) -o $@ $< - -makedir/%.o: %.c - $(CC) -c $(CFLAGS) -o $@ $< - -makedir/%.d: %.c - $(CC) -MM $(CFLAGS) $< > $@.tmp - sed 's|\($*\)\.o[ :]*|\1.o $@ : |g' $@.tmp > $@ - $(RM) -f $@.tmp - -include $(OBJS:.o=.d) + perl $(top_srcdir)/src/parseErrorCodes.pl --data=$? $@ +# 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/src/dataManip/Makefile.am =================================================================== --- trunk/psLib/src/dataManip/Makefile.am (revision 3115) +++ trunk/psLib/src/dataManip/Makefile.am (revision 3115) @@ -0,0 +1,38 @@ +#Makefile for dataManip functions of psLib +# +INCLUDES = \ + -I$(top_srcdir)/src/astronomy \ + -I$(top_srcdir)/src/collections \ + -I$(top_srcdir)/src/fileUtils \ + -I$(top_srcdir)/src/image \ + -I$(top_srcdir)/src/sysUtils \ + $(all_includes) + +noinst_LTLIBRARIES = libpslibdataManip.la + +libpslibdataManip_la_SOURCES = \ + psStats.c \ + psFunctions.c \ + psMatrix.c \ + psMatrixVectorArithmetic.c \ + psVectorFFT.c \ + psMinimize.c \ + psRandom.c + +BUILT_SOURCES = psDataManipErrors.h +EXTRA_DIST = psDataManipErrors.dat psDataManipErrors.h + +psDataManipErrors.h: psDataManipErrors.dat + perl $(top_srcdir)/src/parseErrorCodes.pl --data=$? $@ + +pslibincludedir = $(includedir)/pslib +pslibinclude_HEADERS = \ + psConstants.h \ + psStats.h \ + psFunctions.h \ + psMatrix.h \ + psMatrixVectorArithmetic.h \ + psVectorFFT.h \ + psMinimize.h \ + psRandom.h + Index: trunk/psLib/src/dataManip/psDataManipErrors.h =================================================================== --- trunk/psLib/src/dataManip/psDataManipErrors.h (revision 3114) +++ trunk/psLib/src/dataManip/psDataManipErrors.h (revision 3115) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-15 01:15:09 $ + * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:10 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -26,6 +26,4 @@ * DO NOT EDIT THE LINES BETWEEN //~Start and //~End! ANY CHANGES WILL BE OVERWRITTEN. */ - -#define PS_ERRORNAME_DOMAIN "psLib.dataManip." //~Start #define PS_ERRORTEXT_$1 "$2" Index: trunk/psLib/src/dataManip/psFunctions.c =================================================================== --- trunk/psLib/src/dataManip/psFunctions.c (revision 3114) +++ trunk/psLib/src/dataManip/psFunctions.c (revision 3115) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.85 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-26 20:47:41 $ + * @version $Revision: 1.86 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:10 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -1202,6 +1202,6 @@ PS_VECTOR_CHECK_TYPE(x, PS_TYPE_F32, NULL); - psVector *tmp; - psVector *myX; + psVector *tmp = NULL; + psVector *myX = NULL; psS32 i; @@ -1244,7 +1244,7 @@ PS_VECTOR_CHECK_TYPE(y, PS_TYPE_F32, NULL); - psVector *tmp; - psVector *myX; - psVector *myY; + psVector *tmp = NULL; + psVector *myX = NULL; + psVector *myY = NULL; psS32 i; psS32 vecLen=x->n; @@ -1302,8 +1302,8 @@ PS_VECTOR_CHECK_TYPE(z, PS_TYPE_F32, NULL); - psVector *tmp; - psVector *myX; - psVector *myY; - psVector *myZ; + psVector *tmp = NULL; + psVector *myX = NULL; + psVector *myY = NULL; + psVector *myZ = NULL; psS32 i; psS32 vecLen=x->n; @@ -1370,9 +1370,9 @@ PS_VECTOR_CHECK_TYPE(z, PS_TYPE_F32, NULL); - psVector *tmp; - psVector *myW; - psVector *myX; - psVector *myY; - psVector *myZ; + psVector *tmp = NULL; + psVector *myW = NULL; + psVector *myX = NULL; + psVector *myY = NULL; + psVector *myZ = NULL; psS32 i; psS32 vecLen=x->n; @@ -1603,6 +1603,6 @@ PS_VECTOR_CHECK_TYPE(x, PS_TYPE_F64, NULL); - psVector *tmp; - psVector *myX; + psVector *tmp = NULL; + psVector *myX = NULL; psS32 i; @@ -1648,7 +1648,7 @@ PS_VECTOR_CHECK_TYPE(y, PS_TYPE_F64, NULL); - psVector *tmp; - psVector *myX; - psVector *myY; + psVector *tmp = NULL; + psVector *myX = NULL; + psVector *myY = NULL; psS32 i; psS32 vecLen=x->n; @@ -1710,8 +1710,8 @@ PS_VECTOR_CHECK_TYPE(z, PS_TYPE_F64, NULL); - psVector *tmp; - psVector *myX; - psVector *myY; - psVector *myZ; + psVector *tmp = NULL; + psVector *myX = NULL; + psVector *myY = NULL; + psVector *myZ = NULL; psS32 i; psS32 vecLen=x->n; @@ -1782,9 +1782,9 @@ PS_VECTOR_CHECK_TYPE(z, PS_TYPE_F64, NULL); - psVector *tmp; - psVector *myW; - psVector *myX; - psVector *myY; - psVector *myZ; + psVector *tmp = NULL; + psVector *myW = NULL; + psVector *myX = NULL; + psVector *myY = NULL; + psVector *myZ = NULL; psS32 i; psS32 vecLen=x->n; Index: trunk/psLib/src/dataManip/psFunctions.h =================================================================== --- trunk/psLib/src/dataManip/psFunctions.h (revision 3114) +++ trunk/psLib/src/dataManip/psFunctions.h (revision 3115) @@ -12,6 +12,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.40 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-01-26 20:41:04 $ +* @version $Revision: 1.41 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-03 00:54:10 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -429,6 +429,6 @@ psF32 p_psNRSpline1DEval(psSpline1D *spline, - const psVector* restrict x, - const psVector* restrict y, + const psVector* x, + const psVector* y, psF32 X); Index: trunk/psLib/src/dataManip/psMinimize.c =================================================================== --- trunk/psLib/src/dataManip/psMinimize.c (revision 3114) +++ trunk/psLib/src/dataManip/psMinimize.c (revision 3115) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.103 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-26 20:47:41 $ + * @version $Revision: 1.104 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:10 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -96,6 +96,6 @@ XXX: do an F64 version? *****************************************************************************/ -psF32 *CalculateSecondDerivs(const psVector* restrict x, ///< Ordinates (or NULL to just use the indices) - const psVector* restrict y) ///< Coordinates +psF32 *CalculateSecondDerivs(const psVector* x, ///< Ordinates (or NULL to just use the indices) + const psVector* y) ///< Coordinates { psTrace(".psLib.dataManip.CalculateSecondDerivs", 4, @@ -167,6 +167,6 @@ /* psF32 p_psNRSpline1DEval(psSpline1D *spline, - const psVector* restrict x, - const psVector* restrict y, + const psVector* x, + const psVector* y, psF32 X) { @@ -250,8 +250,8 @@ XXX: Assumes mySpline->knots is psF32. Must add psU32 and psF64. *****************************************************************************/ -psSpline1D *psVectorFitSpline1D(psSpline1D *mySpline, ///< The spline which will be generated. - const psVector* restrict x, ///< Ordinates (or NULL to just use the indices) - const psVector* restrict y, ///< Coordinates - const psVector* restrict yErr) ///< Errors in coordinates, or NULL +psSpline1D *psVectorFitSpline1D(psSpline1D *mySpline, ///< The spline which will be generated. + const psVector* x, ///< Ordinates (or NULL to just use the indices) + const psVector* y, ///< Coordinates + const psVector* yErr) ///< Errors in coordinates, or NULL { PS_VECTOR_CHECK_NULL(y, NULL); @@ -833,7 +833,7 @@ *****************************************************************************/ psPolynomial1D *VectorFitPolynomial1DCheby(psPolynomial1D* myPoly, - const psVector* restrict x, - const psVector* restrict y, - const psVector* restrict yErr) + const psVector* x, + const psVector* y, + const psVector* yErr) { psS32 j; @@ -911,7 +911,7 @@ *****************************************************************************/ psPolynomial1D* VectorFitPolynomial1DOrd(psPolynomial1D* myPoly, - const psVector* restrict x, - const psVector* restrict y, - const psVector* restrict yErr) + const psVector* x, + const psVector* y, + const psVector* yErr) { psS32 polyOrder = myPoly->n; @@ -1018,7 +1018,7 @@ *****************************************************************************/ psPolynomial1D* psVectorFitPolynomial1D(psPolynomial1D* myPoly, - const psVector* restrict x, - const psVector* restrict y, - const psVector* restrict yErr) + const psVector* x, + const psVector* y, + const psVector* yErr) { PS_POLY_CHECK_NULL(myPoly, NULL); Index: trunk/psLib/src/dataManip/psMinimize.h =================================================================== --- trunk/psLib/src/dataManip/psMinimize.h (revision 3114) +++ trunk/psLib/src/dataManip/psMinimize.h (revision 3115) @@ -8,6 +8,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-12-22 05:09:32 $ + * @version $Revision: 1.38 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:10 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -65,13 +65,13 @@ psPolynomial1D* psVectorFitPolynomial1D( psPolynomial1D* myPoly, ///< Polynomial to fit - const psVector* restrict x, ///< Ordinates (or NULL to just use the indices) - const psVector* restrict y, ///< Coordinates - const psVector* restrict yErr ///< Errors in coordinates, or NULL + const psVector* x, ///< Ordinates (or NULL to just use the indices) + const psVector* y, ///< Coordinates + const psVector* yErr ///< Errors in coordinates, or NULL ); -psSpline1D *psVectorFitSpline1D(psSpline1D *mySpline, ///< The spline which will be generated. - const psVector* restrict x, ///< Ordinates (or NULL to just use the indices) - const psVector* restrict y, ///< Coordinates - const psVector* restrict yErr ///< Errors in coordinates, or NULL +psSpline1D *psVectorFitSpline1D(psSpline1D *mySpline, ///< The spline which will be generated. + const psVector* x, ///< Ordinates (or NULL to just use the indices) + const psVector* y, ///< Coordinates + const psVector* yErr ///< Errors in coordinates, or NULL ); Index: trunk/psLib/src/dataManip/psStats.c =================================================================== --- trunk/psLib/src/dataManip/psStats.c (revision 3114) +++ trunk/psLib/src/dataManip/psStats.c (revision 3115) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.111 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-26 20:24:17 $ + * @version $Revision: 1.112 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:10 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -145,7 +145,7 @@ this routine sets stats->sampleMean to NAN. *****************************************************************************/ -psS32 p_psVectorSampleMean(const psVector* restrict myVector, - const psVector* restrict errors, - const psVector* restrict maskVector, +psS32 p_psVectorSampleMean(const psVector* myVector, + const psVector* errors, + const psVector* maskVector, psU32 maskVal, psStats* stats) @@ -283,6 +283,6 @@ this routine sets stats->max to NAN. *****************************************************************************/ -psS32 p_psVectorMax(const psVector* restrict myVector, - const psVector* restrict maskVector, +psS32 p_psVectorMax(const psVector* myVector, + const psVector* maskVector, psU32 maskVal, psStats* stats) @@ -348,6 +348,6 @@ this routine sets stats->min to NAN. *****************************************************************************/ -psS32 p_psVectorMin(const psVector* restrict myVector, - const psVector* restrict maskVector, +psS32 p_psVectorMin(const psVector* myVector, + const psVector* maskVector, psU32 maskVal, psStats* stats) @@ -414,6 +414,6 @@ "false". *****************************************************************************/ -bool p_psVectorCheckNonEmpty(const psVector* restrict myVector, - const psVector* restrict maskVector, +bool p_psVectorCheckNonEmpty(const psVector* myVector, + const psVector* maskVector, psU32 maskVal, psStats* stats) @@ -462,6 +462,6 @@ range, if specified. *****************************************************************************/ -psS32 p_psVectorNValues(const psVector* restrict myVector, - const psVector* restrict maskVector, +psS32 p_psVectorNValues(const psVector* myVector, + const psVector* maskVector, psU32 maskVal, psStats* stats) @@ -511,6 +511,6 @@ XXX: Use static vectors for sort arrays. *****************************************************************************/ -bool p_psVectorSampleMedian(const psVector* restrict myVector, - const psVector* restrict maskVector, +bool p_psVectorSampleMedian(const psVector* myVector, + const psVector* maskVector, psU32 maskVal, psStats* stats) @@ -701,6 +701,6 @@ NULL *****************************************************************************/ -bool p_psVectorSampleQuartiles(const psVector* restrict myVector, - const psVector* restrict maskVector, +bool p_psVectorSampleQuartiles(const psVector* myVector, + const psVector* maskVector, psU32 maskVal, psStats* stats) @@ -787,7 +787,7 @@ *****************************************************************************/ -void p_psVectorSampleStdevOLD(const psVector* restrict myVector, - const psVector* restrict errors, - const psVector* restrict maskVector, +void p_psVectorSampleStdevOLD(const psVector* myVector, + const psVector* errors, + const psVector* maskVector, psU32 maskVal, psStats* stats) @@ -881,7 +881,7 @@ *****************************************************************************/ -void p_psVectorSampleStdev(const psVector* restrict myVector, - const psVector* restrict errors, - const psVector* restrict maskVector, +void p_psVectorSampleStdev(const psVector* myVector, + const psVector* errors, + const psVector* maskVector, psU32 maskVal, psStats* stats) @@ -896,5 +896,5 @@ // psF32 sum1; // psF32 sum2; - psF32 errorDivisor; + psF32 errorDivisor = 0.0f; // This procedure requires the mean. If it has not been already @@ -1003,7 +1003,7 @@ -2: warning *****************************************************************************/ -psS32 p_psVectorClippedStats(const psVector* restrict myVector, - const psVector* restrict errors, - const psVector* restrict maskVector, +psS32 p_psVectorClippedStats(const psVector* myVector, + const psVector* errors, + const psVector* maskVector, psU32 maskVal, psStats* stats) @@ -1331,5 +1331,5 @@ psPolynomial1D *myPoly = psPolynomial1DAlloc(2, PS_POLYNOMIAL_ORD); - psF32 tmpFloat; + psF32 tmpFloat = 0.0f; if ((binNum > 0) && (binNum < (yVec->n - 2))) { @@ -1425,7 +1425,7 @@ XXX: Check for errors in psLib routines that we call. *****************************************************************************/ -psS32 p_psVectorRobustStats(const psVector* restrict myVector, - const psVector* restrict errors, - const psVector* restrict maskVector, +psS32 p_psVectorRobustStats(const psVector* myVector, + const psVector* errors, + const psVector* maskVector, psU32 maskVal, psStats* stats) @@ -1820,5 +1820,5 @@ The histogram structure *****************************************************************************/ -psHistogram* psHistogramAllocGeneric(const psVector* restrict bounds) +psHistogram* psHistogramAllocGeneric(const psVector* bounds) { PS_VECTOR_CHECK_NULL(bounds, NULL); @@ -1890,6 +1890,6 @@ psF32 boxcarRight = boxcarCenter + (boxcarWidth / 2.0); psS32 bin; - psS32 boxcarLeftBinNum; - psS32 boxcarRightBinNum; + psS32 boxcarLeftBinNum = 0; + psS32 boxcarRightBinNum = 0; // Determine the left endpoint of the boxcar for the PDF. @@ -1961,7 +1961,7 @@ *****************************************************************************/ psHistogram* psVectorHistogram(psHistogram* out, - const psVector* restrict in, - const psVector* restrict errors, - const psVector* restrict mask, + const psVector* in, + const psVector* errors, + const psVector* mask, psU32 maskVal) { Index: trunk/psLib/src/dataManip/psStats.h =================================================================== --- trunk/psLib/src/dataManip/psStats.h (revision 3114) +++ trunk/psLib/src/dataManip/psStats.h (revision 3115) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-12-22 05:09:32 $ + * @version $Revision: 1.38 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:10 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -143,5 +143,5 @@ */ psHistogram* psHistogramAllocGeneric( - const psVector* restrict bounds ///< Bounds for the bins + const psVector* bounds ///< Bounds for the bins ); @@ -156,8 +156,8 @@ psHistogram* psVectorHistogram( psHistogram* out, ///< Histogram data - const psVector* restrict in, ///< Vector to analyse - const psVector* restrict errors, ///< Errors - const psVector* restrict mask, ///< Mask dat for input vector - psU32 maskVal ///< Mask value + const psVector* in, ///< Vector to analyse + const psVector* errors, ///< Errors + const psVector* mask, ///< Mask dat for input vector + psU32 maskVal ///< Mask value ); Index: trunk/psLib/src/fileUtils/Makefile =================================================================== --- trunk/psLib/src/fileUtils/Makefile (revision 3114) +++ trunk/psLib/src/fileUtils/Makefile (revision 3115) @@ -1,60 +1,488 @@ -ifndef prefix - export prefix=$(shell cd ../..;pwd) -endif - -TARGET_STATIC = libpslib.a -include ../Makefile.Globals -CFLAGS := $(CFLAGS_RELOC) -I. -I../sysUtils -I../collections -I../dataManip \ - -I.. -I../image -I../astronomy -DSER7_FILE="\"$(SER7_FILE)\"" -DTAIUTC_FILE="\"$(TAIUTC_FILE)\"" - -SRC_OBJS = psLookupTable.o \ - psFits.o - -OBJS = $(addprefix makedir/,$(SRC_OBJS)) - -HEADERS = $(SRC_OBJS:.o=.h) - -all: $(TARGET_STATIC) +# Makefile.in generated by automake 1.9.1 from Makefile.am. +# src/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 = $(libpslibfileUtils_la_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 +subdir = src/fileUtils +DIST_COMMON = $(pslibinclude_HEADERS) $(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 = +LTLIBRARIES = $(noinst_LTLIBRARIES) +libpslibfileUtils_la_LIBADD = +am_libpslibfileUtils_la_OBJECTS = psLookupTable.lo psFits.lo +libpslibfileUtils_la_OBJECTS = $(am_libpslibfileUtils_la_OBJECTS) +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 = $(libpslibfileUtils_la_SOURCES) +DIST_SOURCES = $(libpslibfileUtils_la_SOURCES) +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(pslibincludedir)" +pslibincludeHEADERS_INSTALL = $(INSTALL_HEADER) +HEADERS = $(pslibinclude_HEADERS) +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 fileUtils functions of psLib +# +INCLUDES = \ + -I$(top_srcdir)/src/astronomy \ + -I$(top_srcdir)/src/collections \ + -I$(top_srcdir)/src/dataManip \ + -I$(top_srcdir)/src/image \ + -I$(top_srcdir)/src/sysUtils \ + $(all_includes) + +noinst_LTLIBRARIES = libpslibfileUtils.la +libpslibfileUtils_la_SOURCES = \ + psLookupTable.c \ + psFits.c + +BUILT_SOURCES = psFileUtilsErrors.h +EXTRA_DIST = psFileUtilsErrors.dat psFileUtilsErrors.h +pslibincludedir = $(includedir)/pslib +pslibinclude_HEADERS = \ + psLookupTable.h \ + psFits.h + +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 src/fileUtils/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/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-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libpslibfileUtils.la: $(libpslibfileUtils_la_OBJECTS) $(libpslibfileUtils_la_DEPENDENCIES) + $(LINK) $(libpslibfileUtils_la_LDFLAGS) $(libpslibfileUtils_la_OBJECTS) $(libpslibfileUtils_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +include ./$(DEPDIR)/psFits.Plo +include ./$(DEPDIR)/psLookupTable.Plo + +.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: +install-pslibincludeHEADERS: $(pslibinclude_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(pslibincludedir)" || $(mkdir_p) "$(DESTDIR)$(pslibincludedir)" + @list='$(pslibinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(pslibincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pslibincludedir)/$$f'"; \ + $(pslibincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pslibincludedir)/$$f"; \ + done + +uninstall-pslibincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(pslibinclude_HEADERS)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(pslibincludedir)/$$f'"; \ + rm -f "$(DESTDIR)$(pslibincludedir)/$$f"; \ + 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: $(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 + +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 +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am +all-am: Makefile $(LTLIBRARIES) $(HEADERS) +installdirs: + for dir in "$(DESTDIR)$(pslibincludedir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done +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-generic clean-libtool clean-noinstLTLIBRARIES \ + 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-pslibincludeHEADERS + +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 uninstall-pslibincludeHEADERS + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES 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-pslibincludeHEADERS 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 \ + uninstall-pslibincludeHEADERS + psFileUtilsErrors.h: psFileUtilsErrors.dat - perl ../parseErrorCodes.pl --data=$? $@ - - -# Rule to make static library - -libpslib.a: $(OBJS) -# The ar option -r is to add/replace object and -s is to create -# a symbol table in the archive - $(AR) rcs ../$@ $(OBJS) - -# Define PHONY target "install" which will install necessary files -install: $(TARGET_STATIC) - install $(HEADERS) $(includedir) - -# Define PHONY target "distclean" which will cleanup the distribution -distclean: clean - $(RM) ../$(TARGET_STATIC) - -# Define PHONY target "clean" which will cleanup the development area -clean: - @echo " Deleting intermediate files for 'fileUtils'" - $(RM) $(OBJS) *.lint $(SRC_OBJS:.o=.i) - -cleandep: - $(RM) $(OBJS:.o=.d) - -%.lint: %.c - splint +posixlib -exportlocal -realcompare $(INCLUDE_GLOBAL) $? > $@; cat $@ - -%.i: %.c - $(CC) -E $(CFLAGS) -o $@ $< - -makedir/%.o: %.c - $(CC) -c $(CFLAGS) -o $@ $< - -makedir/%.d: %.c - $(CC) -MM $(CFLAGS) $< > $@.tmp - sed 's|\($*\)\.o[ :]*|\1.o $@ : |g' $@.tmp > $@ - $(RM) -f $@.tmp - -include $(OBJS:.o=.d) + perl $(top_srcdir)/src/parseErrorCodes.pl --data=$? $@ +# 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/src/fileUtils/Makefile.am =================================================================== --- trunk/psLib/src/fileUtils/Makefile.am (revision 3115) +++ trunk/psLib/src/fileUtils/Makefile.am (revision 3115) @@ -0,0 +1,27 @@ +#Makefile for fileUtils functions of psLib +# +INCLUDES = \ + -I$(top_srcdir)/src/astronomy \ + -I$(top_srcdir)/src/collections \ + -I$(top_srcdir)/src/dataManip \ + -I$(top_srcdir)/src/image \ + -I$(top_srcdir)/src/sysUtils \ + $(all_includes) + +noinst_LTLIBRARIES = libpslibfileUtils.la + +libpslibfileUtils_la_SOURCES = \ + psLookupTable.c \ + psFits.c + +BUILT_SOURCES = psFileUtilsErrors.h +EXTRA_DIST = psFileUtilsErrors.dat psFileUtilsErrors.h + +psFileUtilsErrors.h: psFileUtilsErrors.dat + perl $(top_srcdir)/src/parseErrorCodes.pl --data=$? $@ + +pslibincludedir = $(includedir)/pslib +pslibinclude_HEADERS = \ + psLookupTable.h \ + psFits.h + Index: trunk/psLib/src/fileUtils/fileUtils.i =================================================================== --- trunk/psLib/src/fileUtils/fileUtils.i (revision 3115) +++ trunk/psLib/src/fileUtils/fileUtils.i (revision 3115) @@ -0,0 +1,4 @@ +/* fileUtils headers */ +%include "psFileUtilsErrors.h" +%include "psFits.h" +%include "psLookupTable.h" Index: trunk/psLib/src/fileUtils/psFileUtilsErrors.h =================================================================== --- trunk/psLib/src/fileUtils/psFileUtilsErrors.h (revision 3114) +++ trunk/psLib/src/fileUtils/psFileUtilsErrors.h (revision 3115) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-18 03:15:03 $ + * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:11 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -26,6 +26,4 @@ * DO NOT EDIT THE LINES BETWEEN //~Start and //~End! ANY CHANGES WILL BE OVERWRITTEN. */ - -#define PS_ERRORNAME_DOMAIN "psLib.astronomy." //~Start #define PS_ERRORTEXT_$1 "$2" Index: trunk/psLib/src/fileUtils/psLookupTable.c =================================================================== --- trunk/psLib/src/fileUtils/psLookupTable.c (revision 3114) +++ trunk/psLib/src/fileUtils/psLookupTable.c (revision 3115) @@ -7,6 +7,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-12-16 18:53:02 $ +* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-03 00:54:11 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -455,5 +455,5 @@ psU64 failedLines = 0; FILE *fp = NULL; - psElemType elemType; + psElemType elemType = PS_TYPE_PTR; psVector *indexVec = NULL; psVector *valuesVec = NULL; Index: trunk/psLib/src/image/Makefile =================================================================== --- trunk/psLib/src/image/Makefile (revision 3114) +++ trunk/psLib/src/image/Makefile (revision 3115) @@ -1,91 +1,505 @@ -############################################################################### -## -## Makefile: collections -## -## $Revision: 1.6 $ $Name: not supported by cvs2svn $ -## $Date: 2004-09-11 00:43:54 $ -## -## 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 = libpslib.a - -# Include the make global definitions for the project - -include ../Makefile.Globals - -# Set CFLAGS used by the implicit rule to compile .c - -CFLAGS := $(CFLAGS_RELOC) -I../sysUtils -I../dataManip -I../collections -I.. - -# Define the source objects - -SRC_OBJS = psImage.o \ - psImageExtraction.o \ - psImageIO.o \ - psImageManip.o \ - psImageStats.o \ - psImageFFT.o \ - psImageConvolve.o - -OBJS = $(addprefix makedir/,$(SRC_OBJS)) - -HEADERS = $(SRC_OBJS:.o=.h) - -# Define PHONY target "all" which will make all the necessary items - -all: $(TARGET_STATIC) +# Makefile.in generated by automake 1.9.1 from Makefile.am. +# src/image/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 = $(libpslibimage_la_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 +subdir = src/image +DIST_COMMON = $(pslibinclude_HEADERS) $(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 = +LTLIBRARIES = $(noinst_LTLIBRARIES) +libpslibimage_la_LIBADD = +am_libpslibimage_la_OBJECTS = psImage.lo psImageExtraction.lo \ + psImageIO.lo psImageManip.lo psImageStats.lo psImageFFT.lo \ + psImageConvolve.lo +libpslibimage_la_OBJECTS = $(am_libpslibimage_la_OBJECTS) +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 = $(libpslibimage_la_SOURCES) +DIST_SOURCES = $(libpslibimage_la_SOURCES) +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(pslibincludedir)" +pslibincludeHEADERS_INSTALL = $(INSTALL_HEADER) +HEADERS = $(pslibinclude_HEADERS) +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 image functions of psLib +# +INCLUDES = \ + -I$(top_srcdir)/src/astronomy \ + -I$(top_srcdir)/src/collections \ + -I$(top_srcdir)/src/dataManip \ + -I$(top_srcdir)/src/fileUtils \ + -I$(top_srcdir)/src/sysUtils \ + $(all_includes) + +noinst_LTLIBRARIES = libpslibimage.la +libpslibimage_la_SOURCES = \ + psImage.c \ + psImageExtraction.c \ + psImageIO.c \ + psImageManip.c \ + psImageStats.c \ + psImageFFT.c \ + psImageConvolve.c + +BUILT_SOURCES = psImageErrors.h +EXTRA_DIST = psImageErrors.dat psImageErrors.h +pslibincludedir = $(includedir)/pslib +pslibinclude_HEADERS = \ + psImage.h \ + psImageExtraction.h \ + psImageIO.h \ + psImageManip.h \ + psImageStats.h \ + psImageFFT.h \ + psImageConvolve.h + +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 src/image/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/image/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-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libpslibimage.la: $(libpslibimage_la_OBJECTS) $(libpslibimage_la_DEPENDENCIES) + $(LINK) $(libpslibimage_la_LDFLAGS) $(libpslibimage_la_OBJECTS) $(libpslibimage_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +include ./$(DEPDIR)/psImage.Plo +include ./$(DEPDIR)/psImageConvolve.Plo +include ./$(DEPDIR)/psImageExtraction.Plo +include ./$(DEPDIR)/psImageFFT.Plo +include ./$(DEPDIR)/psImageIO.Plo +include ./$(DEPDIR)/psImageManip.Plo +include ./$(DEPDIR)/psImageStats.Plo + +.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: +install-pslibincludeHEADERS: $(pslibinclude_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(pslibincludedir)" || $(mkdir_p) "$(DESTDIR)$(pslibincludedir)" + @list='$(pslibinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(pslibincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pslibincludedir)/$$f'"; \ + $(pslibincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pslibincludedir)/$$f"; \ + done + +uninstall-pslibincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(pslibinclude_HEADERS)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(pslibincludedir)/$$f'"; \ + rm -f "$(DESTDIR)$(pslibincludedir)/$$f"; \ + 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: $(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 + +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 +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am +all-am: Makefile $(LTLIBRARIES) $(HEADERS) +installdirs: + for dir in "$(DESTDIR)$(pslibincludedir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done +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-generic clean-libtool clean-noinstLTLIBRARIES \ + 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-pslibincludeHEADERS + +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 uninstall-pslibincludeHEADERS + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES 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-pslibincludeHEADERS 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 \ + uninstall-pslibincludeHEADERS + psImageErrors.h: psImageErrors.dat - perl ../parseErrorCodes.pl --data=$? $@ - -# Rule to make static library - -libpslib.a: $(OBJS) -# The ar option -r is to add/replace object and -s is to create -# a symbol table in the archive - $(AR) rcs ../$@ $(OBJS) - -# Define PHONY target "install" which will install necessary files - -install: $(TARGET_STATIC) - install $(HEADERS) $(includedir) - -# Define PHONY target "distclean" which will cleanup the distribution - -distclean: clean - $(RM) ../$(TARGET_STATIC) - -# Define PHONY target "clean" which will cleanup the development area - -clean: - @echo " Deleting intermediate files for 'collections'" - $(RM) $(OBJS) *.lint $(SRC_OBJS:.o=.i) - -cleandep: - $(RM) $(OBJS:.o=.d) - -%.lint: %.c - splint +posixlib -exportlocal -realcompare $(INCLUDE_GLOBAL) $? > $@; cat $@ - -%.i: %.c - $(CC) -E $(CFLAGS) -o $@ $< - -makedir/%.o: %.c - $(CC) -c $(CFLAGS) -o $@ $< - -makedir/%.d: %.c - $(CC) -MM $(CFLAGS) $< > $@.tmp - sed 's|\($*\)\.o[ :]*|\1.o $@ : |g' $@.tmp > $@ - $(RM) -f $@.tmp - -include $(OBJS:.o=.d) + perl $(top_srcdir)/src/parseErrorCodes.pl --data=$? $@ +# 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/src/image/Makefile.am =================================================================== --- trunk/psLib/src/image/Makefile.am (revision 3115) +++ trunk/psLib/src/image/Makefile.am (revision 3115) @@ -0,0 +1,36 @@ +#Makefile for image functions of psLib +# +INCLUDES = \ + -I$(top_srcdir)/src/astronomy \ + -I$(top_srcdir)/src/collections \ + -I$(top_srcdir)/src/dataManip \ + -I$(top_srcdir)/src/fileUtils \ + -I$(top_srcdir)/src/sysUtils \ + $(all_includes) + +noinst_LTLIBRARIES = libpslibimage.la + +libpslibimage_la_SOURCES = \ + psImage.c \ + psImageExtraction.c \ + psImageIO.c \ + psImageManip.c \ + psImageStats.c \ + psImageFFT.c \ + psImageConvolve.c + +BUILT_SOURCES = psImageErrors.h +EXTRA_DIST = psImageErrors.dat psImageErrors.h + +psImageErrors.h: psImageErrors.dat + perl $(top_srcdir)/src/parseErrorCodes.pl --data=$? $@ + +pslibincludedir = $(includedir)/pslib +pslibinclude_HEADERS = \ + psImage.h \ + psImageExtraction.h \ + psImageIO.h \ + psImageManip.h \ + psImageStats.h \ + psImageFFT.h \ + psImageConvolve.h Index: trunk/psLib/src/image/image.i =================================================================== --- trunk/psLib/src/image/image.i (revision 3115) +++ trunk/psLib/src/image/image.i (revision 3115) @@ -0,0 +1,10 @@ +/* image headers */ +%include "psImageConvolve.h" +%include "psImageErrors.h" +%include "psImageExtraction.h" +%include "psImageFFT.h" +%include "psImage.h" +%include "psImageIO.h" +%include "psImageManip.h" +%include "psImageStats.h" + Index: trunk/psLib/src/image/psImage.c =================================================================== --- trunk/psLib/src/image/psImage.c (revision 3114) +++ trunk/psLib/src/image/psImage.c (revision 3115) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.57 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-13 03:26:23 $ + * @version $Revision: 1.58 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:11 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -568,8 +568,8 @@ psS32 lastX = input->numCols - 1; \ psS32 lastY = input->numRows - 1; \ - ps##TYPE V00; \ - ps##TYPE V01; \ - ps##TYPE V10; \ - ps##TYPE V11; \ + ps##TYPE V00 = 0; \ + ps##TYPE V01 = 0; \ + ps##TYPE V10 = 0; \ + ps##TYPE V11 = 0; \ psBool valid00 = false; \ psBool valid01 = false; \ @@ -611,5 +611,5 @@ /* OK, at least one pixel is not valid - need to do it piecemeal */ \ \ - psF64 V0; \ + psF64 V0 = 0.0; \ psBool valid0 = true; \ if (valid00 && valid10) { \ @@ -623,5 +623,5 @@ } \ \ - psF64 V1; \ + psF64 V1 = 0.0; \ psBool valid1 = true; \ if (valid01 && valid11) { \ @@ -662,8 +662,8 @@ psS32 lastX = input->numCols - 1; \ psS32 lastY = input->numRows - 1; \ - ps##TYPE V00; \ - ps##TYPE V01; \ - ps##TYPE V10; \ - ps##TYPE V11; \ + ps##TYPE V00 = 0; \ + ps##TYPE V01 = 0; \ + ps##TYPE V10 = 0; \ + ps##TYPE V11 = 0; \ psBool valid00 = false; \ psBool valid01 = false; \ @@ -705,5 +705,5 @@ /* OK, at least one pixel is not valid - need to do it piecemeal */ \ \ - psC64 V0; \ + psC64 V0 = 0; \ psBool valid0 = true; \ if (valid00 && valid10) { \ @@ -717,5 +717,5 @@ } \ \ - psC64 V1; \ + psC64 V1 = 0; \ psBool valid1 = true; \ if (valid01 && valid11) { \ Index: trunk/psLib/src/image/psImage.h =================================================================== --- trunk/psLib/src/image/psImage.h (revision 3114) +++ trunk/psLib/src/image/psImage.h (revision 3115) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.45 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-13 03:26:23 $ + * @version $Revision: 1.46 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:11 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -157,5 +157,5 @@ */ psImage* psImageCopy( - psImage* restrict output, ///< if not NULL, a psImage that could be recycled. + psImage* output, ///< if not NULL, a psImage that could be recycled. const psImage* input, ///< the psImage to copy psElemType type ///< the desired datatype of the returned copy @@ -221,5 +221,5 @@ psC64 unexposedValue /**< return value if x,y location is not in image. */ \ ); - +#ifndef SWIG p_psImagePixelInterpolateFcns(U8) p_psImagePixelInterpolateFcns(U16) @@ -234,4 +234,5 @@ p_psImagePixelInterpolateComplexFcns(C32) p_psImagePixelInterpolateComplexFcns(C64) +#endif /// @} Index: trunk/psLib/src/image/psImageErrors.h =================================================================== --- trunk/psLib/src/image/psImageErrors.h (revision 3114) +++ trunk/psLib/src/image/psImageErrors.h (revision 3115) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-04 02:34:57 $ + * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:11 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -26,6 +26,4 @@ * DO NOT EDIT THE LINES BETWEEN //~Start and //~End! ANY CHANGES WILL BE OVERWRITTEN. */ - -#define PS_ERRORNAME_DOMAIN "psLib.image." //~Start #define PS_ERRORTEXT_$1 "$2" Index: trunk/psLib/src/image/psImageExtraction.h =================================================================== --- trunk/psLib/src/image/psImageExtraction.h (revision 3114) +++ trunk/psLib/src/image/psImageExtraction.h (revision 3115) @@ -10,6 +10,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-27 00:57:31 $ +* @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-03 00:54:11 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -128,11 +128,11 @@ ///< coorsponding to the output vector's value of the same position in the ///< vector. This vector maybe resized and retyped as appropriate. - const psImage* restrict input, ///< the input image in which to perform the slice - const psImage* restrict mask, ///< the mask for the input image. - psU32 maskVal, ///< the mask value to apply to the mask - psS32 col0, ///< the leftmost column of the slice region - psS32 row0, ///< the bottommost row of the slice region - psS32 col1, ///< exclusive end column of the slice region - psS32 row1, ///< exclusive end row of the slice region + const psImage* input, ///< the input image in which to perform the slice + const psImage* mask, ///< the mask for the input image. + psU32 maskVal, ///< the mask value to apply to the mask + psS32 col0, ///< the leftmost column of the slice region + psS32 row0, ///< the bottommost row of the slice region + psS32 col1, ///< exclusive end column of the slice region + psS32 row1, ///< exclusive end row of the slice region psImageCutDirection direction, ///< the slice dimension and direction const psStats* stats ///< the statistic to perform in slice operation @@ -160,11 +160,11 @@ psVector* cutRows, ///< if not NULL, the calculated row values along the slice (output) const psImage* input, ///< the input image in which to perform the cut - const psImage* restrict mask, ///< the mask for the input image. - psU32 maskVal, ///< the mask value to apply to the mask + const psImage* mask, ///< the mask for the input image. + psU32 maskVal, ///< the mask value to apply to the mask float startCol, ///< the column of the start of the cut line float startRow, ///< the row of the start of the cut line float endCol, ///< the column of the end of the cut line float endRow, ///< the row of the end of the cut line - psU32 nSamples, ///< the number of samples along the cut + psU32 nSamples, ///< the number of samples along the cut psImageInterpolateMode mode ///< the interpolation method to use ); @@ -186,6 +186,6 @@ psVector* out, ///< psVector to recycle, or NULL. const psImage* input, ///< the input image in which to perform the cut - const psImage* restrict mask, ///< the mask for the input image. - psU32 maskVal, ///< the mask value to apply to the mask + const psImage* mask, ///< the mask for the input image. + psU32 maskVal, ///< the mask value to apply to the mask float centerCol, ///< the column of the center of the cut circle float centerRow, ///< the row of the center of the cut circle Index: trunk/psLib/src/image/psImageManip.h =================================================================== --- trunk/psLib/src/image/psImageManip.h (revision 3114) +++ trunk/psLib/src/image/psImageManip.h (revision 3115) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-03 21:58:53 $ + * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:11 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -101,5 +101,5 @@ psImage* out, ///< an psImage to recycle. If NULL, a new image is created const psImage* in, ///< input image - const psImage* restrict mask, ///< mask for input image. If NULL, no masking is done. + const psImage* mask, ///< mask for input image. If NULL, no masking is done. psMaskType maskVal, ///< the bits to check in mask. psU32 scale, ///< the scale to rebin for each dimension Index: trunk/psLib/src/image/psImageStats.c =================================================================== --- trunk/psLib/src/image/psImageStats.c (revision 3114) +++ trunk/psLib/src/image/psImageStats.c (revision 3115) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.63 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-17 23:25:10 $ + * @version $Revision: 1.64 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:11 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -245,5 +245,5 @@ for (x = 0; x < input->numRows; x++) { for (y = 0; y < input->numCols; y++) { - double pixel; + double pixel = 0.0; if (input->type.type == PS_TYPE_S8) { pixel = (double) input->data.S8[x][y]; Index: trunk/psLib/src/imageops/psImageStats.c =================================================================== --- trunk/psLib/src/imageops/psImageStats.c (revision 3114) +++ trunk/psLib/src/imageops/psImageStats.c (revision 3115) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.63 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-17 23:25:10 $ + * @version $Revision: 1.64 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:11 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -245,5 +245,5 @@ for (x = 0; x < input->numRows; x++) { for (y = 0; y < input->numCols; y++) { - double pixel; + double pixel = 0.0; if (input->type.type == PS_TYPE_S8) { pixel = (double) input->data.S8[x][y]; Index: trunk/psLib/src/math/psMinimize.c =================================================================== --- trunk/psLib/src/math/psMinimize.c (revision 3114) +++ trunk/psLib/src/math/psMinimize.c (revision 3115) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.103 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-26 20:47:41 $ + * @version $Revision: 1.104 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:10 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -96,6 +96,6 @@ XXX: do an F64 version? *****************************************************************************/ -psF32 *CalculateSecondDerivs(const psVector* restrict x, ///< Ordinates (or NULL to just use the indices) - const psVector* restrict y) ///< Coordinates +psF32 *CalculateSecondDerivs(const psVector* x, ///< Ordinates (or NULL to just use the indices) + const psVector* y) ///< Coordinates { psTrace(".psLib.dataManip.CalculateSecondDerivs", 4, @@ -167,6 +167,6 @@ /* psF32 p_psNRSpline1DEval(psSpline1D *spline, - const psVector* restrict x, - const psVector* restrict y, + const psVector* x, + const psVector* y, psF32 X) { @@ -250,8 +250,8 @@ XXX: Assumes mySpline->knots is psF32. Must add psU32 and psF64. *****************************************************************************/ -psSpline1D *psVectorFitSpline1D(psSpline1D *mySpline, ///< The spline which will be generated. - const psVector* restrict x, ///< Ordinates (or NULL to just use the indices) - const psVector* restrict y, ///< Coordinates - const psVector* restrict yErr) ///< Errors in coordinates, or NULL +psSpline1D *psVectorFitSpline1D(psSpline1D *mySpline, ///< The spline which will be generated. + const psVector* x, ///< Ordinates (or NULL to just use the indices) + const psVector* y, ///< Coordinates + const psVector* yErr) ///< Errors in coordinates, or NULL { PS_VECTOR_CHECK_NULL(y, NULL); @@ -833,7 +833,7 @@ *****************************************************************************/ psPolynomial1D *VectorFitPolynomial1DCheby(psPolynomial1D* myPoly, - const psVector* restrict x, - const psVector* restrict y, - const psVector* restrict yErr) + const psVector* x, + const psVector* y, + const psVector* yErr) { psS32 j; @@ -911,7 +911,7 @@ *****************************************************************************/ psPolynomial1D* VectorFitPolynomial1DOrd(psPolynomial1D* myPoly, - const psVector* restrict x, - const psVector* restrict y, - const psVector* restrict yErr) + const psVector* x, + const psVector* y, + const psVector* yErr) { psS32 polyOrder = myPoly->n; @@ -1018,7 +1018,7 @@ *****************************************************************************/ psPolynomial1D* psVectorFitPolynomial1D(psPolynomial1D* myPoly, - const psVector* restrict x, - const psVector* restrict y, - const psVector* restrict yErr) + const psVector* x, + const psVector* y, + const psVector* yErr) { PS_POLY_CHECK_NULL(myPoly, NULL); Index: trunk/psLib/src/math/psMinimize.h =================================================================== --- trunk/psLib/src/math/psMinimize.h (revision 3114) +++ trunk/psLib/src/math/psMinimize.h (revision 3115) @@ -8,6 +8,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-12-22 05:09:32 $ + * @version $Revision: 1.38 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:10 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -65,13 +65,13 @@ psPolynomial1D* psVectorFitPolynomial1D( psPolynomial1D* myPoly, ///< Polynomial to fit - const psVector* restrict x, ///< Ordinates (or NULL to just use the indices) - const psVector* restrict y, ///< Coordinates - const psVector* restrict yErr ///< Errors in coordinates, or NULL + const psVector* x, ///< Ordinates (or NULL to just use the indices) + const psVector* y, ///< Coordinates + const psVector* yErr ///< Errors in coordinates, or NULL ); -psSpline1D *psVectorFitSpline1D(psSpline1D *mySpline, ///< The spline which will be generated. - const psVector* restrict x, ///< Ordinates (or NULL to just use the indices) - const psVector* restrict y, ///< Coordinates - const psVector* restrict yErr ///< Errors in coordinates, or NULL +psSpline1D *psVectorFitSpline1D(psSpline1D *mySpline, ///< The spline which will be generated. + const psVector* x, ///< Ordinates (or NULL to just use the indices) + const psVector* y, ///< Coordinates + const psVector* yErr ///< Errors in coordinates, or NULL ); Index: trunk/psLib/src/math/psPolynomial.c =================================================================== --- trunk/psLib/src/math/psPolynomial.c (revision 3114) +++ trunk/psLib/src/math/psPolynomial.c (revision 3115) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.85 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-26 20:47:41 $ + * @version $Revision: 1.86 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:10 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -1202,6 +1202,6 @@ PS_VECTOR_CHECK_TYPE(x, PS_TYPE_F32, NULL); - psVector *tmp; - psVector *myX; + psVector *tmp = NULL; + psVector *myX = NULL; psS32 i; @@ -1244,7 +1244,7 @@ PS_VECTOR_CHECK_TYPE(y, PS_TYPE_F32, NULL); - psVector *tmp; - psVector *myX; - psVector *myY; + psVector *tmp = NULL; + psVector *myX = NULL; + psVector *myY = NULL; psS32 i; psS32 vecLen=x->n; @@ -1302,8 +1302,8 @@ PS_VECTOR_CHECK_TYPE(z, PS_TYPE_F32, NULL); - psVector *tmp; - psVector *myX; - psVector *myY; - psVector *myZ; + psVector *tmp = NULL; + psVector *myX = NULL; + psVector *myY = NULL; + psVector *myZ = NULL; psS32 i; psS32 vecLen=x->n; @@ -1370,9 +1370,9 @@ PS_VECTOR_CHECK_TYPE(z, PS_TYPE_F32, NULL); - psVector *tmp; - psVector *myW; - psVector *myX; - psVector *myY; - psVector *myZ; + psVector *tmp = NULL; + psVector *myW = NULL; + psVector *myX = NULL; + psVector *myY = NULL; + psVector *myZ = NULL; psS32 i; psS32 vecLen=x->n; @@ -1603,6 +1603,6 @@ PS_VECTOR_CHECK_TYPE(x, PS_TYPE_F64, NULL); - psVector *tmp; - psVector *myX; + psVector *tmp = NULL; + psVector *myX = NULL; psS32 i; @@ -1648,7 +1648,7 @@ PS_VECTOR_CHECK_TYPE(y, PS_TYPE_F64, NULL); - psVector *tmp; - psVector *myX; - psVector *myY; + psVector *tmp = NULL; + psVector *myX = NULL; + psVector *myY = NULL; psS32 i; psS32 vecLen=x->n; @@ -1710,8 +1710,8 @@ PS_VECTOR_CHECK_TYPE(z, PS_TYPE_F64, NULL); - psVector *tmp; - psVector *myX; - psVector *myY; - psVector *myZ; + psVector *tmp = NULL; + psVector *myX = NULL; + psVector *myY = NULL; + psVector *myZ = NULL; psS32 i; psS32 vecLen=x->n; @@ -1782,9 +1782,9 @@ PS_VECTOR_CHECK_TYPE(z, PS_TYPE_F64, NULL); - psVector *tmp; - psVector *myW; - psVector *myX; - psVector *myY; - psVector *myZ; + psVector *tmp = NULL; + psVector *myW = NULL; + psVector *myX = NULL; + psVector *myY = NULL; + psVector *myZ = NULL; psS32 i; psS32 vecLen=x->n; Index: trunk/psLib/src/math/psPolynomial.h =================================================================== --- trunk/psLib/src/math/psPolynomial.h (revision 3114) +++ trunk/psLib/src/math/psPolynomial.h (revision 3115) @@ -12,6 +12,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.40 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-01-26 20:41:04 $ +* @version $Revision: 1.41 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-03 00:54:10 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -429,6 +429,6 @@ psF32 p_psNRSpline1DEval(psSpline1D *spline, - const psVector* restrict x, - const psVector* restrict y, + const psVector* x, + const psVector* y, psF32 X); Index: trunk/psLib/src/math/psSpline.c =================================================================== --- trunk/psLib/src/math/psSpline.c (revision 3114) +++ trunk/psLib/src/math/psSpline.c (revision 3115) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.85 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-26 20:47:41 $ + * @version $Revision: 1.86 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:10 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -1202,6 +1202,6 @@ PS_VECTOR_CHECK_TYPE(x, PS_TYPE_F32, NULL); - psVector *tmp; - psVector *myX; + psVector *tmp = NULL; + psVector *myX = NULL; psS32 i; @@ -1244,7 +1244,7 @@ PS_VECTOR_CHECK_TYPE(y, PS_TYPE_F32, NULL); - psVector *tmp; - psVector *myX; - psVector *myY; + psVector *tmp = NULL; + psVector *myX = NULL; + psVector *myY = NULL; psS32 i; psS32 vecLen=x->n; @@ -1302,8 +1302,8 @@ PS_VECTOR_CHECK_TYPE(z, PS_TYPE_F32, NULL); - psVector *tmp; - psVector *myX; - psVector *myY; - psVector *myZ; + psVector *tmp = NULL; + psVector *myX = NULL; + psVector *myY = NULL; + psVector *myZ = NULL; psS32 i; psS32 vecLen=x->n; @@ -1370,9 +1370,9 @@ PS_VECTOR_CHECK_TYPE(z, PS_TYPE_F32, NULL); - psVector *tmp; - psVector *myW; - psVector *myX; - psVector *myY; - psVector *myZ; + psVector *tmp = NULL; + psVector *myW = NULL; + psVector *myX = NULL; + psVector *myY = NULL; + psVector *myZ = NULL; psS32 i; psS32 vecLen=x->n; @@ -1603,6 +1603,6 @@ PS_VECTOR_CHECK_TYPE(x, PS_TYPE_F64, NULL); - psVector *tmp; - psVector *myX; + psVector *tmp = NULL; + psVector *myX = NULL; psS32 i; @@ -1648,7 +1648,7 @@ PS_VECTOR_CHECK_TYPE(y, PS_TYPE_F64, NULL); - psVector *tmp; - psVector *myX; - psVector *myY; + psVector *tmp = NULL; + psVector *myX = NULL; + psVector *myY = NULL; psS32 i; psS32 vecLen=x->n; @@ -1710,8 +1710,8 @@ PS_VECTOR_CHECK_TYPE(z, PS_TYPE_F64, NULL); - psVector *tmp; - psVector *myX; - psVector *myY; - psVector *myZ; + psVector *tmp = NULL; + psVector *myX = NULL; + psVector *myY = NULL; + psVector *myZ = NULL; psS32 i; psS32 vecLen=x->n; @@ -1782,9 +1782,9 @@ PS_VECTOR_CHECK_TYPE(z, PS_TYPE_F64, NULL); - psVector *tmp; - psVector *myW; - psVector *myX; - psVector *myY; - psVector *myZ; + psVector *tmp = NULL; + psVector *myW = NULL; + psVector *myX = NULL; + psVector *myY = NULL; + psVector *myZ = NULL; psS32 i; psS32 vecLen=x->n; Index: trunk/psLib/src/math/psSpline.h =================================================================== --- trunk/psLib/src/math/psSpline.h (revision 3114) +++ trunk/psLib/src/math/psSpline.h (revision 3115) @@ -12,6 +12,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.40 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-01-26 20:41:04 $ +* @version $Revision: 1.41 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-03 00:54:10 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -429,6 +429,6 @@ psF32 p_psNRSpline1DEval(psSpline1D *spline, - const psVector* restrict x, - const psVector* restrict y, + const psVector* x, + const psVector* y, psF32 X); Index: trunk/psLib/src/math/psStats.c =================================================================== --- trunk/psLib/src/math/psStats.c (revision 3114) +++ trunk/psLib/src/math/psStats.c (revision 3115) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.111 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-26 20:24:17 $ + * @version $Revision: 1.112 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:10 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -145,7 +145,7 @@ this routine sets stats->sampleMean to NAN. *****************************************************************************/ -psS32 p_psVectorSampleMean(const psVector* restrict myVector, - const psVector* restrict errors, - const psVector* restrict maskVector, +psS32 p_psVectorSampleMean(const psVector* myVector, + const psVector* errors, + const psVector* maskVector, psU32 maskVal, psStats* stats) @@ -283,6 +283,6 @@ this routine sets stats->max to NAN. *****************************************************************************/ -psS32 p_psVectorMax(const psVector* restrict myVector, - const psVector* restrict maskVector, +psS32 p_psVectorMax(const psVector* myVector, + const psVector* maskVector, psU32 maskVal, psStats* stats) @@ -348,6 +348,6 @@ this routine sets stats->min to NAN. *****************************************************************************/ -psS32 p_psVectorMin(const psVector* restrict myVector, - const psVector* restrict maskVector, +psS32 p_psVectorMin(const psVector* myVector, + const psVector* maskVector, psU32 maskVal, psStats* stats) @@ -414,6 +414,6 @@ "false". *****************************************************************************/ -bool p_psVectorCheckNonEmpty(const psVector* restrict myVector, - const psVector* restrict maskVector, +bool p_psVectorCheckNonEmpty(const psVector* myVector, + const psVector* maskVector, psU32 maskVal, psStats* stats) @@ -462,6 +462,6 @@ range, if specified. *****************************************************************************/ -psS32 p_psVectorNValues(const psVector* restrict myVector, - const psVector* restrict maskVector, +psS32 p_psVectorNValues(const psVector* myVector, + const psVector* maskVector, psU32 maskVal, psStats* stats) @@ -511,6 +511,6 @@ XXX: Use static vectors for sort arrays. *****************************************************************************/ -bool p_psVectorSampleMedian(const psVector* restrict myVector, - const psVector* restrict maskVector, +bool p_psVectorSampleMedian(const psVector* myVector, + const psVector* maskVector, psU32 maskVal, psStats* stats) @@ -701,6 +701,6 @@ NULL *****************************************************************************/ -bool p_psVectorSampleQuartiles(const psVector* restrict myVector, - const psVector* restrict maskVector, +bool p_psVectorSampleQuartiles(const psVector* myVector, + const psVector* maskVector, psU32 maskVal, psStats* stats) @@ -787,7 +787,7 @@ *****************************************************************************/ -void p_psVectorSampleStdevOLD(const psVector* restrict myVector, - const psVector* restrict errors, - const psVector* restrict maskVector, +void p_psVectorSampleStdevOLD(const psVector* myVector, + const psVector* errors, + const psVector* maskVector, psU32 maskVal, psStats* stats) @@ -881,7 +881,7 @@ *****************************************************************************/ -void p_psVectorSampleStdev(const psVector* restrict myVector, - const psVector* restrict errors, - const psVector* restrict maskVector, +void p_psVectorSampleStdev(const psVector* myVector, + const psVector* errors, + const psVector* maskVector, psU32 maskVal, psStats* stats) @@ -896,5 +896,5 @@ // psF32 sum1; // psF32 sum2; - psF32 errorDivisor; + psF32 errorDivisor = 0.0f; // This procedure requires the mean. If it has not been already @@ -1003,7 +1003,7 @@ -2: warning *****************************************************************************/ -psS32 p_psVectorClippedStats(const psVector* restrict myVector, - const psVector* restrict errors, - const psVector* restrict maskVector, +psS32 p_psVectorClippedStats(const psVector* myVector, + const psVector* errors, + const psVector* maskVector, psU32 maskVal, psStats* stats) @@ -1331,5 +1331,5 @@ psPolynomial1D *myPoly = psPolynomial1DAlloc(2, PS_POLYNOMIAL_ORD); - psF32 tmpFloat; + psF32 tmpFloat = 0.0f; if ((binNum > 0) && (binNum < (yVec->n - 2))) { @@ -1425,7 +1425,7 @@ XXX: Check for errors in psLib routines that we call. *****************************************************************************/ -psS32 p_psVectorRobustStats(const psVector* restrict myVector, - const psVector* restrict errors, - const psVector* restrict maskVector, +psS32 p_psVectorRobustStats(const psVector* myVector, + const psVector* errors, + const psVector* maskVector, psU32 maskVal, psStats* stats) @@ -1820,5 +1820,5 @@ The histogram structure *****************************************************************************/ -psHistogram* psHistogramAllocGeneric(const psVector* restrict bounds) +psHistogram* psHistogramAllocGeneric(const psVector* bounds) { PS_VECTOR_CHECK_NULL(bounds, NULL); @@ -1890,6 +1890,6 @@ psF32 boxcarRight = boxcarCenter + (boxcarWidth / 2.0); psS32 bin; - psS32 boxcarLeftBinNum; - psS32 boxcarRightBinNum; + psS32 boxcarLeftBinNum = 0; + psS32 boxcarRightBinNum = 0; // Determine the left endpoint of the boxcar for the PDF. @@ -1961,7 +1961,7 @@ *****************************************************************************/ psHistogram* psVectorHistogram(psHistogram* out, - const psVector* restrict in, - const psVector* restrict errors, - const psVector* restrict mask, + const psVector* in, + const psVector* errors, + const psVector* mask, psU32 maskVal) { Index: trunk/psLib/src/math/psStats.h =================================================================== --- trunk/psLib/src/math/psStats.h (revision 3114) +++ trunk/psLib/src/math/psStats.h (revision 3115) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-12-22 05:09:32 $ + * @version $Revision: 1.38 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:10 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -143,5 +143,5 @@ */ psHistogram* psHistogramAllocGeneric( - const psVector* restrict bounds ///< Bounds for the bins + const psVector* bounds ///< Bounds for the bins ); @@ -156,8 +156,8 @@ psHistogram* psVectorHistogram( psHistogram* out, ///< Histogram data - const psVector* restrict in, ///< Vector to analyse - const psVector* restrict errors, ///< Errors - const psVector* restrict mask, ///< Mask dat for input vector - psU32 maskVal ///< Mask value + const psVector* in, ///< Vector to analyse + const psVector* errors, ///< Errors + const psVector* mask, ///< Mask dat for input vector + psU32 maskVal ///< Mask value ); Index: trunk/psLib/src/mathtypes/psImage.c =================================================================== --- trunk/psLib/src/mathtypes/psImage.c (revision 3114) +++ trunk/psLib/src/mathtypes/psImage.c (revision 3115) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.57 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-13 03:26:23 $ + * @version $Revision: 1.58 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:11 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -568,8 +568,8 @@ psS32 lastX = input->numCols - 1; \ psS32 lastY = input->numRows - 1; \ - ps##TYPE V00; \ - ps##TYPE V01; \ - ps##TYPE V10; \ - ps##TYPE V11; \ + ps##TYPE V00 = 0; \ + ps##TYPE V01 = 0; \ + ps##TYPE V10 = 0; \ + ps##TYPE V11 = 0; \ psBool valid00 = false; \ psBool valid01 = false; \ @@ -611,5 +611,5 @@ /* OK, at least one pixel is not valid - need to do it piecemeal */ \ \ - psF64 V0; \ + psF64 V0 = 0.0; \ psBool valid0 = true; \ if (valid00 && valid10) { \ @@ -623,5 +623,5 @@ } \ \ - psF64 V1; \ + psF64 V1 = 0.0; \ psBool valid1 = true; \ if (valid01 && valid11) { \ @@ -662,8 +662,8 @@ psS32 lastX = input->numCols - 1; \ psS32 lastY = input->numRows - 1; \ - ps##TYPE V00; \ - ps##TYPE V01; \ - ps##TYPE V10; \ - ps##TYPE V11; \ + ps##TYPE V00 = 0; \ + ps##TYPE V01 = 0; \ + ps##TYPE V10 = 0; \ + ps##TYPE V11 = 0; \ psBool valid00 = false; \ psBool valid01 = false; \ @@ -705,5 +705,5 @@ /* OK, at least one pixel is not valid - need to do it piecemeal */ \ \ - psC64 V0; \ + psC64 V0 = 0; \ psBool valid0 = true; \ if (valid00 && valid10) { \ @@ -717,5 +717,5 @@ } \ \ - psC64 V1; \ + psC64 V1 = 0; \ psBool valid1 = true; \ if (valid01 && valid11) { \ Index: trunk/psLib/src/mathtypes/psImage.h =================================================================== --- trunk/psLib/src/mathtypes/psImage.h (revision 3114) +++ trunk/psLib/src/mathtypes/psImage.h (revision 3115) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.45 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-13 03:26:23 $ + * @version $Revision: 1.46 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:11 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -157,5 +157,5 @@ */ psImage* psImageCopy( - psImage* restrict output, ///< if not NULL, a psImage that could be recycled. + psImage* output, ///< if not NULL, a psImage that could be recycled. const psImage* input, ///< the psImage to copy psElemType type ///< the desired datatype of the returned copy @@ -221,5 +221,5 @@ psC64 unexposedValue /**< return value if x,y location is not in image. */ \ ); - +#ifndef SWIG p_psImagePixelInterpolateFcns(U8) p_psImagePixelInterpolateFcns(U16) @@ -234,4 +234,5 @@ p_psImagePixelInterpolateComplexFcns(C32) p_psImagePixelInterpolateComplexFcns(C64) +#endif /// @} Index: trunk/psLib/src/mathtypes/psVector.c =================================================================== --- trunk/psLib/src/mathtypes/psVector.c (revision 3114) +++ trunk/psLib/src/mathtypes/psVector.c (revision 3115) @@ -10,6 +10,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-12-09 21:30:43 $ +* @version $Revision: 1.33 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-03 00:54:10 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -28,8 +28,8 @@ #include "psCollectionsErrors.h" -static void vectorFree(psVector* restrict psVec); - - -static void vectorFree(psVector* restrict psVec) +static void vectorFree(psVector* psVec); + + +static void vectorFree(psVector* psVec) { if (psVec == NULL) { @@ -64,5 +64,5 @@ } -psVector* psVectorRealloc(psVector* restrict in, psU32 nalloc) +psVector* psVectorRealloc(psVector* in, psU32 nalloc) { psS32 elementSize = 0; @@ -87,5 +87,5 @@ } -psVector* psVectorRecycle(psVector* restrict in, psU32 n, psElemType type) +psVector* psVectorRecycle(psVector* in, psU32 n, psElemType type) { psS32 byteSize; @@ -218,5 +218,5 @@ } -psVector* psVectorSort(psVector* restrict outVector, const psVector* restrict inVector) +psVector* psVectorSort(psVector* outVector, const psVector* inVector) { psS32 N = 0; @@ -302,5 +302,5 @@ } -psVector* psVectorSortIndex(psVector* restrict outVector, const psVector* restrict inVector) +psVector* psVectorSortIndex(psVector* outVector, const psVector* inVector) { psS32 N = 0; Index: trunk/psLib/src/mathtypes/psVector.h =================================================================== --- trunk/psLib/src/mathtypes/psVector.h (revision 3114) +++ trunk/psLib/src/mathtypes/psVector.h (revision 3115) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-17 20:58:21 $ + * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:10 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -84,6 +84,6 @@ */ psVector* psVectorRealloc( - psVector* restrict psVec, ///< Vector to reallocate. - psU32 nalloc ///< Total number of elements to make available. + psVector* psVec, ///< Vector to reallocate. + psU32 nalloc ///< Total number of elements to make available. ); @@ -98,9 +98,9 @@ */ psVector* psVectorRecycle( - psVector* restrict psVec, + psVector* psVec, ///< Vector to recycle. If NULL, a new vector is created. No effort ///< taken to preserve the values. - psU32 nalloc, ///< Total number of elements to make available. + psU32 nalloc, ///< Total number of elements to make available. psElemType type ///< the datatype of the returned vector ); @@ -128,6 +128,6 @@ */ psVector* psVectorSort( - psVector* restrict outVector, ///< the output vector to recycle, or NULL if new vector desired. - const psVector* restrict inVector ///< the vector to sort. + psVector* outVector, ///< the output vector to recycle, or NULL if new vector desired. + const psVector* inVector ///< the vector to sort. ); @@ -140,6 +140,6 @@ */ psVector* psVectorSortIndex( - psVector* restrict outVector, ///< vector to recycle - const psVector* restrict inVector ///< vector to sort + psVector* outVector, ///< vector to recycle + const psVector* inVector ///< vector to sort ); Index: trunk/psLib/src/parseErrorCodes.pl =================================================================== --- trunk/psLib/src/parseErrorCodes.pl (revision 3114) +++ trunk/psLib/src/parseErrorCodes.pl (revision 3115) @@ -54,5 +54,5 @@ my @result = (); - die "Failed to open input file" + die "Failed to open input file '$filename'" if !open( INFILE, "<", $filename ); Index: trunk/psLib/src/psTest.c =================================================================== --- trunk/psLib/src/psTest.c (revision 3115) +++ trunk/psLib/src/psTest.c (revision 3115) @@ -0,0 +1,249 @@ +// +// C Implementation: psTest +// +// Description: +// +// +// Author: Robert DeSonia , (C) 2004 +// +// Copyright: See COPYING file that comes with this distribution +// +// + + +#include +#include +#include +#include +#include + +#include "psTest.h" +#include "psMemory.h" +#include "psError.h" +#include "psTrace.h" + +#define HEADER_TOP "/***************************** TESTPOINT ******************************************\\\n" +#define HEADER_LINE_STRING "* %20s: %-58s *\n" +#define HEADER_LINE_INT "* %20s: %-58d *\n" +#define HEADER_BOTTOM "\\**********************************************************************************/\n\n" + +psBool p_runTestSuite( FILE *fp, const char* testPointFile, const char* packageName, + testDescription tests[], psS32 argc, char * const argv[] ) +{ + psBool success = true; + psBool runAll = true; + psBool useFork = true; + psBool found; + psS32 c; + psS32 n; + extern char *optarg; + + if ( argc > 0 ) { + while ( ( c = getopt( argc, argv, "lhn:dt:" ) ) != -1 ) { + switch ( c ) { + case 'h': + printf( "Usage: %s [-l] [-d] [-h] [-n=Testpoint#] [-t=TestpointName]\n" + " where:\n" + " -l : lists the testpoints contained in this test driver executable\n" + " -d : turns on debugger-friendly mode (no forking, aborts/signals are not handled)\n" + " -h : prints this help\n" + " -n : specifies a particular testpoint by number to run\n" + " -t : specifies a particular testpoint by name to run\n" + " (if no -l, -n or -t options are given, all testpoints are run)\n", + argv[ 0 ] ); + runAll = false; + break; + case 'd': + useFork = false; + break; + case 'l': + printf( "Test Driver: %s\n", testPointFile ); + printf( "Package Name: %s\n", packageName ); + printf( "Testpoints:\n" ); + runAll = false; + for ( psS32 index = 0; tests[ index ].fcn != NULL; index++ ) { + printf( " %6d - %s \n", tests[ index ].testPointNumber, + tests[ index ].testPointName ); + } + printf( "\n" ); + break; + case 't': + runAll = false; + for ( psS32 index = 0; tests[ index ].fcn != NULL; index++ ) { + if ( strcmp( optarg, tests[ index ].testPointName ) == 0 ) { + success = p_runTest( fp, + testPointFile, + packageName, + tests[ index ].testPointName, + tests[ index ].fcn, + tests[ index ].expectedReturn, + useFork ) && success; + } + } + break; + case 'n': + runAll = false; + if ( sscanf( optarg, "%i", &n ) != 1 ) { + psError(PS_ERR_UNKNOWN, true, "Failed to parse the testpoint number (%s).", + optarg ); + break; + } + found = false; + for ( psS32 index = 0; tests[ index ].fcn != NULL; index++ ) { + if ( n == tests[ index ].testPointNumber ) { + found = true; + success = p_runTest( fp, + testPointFile, + packageName, + tests[ index ].testPointName, + tests[ index ].fcn, + tests[ index ].expectedReturn, + useFork ) && success; + } + } + if ( ! found ) { + psError(PS_ERR_UNKNOWN, true, "The specified testpoint number (%d) doesn't exist in this test driver.", + n ); + break; + } + break; + case '?': + psError(PS_ERR_UNKNOWN, true, "Option %s is not recognized and is ignored.", optarg ); + break; + } + } + } + + if ( runAll ) { + for ( psS32 index = 0; tests[ index ].fcn != NULL; index++ ) { + if ( ! tests[ index ].isDuplicateEntry ) { + success = p_runTest( fp, + testPointFile, + packageName, + tests[ index ].testPointName, + tests[ index ].fcn, + tests[ index ].expectedReturn, + useFork ) && success; + } + } + } + + if ( ! success ) { + psError( PS_ERR_UNKNOWN, true, + "One or more tests failed" ); + } + + return success; +} + +psBool p_runTest( FILE *fp, const char* testPointFile, const char* packageName, const char* testPointName, + testFcn fcn, psS32 expectedReturn, psBool useFork ) +{ + psS32 childReturn = 0; + pid_t child; + + p_printPositiveTestHeader( fp, testPointFile, packageName, testPointName ); + + if ( useFork ) { + child = fork(); + if ( child == 0 ) { // I am the child process, run the test + psS32 currentId = psMemGetId(); + psS32 retVal = fcn(); + fflush(stdout); + fflush(stderr); + if ( retVal == 0 ) { // only bother checking memory if test executed to end. + if ( psMemCheckLeaks( currentId, NULL, stderr, false ) != 0 ) { + psError(PS_ERR_UNKNOWN, true, "Memory Leaks Detected" ); + retVal = 64; + } + psMemCheckCorruption( 1 ); + } + exit( retVal ); + } else + if ( child < 0 ) { + fprintf( fp, "Couldn't fork a process to run a negative test (%s|%s)", + packageName, testPointName ); + abort(); + } + + waitpid( child, &childReturn, 0 ); + if ( WIFSIGNALED( childReturn ) ) { + childReturn = -WTERMSIG( childReturn ); + } else { + childReturn = WEXITSTATUS( childReturn ); + } + } else { + psS32 currentId = psMemGetId(); + childReturn = fcn(); + fflush(stdout); + fflush(stderr); + if ( childReturn == 0 ) { // only bother checking memory if test executed to end. + if ( psMemCheckLeaks( currentId, NULL, stderr, false ) != 0 ) { + psError(PS_ERR_UNKNOWN, true, "Memory Leaks Detected" ); + childReturn = 64; + } + psMemCheckCorruption( 1 ); + } + } + + + if ( childReturn != expectedReturn ) { + fprintf( fp, "Return value mismatch: expected %d, got %d", + expectedReturn, childReturn ); + } + + p_printFooter( fp, testPointFile, packageName, testPointName, + ( childReturn == expectedReturn ) ); + + return ( childReturn == expectedReturn ); +} + +void p_printPositiveTestHeader( FILE *fp, + const char* testPointFile, + const char* packageName, + const char* testPointName ) +{ + char TP[ 80 ]; + + snprintf( TP, 80, "%s{%s}", packageName, testPointName ); + + fprintf( fp, HEADER_TOP ); + fprintf( fp, HEADER_LINE_STRING, "TestFile", testPointFile ); + fprintf( fp, HEADER_LINE_STRING, "TestPoint", TP ); + fprintf( fp, HEADER_LINE_STRING, "TestType", "Positive" ); + fprintf( fp, HEADER_BOTTOM ); +} + +void p_printNegativeTestHeader( FILE *fp, + const char* testPointFile, + const char* packageName, + const char* testPointName, + const char* expectedError, + psS32 exitValue ) +{ + char TP[ 80 ]; + + snprintf( TP, 80, "%s{%s}", packageName, testPointName ); + + fprintf( fp, HEADER_TOP ); + fprintf( fp, HEADER_LINE_STRING, "TestFile", testPointFile ); + fprintf( fp, HEADER_LINE_STRING, "TestPoint", TP ); + fprintf( fp, HEADER_LINE_STRING, "TestType", "Negative" ); + fprintf( fp, HEADER_LINE_STRING, "ExpectedErrorText", expectedError ); + fprintf( fp, HEADER_LINE_INT, "ExpectedStatusValue", exitValue ); + fprintf( fp, HEADER_BOTTOM ); +} + + +void p_printFooter( FILE *fp, + const char* testPointFile, + const char* packageName, + const char* testPointName, + psBool success ) +{ + if ( success ) { + fprintf( fp, "\n---> TESTPOINT PASSED (%s{%s} | %s)\n\n", packageName, testPointName, testPointFile ); + } else { + fprintf( fp, "\n---> TESTPOINT FAILED (%s{%s} | %s)\n\n", packageName, testPointName, testPointFile ); + } +} Index: trunk/psLib/src/psTest.h =================================================================== --- trunk/psLib/src/psTest.h (revision 3115) +++ trunk/psLib/src/psTest.h (revision 3115) @@ -0,0 +1,82 @@ + +#ifndef PSTEST_H +#define PSTEST_H + +#include + +#include "psType.h" + +#define printPositiveTestHeader(filePtr, packageName, testPointName) \ +p_printPositiveTestHeader(filePtr, __FILE__, packageName, testPointName) + +#define printNegativeTestHeader(filePtr, packageName, testPointName, expectedError, exitValue) \ +p_printNegativeTestHeader(filePtr, __FILE__, packageName, testPointName, expectedError, exitValue) + +#define printFooter(filePtr, packageName, testPointName, success) \ +p_printFooter(filePtr, __FILE__, packageName, testPointName, success) + +typedef psS32 (*testFcn)(void); + +typedef struct +{ + testFcn fcn; + psS32 testPointNumber; + const char* testPointName; + psS32 expectedReturn; + psBool isDuplicateEntry; +} +testDescription; + +#define runTest(filePtr, packageName, testPointName, fcn, expectedReturn, useFork) \ +p_runTest(filePtr, __FILE__, packageName, testPointName, fcn, expectedReturn, useFork) + +#define runTestSuite(filePtr, packageName, tests, argc, argv) \ +p_runTestSuite(filePtr, __FILE__, packageName, tests, argc, argv) + + +/////////////////////////// PRIVATE FUNCTIONS ////////////////////////////// + +psBool p_runTest( + FILE *fp, + const char* testPointFile, + const char* packageName, + const char* testPointName, + testFcn fcn, + psS32 expectedReturn, + psBool useFork +); + +psBool p_runTestSuite( + FILE *fp, + const char* testPointFile, + const char* packageName, + testDescription tests[], + psS32 argc, + char * const argv[] +); + +void p_printPositiveTestHeader( + FILE *fp, + const char* testPointFile, + const char* packageName, + const char* testPointName +); + +void p_printNegativeTestHeader( + FILE *fp, + const char* testPointFile, + const char* packageName, + const char* testPointName, + const char* expectedError, + psS32 exitValue +); + +void p_printFooter( + FILE *fp, + const char* testPointFile, + const char* packageName, + const char* testPointName, + psBool success +); + +#endif Index: trunk/psLib/src/pslib.h =================================================================== --- trunk/psLib/src/pslib.h (revision 3114) +++ trunk/psLib/src/pslib.h (revision 3115) @@ -9,6 +9,6 @@ * @author Eric Van Alst, MHPCC * -* @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-01-12 22:17:01 $ +* @version $Revision: 1.30 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-03 00:54:10 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -24,5 +24,5 @@ /******************************************************************************/ -// System Utilities +// // System Utilities /// @defgroup SysUtils System Utilities @@ -130,4 +130,6 @@ #include "psMatrixVectorArithmetic.h" +#include "psRandom.h" + /// @defgroup Transform Fourier Transform Operations /// @ingroup DataManip Index: trunk/psLib/src/sys/psConfigure.c =================================================================== --- trunk/psLib/src/sys/psConfigure.c (revision 3114) +++ trunk/psLib/src/sys/psConfigure.c (revision 3115) @@ -12,6 +12,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-03 23:35:07 $ + * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:11 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -22,15 +22,12 @@ #include "psConfigure.h" #include "psSysUtilsErrors.h" - - -#ifndef PS_LIB_VERSION -#define PS_LIB_VERSION "psLib version unknown" -#pragma warning PS_LIB_VERSION was not defined in the makefile. -#endif +#include "config.h" char* psLibVersion(void) { - // PS_LIB_VERSION comes from Makefile.Globals - return(psStringCopy(PS_LIB_VERSION)); + char version[80]; + snprintf(version,80,"%s-v%s",PACKAGE,VERSION); + + return(psStringCopy(version)); } Index: trunk/psLib/src/sys/psError.h =================================================================== --- trunk/psLib/src/sys/psError.h (revision 3114) +++ trunk/psLib/src/sys/psError.h (revision 3115) @@ -12,6 +12,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-13 19:50:45 $ + * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:11 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -90,4 +90,5 @@ ); +#ifndef SWIG /** Prints error stack to specified open file descriptor * @@ -103,4 +104,5 @@ va_list va ///< any parameters required in fmt ); +#endif /** Reports an error message to the logging facility Index: trunk/psLib/src/sys/psLogMsg.h =================================================================== --- trunk/psLib/src/sys/psLogMsg.h (revision 3114) +++ trunk/psLib/src/sys/psLogMsg.h (revision 3115) @@ -11,6 +11,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-27 00:57:31 $ + * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:11 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -74,4 +74,5 @@ ); +#ifndef SWIG /** This procedure is functionally equivalent to psLogMsg(), except that * it takes a va_list as the message parameter, not a printf-style string. @@ -84,4 +85,5 @@ va_list ap ///< varargs argument list ); +#endif ///< Status codes for log messages Index: trunk/psLib/src/sys/psTrace.c =================================================================== --- trunk/psLib/src/sys/psTrace.c (revision 3114) +++ trunk/psLib/src/sys/psTrace.c (revision 3115) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.40 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-12-02 21:12:52 $ + * @version $Revision: 1.41 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:11 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -125,5 +125,5 @@ for (i = 0; i < currentNode->n; i++) { if (NULL == currentNode->subcomp[i]) { - psLogMsg(PS_ERRORNAME_DOMAIN "p_psTraceReset", PS_LOG_WARN, + psLogMsg("p_psTraceReset", PS_LOG_WARN, PS_ERRORTEXT_psTrace_NULL_SUBCOMPONENT, i, currentNode->name); @@ -327,5 +327,5 @@ for (i = 0; i < currentNode->n; i++) { if (NULL == currentNode->subcomp[i]) { - psLogMsg(PS_ERRORNAME_DOMAIN "p_psTraceReset", PS_LOG_WARN, + psLogMsg("p_psTraceReset", PS_LOG_WARN, PS_ERRORTEXT_psTrace_NULL_SUBCOMPONENT, i, currentNode->name); Index: trunk/psLib/src/sys/psType.h =================================================================== --- trunk/psLib/src/sys/psType.h (revision 3114) +++ trunk/psLib/src/sys/psType.h (revision 3115) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-01-17 20:58:21 $ +* @version $Revision: 1.28 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-03 00:54:11 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -51,6 +51,19 @@ typedef float psF32; ///< 32-bit floating point typedef double psF64; ///< 64-bit floating point +#ifdef SWIG +typedef struct +{ + float re, im; +} +psC32; +typedef struct +{ + double re,im; +} +psC64; +#else typedef float _Complex psC32; ///< complex with 32-bit floating point Real and Imagary numbers typedef double _Complex psC64; ///< complex with 64-bit floating point Real and Imagary numbers +#endif typedef void* psPtr; ///< void pointer typedef bool psBool; ///< boolean value Index: trunk/psLib/src/sysUtils/Makefile =================================================================== --- trunk/psLib/src/sysUtils/Makefile (revision 3114) +++ trunk/psLib/src/sysUtils/Makefile (revision 3115) @@ -1,96 +1,509 @@ -############################################################################### -## -## Makefile: sysUtils -## -## $Revision: 1.24 $ $Name: not supported by cvs2svn $ -## $Date: 2005-01-03 23:41:36 $ -## -## 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 = libpslib.a - -# Include the make global definitions for the project - -include ../Makefile.Globals - -# Set CFLAGS used by the implicit rule to compile .c - -CFLAGS := $(CFLAGS_RELOC) -DPS_LIB_VERSION="\"$(PS_LIB_VERSION)\"" -I../collections -I../dataManip -I../sysUtils -I../include -I../astronomy -I../image -I.. - -# Define the source objects - -SRC_OBJS = psMemory.o \ - psError.o \ - psTrace.o \ - psLogMsg.o \ - psAbort.o \ - psString.o \ - psConfigure.o \ - psErrorCodes.o - -OBJS = $(addprefix makedir/,$(SRC_OBJS)) - -HEADERS = $(SRC_OBJS:.o=.h) psType.h - -# Define PHONY target "all" which will make all the necessary items - -all: $(TARGET_STATIC) - -psErrorCodes.h: ../psErrorCodes.dat - perl ../parseErrorCodes.pl --data=$? $@ - -psErrorCodes.c: ../psErrorCodes.dat - perl ../parseErrorCodes.pl --data=$? $@ +# Makefile.in generated by automake 1.9.1 from Makefile.am. +# src/sysUtils/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 = $(libpslibsysUtils_la_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 +subdir = src/sysUtils +DIST_COMMON = README $(pslibinclude_HEADERS) $(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 = +LTLIBRARIES = $(noinst_LTLIBRARIES) +libpslibsysUtils_la_LIBADD = +am_libpslibsysUtils_la_OBJECTS = psMemory.lo psError.lo psTrace.lo \ + psLogMsg.lo psAbort.lo psString.lo psConfigure.lo \ + psErrorCodes.lo +libpslibsysUtils_la_OBJECTS = $(am_libpslibsysUtils_la_OBJECTS) +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 = $(libpslibsysUtils_la_SOURCES) +DIST_SOURCES = $(libpslibsysUtils_la_SOURCES) +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(pslibincludedir)" +pslibincludeHEADERS_INSTALL = $(INSTALL_HEADER) +HEADERS = $(pslibinclude_HEADERS) +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 sysUtils functions of psLib +# +INCLUDES = \ + -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 \ + $(all_includes) + +noinst_LTLIBRARIES = libpslibsysUtils.la +libpslibsysUtils_la_SOURCES = \ + psMemory.c \ + psError.c \ + psTrace.c \ + psLogMsg.c \ + psAbort.c \ + psString.c \ + psConfigure.c \ + psErrorCodes.c + +BUILT_SOURCES = psSysUtilsErrors.h +EXTRA_DIST = psSysUtilsErrors.dat psSysUtilsErrors.h +pslibincludedir = $(includedir)/pslib +pslibinclude_HEADERS = \ + psType.h \ + psMemory.h \ + psError.h \ + psTrace.h \ + psLogMsg.h \ + psAbort.h \ + psString.h \ + psConfigure.h \ + psErrorCodes.h + +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 src/sysUtils/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/sysUtils/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-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libpslibsysUtils.la: $(libpslibsysUtils_la_OBJECTS) $(libpslibsysUtils_la_DEPENDENCIES) + $(LINK) $(libpslibsysUtils_la_LDFLAGS) $(libpslibsysUtils_la_OBJECTS) $(libpslibsysUtils_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +include ./$(DEPDIR)/psAbort.Plo +include ./$(DEPDIR)/psConfigure.Plo +include ./$(DEPDIR)/psError.Plo +include ./$(DEPDIR)/psErrorCodes.Plo +include ./$(DEPDIR)/psLogMsg.Plo +include ./$(DEPDIR)/psMemory.Plo +include ./$(DEPDIR)/psString.Plo +include ./$(DEPDIR)/psTrace.Plo + +.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: +install-pslibincludeHEADERS: $(pslibinclude_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(pslibincludedir)" || $(mkdir_p) "$(DESTDIR)$(pslibincludedir)" + @list='$(pslibinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(pslibincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pslibincludedir)/$$f'"; \ + $(pslibincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pslibincludedir)/$$f"; \ + done + +uninstall-pslibincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(pslibinclude_HEADERS)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(pslibincludedir)/$$f'"; \ + rm -f "$(DESTDIR)$(pslibincludedir)/$$f"; \ + 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: $(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 + +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 +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am +all-am: Makefile $(LTLIBRARIES) $(HEADERS) +installdirs: + for dir in "$(DESTDIR)$(pslibincludedir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done +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-generic clean-libtool clean-noinstLTLIBRARIES \ + 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-pslibincludeHEADERS + +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 uninstall-pslibincludeHEADERS + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES 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-pslibincludeHEADERS 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 \ + uninstall-pslibincludeHEADERS + psSysUtilsErrors.h: psSysUtilsErrors.dat - perl ../parseErrorCodes.pl --data=$? $@ - - -# Rule to make static library - -libpslib.a: $(OBJS) -# The ar option -r is to add/replace object and -s is to create -# a symbol table in the archive - $(AR) rcs ../$@ $(OBJS) - -# Define PHONY target "install" which will install necessary files - -install: $(TARGET_STATIC) - install $(HEADERS) $(includedir) - -# Define PHONY target "distclean" which will cleanup the distribution - -distclean: clean - $(RM) ../$(TARGET_STATIC) - -# Define PHONY target "clean" which will cleanup the development area - -clean: - @echo " Deleting intermediate files for 'sysUtils'" - $(RM) $(OBJS) *.lint - -cleandep: - $(RM) $(OBJS:.o=.d) - -%.lint: %.c - splint +posixlib -exportlocal -realcompare $(INCLUDE_GLOBAL) $? > $@; cat $@ - -makedir/%.o: %.c - $(CC) -c $(CFLAGS) -o $@ $< - -makedir/%.d: %.c - $(CC) -MM $(CFLAGS) $< > $@.tmp - sed 's|\($*\)\.o[ :]*|\1.o $@ : |g' $@.tmp > $@ - $(RM) -f $@.tmp - -include $(OBJS:.o=.d) + perl $(top_srcdir)/src/parseErrorCodes.pl --data=$? $@ +# 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/src/sysUtils/Makefile.am =================================================================== --- trunk/psLib/src/sysUtils/Makefile.am (revision 3115) +++ trunk/psLib/src/sysUtils/Makefile.am (revision 3115) @@ -0,0 +1,40 @@ +#Makefile for sysUtils functions of psLib +# +INCLUDES = \ + -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 \ + $(all_includes) + +noinst_LTLIBRARIES = libpslibsysUtils.la + +libpslibsysUtils_la_SOURCES = \ + psMemory.c \ + psError.c \ + psTrace.c \ + psLogMsg.c \ + psAbort.c \ + psString.c \ + psConfigure.c \ + psErrorCodes.c + +BUILT_SOURCES = psSysUtilsErrors.h +EXTRA_DIST = psSysUtilsErrors.dat psSysUtilsErrors.h + +psSysUtilsErrors.h: psSysUtilsErrors.dat + perl $(top_srcdir)/src/parseErrorCodes.pl --data=$? $@ + +pslibincludedir = $(includedir)/pslib +pslibinclude_HEADERS = \ + psType.h \ + psMemory.h \ + psError.h \ + psTrace.h \ + psLogMsg.h \ + psAbort.h \ + psString.h \ + psConfigure.h \ + psErrorCodes.h + Index: trunk/psLib/src/sysUtils/psConfigure.c =================================================================== --- trunk/psLib/src/sysUtils/psConfigure.c (revision 3114) +++ trunk/psLib/src/sysUtils/psConfigure.c (revision 3115) @@ -12,6 +12,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-03 23:35:07 $ + * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:11 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -22,15 +22,12 @@ #include "psConfigure.h" #include "psSysUtilsErrors.h" - - -#ifndef PS_LIB_VERSION -#define PS_LIB_VERSION "psLib version unknown" -#pragma warning PS_LIB_VERSION was not defined in the makefile. -#endif +#include "config.h" char* psLibVersion(void) { - // PS_LIB_VERSION comes from Makefile.Globals - return(psStringCopy(PS_LIB_VERSION)); + char version[80]; + snprintf(version,80,"%s-v%s",PACKAGE,VERSION); + + return(psStringCopy(version)); } Index: trunk/psLib/src/sysUtils/psError.h =================================================================== --- trunk/psLib/src/sysUtils/psError.h (revision 3114) +++ trunk/psLib/src/sysUtils/psError.h (revision 3115) @@ -12,6 +12,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-13 19:50:45 $ + * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:11 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -90,4 +90,5 @@ ); +#ifndef SWIG /** Prints error stack to specified open file descriptor * @@ -103,4 +104,5 @@ va_list va ///< any parameters required in fmt ); +#endif /** Reports an error message to the logging facility Index: trunk/psLib/src/sysUtils/psLogMsg.h =================================================================== --- trunk/psLib/src/sysUtils/psLogMsg.h (revision 3114) +++ trunk/psLib/src/sysUtils/psLogMsg.h (revision 3115) @@ -11,6 +11,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-27 00:57:31 $ + * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:11 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -74,4 +74,5 @@ ); +#ifndef SWIG /** This procedure is functionally equivalent to psLogMsg(), except that * it takes a va_list as the message parameter, not a printf-style string. @@ -84,4 +85,5 @@ va_list ap ///< varargs argument list ); +#endif ///< Status codes for log messages Index: trunk/psLib/src/sysUtils/psSysUtilsErrors.h =================================================================== --- trunk/psLib/src/sysUtils/psSysUtilsErrors.h (revision 3114) +++ trunk/psLib/src/sysUtils/psSysUtilsErrors.h (revision 3115) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-12-02 21:12:52 $ + * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:11 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -26,6 +26,4 @@ * DO NOT EDIT THE LINES BETWEEN //~Start and //~End! ANY CHANGES WILL BE OVERWRITTEN. */ - -#define PS_ERRORNAME_DOMAIN "psLib.sysUtils." //~Start #define PS_ERRORTEXT_$1 "$2" Index: trunk/psLib/src/sysUtils/psTrace.c =================================================================== --- trunk/psLib/src/sysUtils/psTrace.c (revision 3114) +++ trunk/psLib/src/sysUtils/psTrace.c (revision 3115) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.40 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-12-02 21:12:52 $ + * @version $Revision: 1.41 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:11 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -125,5 +125,5 @@ for (i = 0; i < currentNode->n; i++) { if (NULL == currentNode->subcomp[i]) { - psLogMsg(PS_ERRORNAME_DOMAIN "p_psTraceReset", PS_LOG_WARN, + psLogMsg("p_psTraceReset", PS_LOG_WARN, PS_ERRORTEXT_psTrace_NULL_SUBCOMPONENT, i, currentNode->name); @@ -327,5 +327,5 @@ for (i = 0; i < currentNode->n; i++) { if (NULL == currentNode->subcomp[i]) { - psLogMsg(PS_ERRORNAME_DOMAIN "p_psTraceReset", PS_LOG_WARN, + psLogMsg("p_psTraceReset", PS_LOG_WARN, PS_ERRORTEXT_psTrace_NULL_SUBCOMPONENT, i, currentNode->name); Index: trunk/psLib/src/sysUtils/psType.h =================================================================== --- trunk/psLib/src/sysUtils/psType.h (revision 3114) +++ trunk/psLib/src/sysUtils/psType.h (revision 3115) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-01-17 20:58:21 $ +* @version $Revision: 1.28 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-03 00:54:11 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -51,6 +51,19 @@ typedef float psF32; ///< 32-bit floating point typedef double psF64; ///< 64-bit floating point +#ifdef SWIG +typedef struct +{ + float re, im; +} +psC32; +typedef struct +{ + double re,im; +} +psC64; +#else typedef float _Complex psC32; ///< complex with 32-bit floating point Real and Imagary numbers typedef double _Complex psC64; ///< complex with 64-bit floating point Real and Imagary numbers +#endif typedef void* psPtr; ///< void pointer typedef bool psBool; ///< boolean value Index: trunk/psLib/src/sysUtils/sysUtils.i =================================================================== --- trunk/psLib/src/sysUtils/sysUtils.i (revision 3115) +++ trunk/psLib/src/sysUtils/sysUtils.i (revision 3115) @@ -0,0 +1,10 @@ +/* sysUtils */ +%include "psAbort.h" +%include "psConfigure.h" +%include "psErrorCodes.h" +%include "psError.h" +%include "psLogMsg.h" +%include "psMemory.h" +%include "psString.h" +%include "psTrace.h" +%include "psType.h" Index: trunk/psLib/src/types/psArray.c =================================================================== --- trunk/psLib/src/types/psArray.c (revision 3114) +++ trunk/psLib/src/types/psArray.c (revision 3115) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.22 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-12-30 20:18:36 $ + * @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:10 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -33,7 +33,7 @@ FUNCTION IMPLEMENTATION - LOCAL *****************************************************************************/ -static void arrayFree(psArray* restrict psArr); +static void arrayFree(psArray* psArr); -static void arrayFree(psArray* restrict psArr) +static void arrayFree(psArray* psArr) { if (psArr == NULL) { @@ -66,5 +66,5 @@ } -psArray* psArrayRealloc(psArray* restrict in, psU32 nalloc) +psArray* psArrayRealloc(psArray* in, psU32 nalloc) { if (in == NULL) { @@ -134,5 +134,5 @@ } -void psArrayElementFree(psArray* restrict psArr) +void psArrayElementFree(psArray* psArr) { Index: trunk/psLib/src/types/psArray.h =================================================================== --- trunk/psLib/src/types/psArray.h (revision 3114) +++ trunk/psLib/src/types/psArray.h (revision 3115) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-12-23 01:14:52 $ + * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:10 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -55,5 +55,5 @@ */ psArray* psArrayAlloc( - psU32 nalloc ///< Total number of elements to make available. + psU32 nalloc ///< Total number of elements to make available. ); @@ -67,5 +67,5 @@ */ psArray* psArrayRealloc( - psArray* restrict psArr, ///< array to reallocate. + psArray* psArr, ///< array to reallocate. psU32 nalloc ///< Total number of elements to make available. ); @@ -104,5 +104,5 @@ */ void psArrayElementFree( - psArray* restrict psArr ///< Void pointer array to destroy. + psArray* psArr ///< Void pointer array to destroy. ); Index: trunk/psLib/src/types/psBitSet.c =================================================================== --- trunk/psLib/src/types/psBitSet.c (revision 3114) +++ trunk/psLib/src/types/psBitSet.c (revision 3115) @@ -11,6 +11,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-11-04 01:04:57 $ + * @version $Revision: 1.21 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:10 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -38,5 +38,5 @@ }; -static void bitSetFree(psBitSet* restrict inBitSet); +static void bitSetFree(psBitSet* inBitSet); /** Private function to create a mask. @@ -58,5 +58,5 @@ } -static void bitSetFree(psBitSet* restrict inBitSet) +static void bitSetFree(psBitSet* inBitSet) { if (inBitSet == NULL) { @@ -161,7 +161,7 @@ psBitSet* psBitSetOp(psBitSet* outBitSet, - const psBitSet* restrict inBitSet1, + const psBitSet* inBitSet1, char *operator, - const psBitSet* restrict inBitSet2) + const psBitSet* inBitSet2) { psS32 i = 0; @@ -264,5 +264,5 @@ break; default: - psAbort(PS_ERRORNAME_DOMAIN "psBitSetOp", + psAbort("psBitSetOp", "Unexpected error - operator parsed successfully but not valid?"); } @@ -272,5 +272,5 @@ psBitSet* psBitSetNot(psBitSet* outBitSet, - const psBitSet* restrict inBitSet) + const psBitSet* inBitSet) { if (inBitSet == NULL) { @@ -291,5 +291,5 @@ } -char *psBitSetToString(const psBitSet* restrict inBitSet) +char *psBitSetToString(const psBitSet* inBitSet) { psS32 i = 0; Index: trunk/psLib/src/types/psBitSet.h =================================================================== --- trunk/psLib/src/types/psBitSet.h (revision 3114) +++ trunk/psLib/src/types/psBitSet.h (revision 3115) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-27 00:57:31 $ + * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-03 00:54:10 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -56,5 +56,5 @@ /*@null@*/ psBitSet* psBitSetAlloc( - psS32 n ///< Number of bits in psBitSet array + psS32 n ///< Number of bits in psBitSet array ); @@ -69,6 +69,6 @@ psBitSet* psBitSetSet( /* @returned@ */ - psBitSet* restrict inMask, ///< Pointer to psBitSet to be set. - psS32 bit ///< Bit to be set. + psBitSet* inMask, ///< Pointer to psBitSet to be set. + psS32 bit ///< Bit to be set. ); @@ -83,6 +83,6 @@ psBitSet* psBitSetClear( /* @returned@ */ - psBitSet* restrict inMask, ///< Pointer to psBitSet to be cleared. - psS32 bit ///< Bit to be cleared. + psBitSet* inMask, ///< Pointer to psBitSet to be cleared. + psS32 bit ///< Bit to be cleared. ); @@ -98,6 +98,6 @@ psBool psBitSetTest( - const psBitSet* restrict inMask, ///< Pointer psBitSet to be tested. - psS32 bit ///< Bit to be tested. + const psBitSet* inMask, ///< Pointer psBitSet to be tested. + psS32 bit ///< Bit to be tested. ); @@ -111,8 +111,8 @@ psBitSet* psBitSetOp( /* @returned@ */ - psBitSet* restrict outMask, ///< Resulting psBitSet from binary operation - const psBitSet* restrict inMask1, ///< First psBitSet on which to operate + psBitSet* outMask, ///< Resulting psBitSet from binary operation + const psBitSet* inMask1, ///< First psBitSet on which to operate char *operator, ///< Bit operation - const psBitSet* restrict inMask2 ///< First psBitSet on which to operate + const psBitSet* inMask2 ///< First psBitSet on which to operate ); @@ -126,5 +126,5 @@ psBitSet* psBitSetNot( psBitSet* outBitSet, ///< Resulting psBitSet from operation - const psBitSet* restrict inBitSet ///< Input psBitSet + const psBitSet* inBitSet ///< Input psBitSet ); @@ -138,5 +138,5 @@ char *psBitSetToString( - const psBitSet* restrict inMask ///< psBitSet to convert */ + const psBitSet* inMask ///< psBitSet to convert */ ); Index: trunk/psLib/src/types/psLookupTable.c =================================================================== --- trunk/psLib/src/types/psLookupTable.c (revision 3114) +++ trunk/psLib/src/types/psLookupTable.c (revision 3115) @@ -7,6 +7,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-12-16 18:53:02 $ +* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-03 00:54:11 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -455,5 +455,5 @@ psU64 failedLines = 0; FILE *fp = NULL; - psElemType elemType; + psElemType elemType = PS_TYPE_PTR; psVector *indexVec = NULL; psVector *valuesVec = NULL;