Index: trunk/psLib/.cvsignore
===================================================================
--- trunk/psLib/.cvsignore	(revision 3125)
+++ trunk/psLib/.cvsignore	(revision 3127)
@@ -1,2 +1,3 @@
+DoxygenLog
 bin
 lib
Index: trunk/psLib/Doxyfile
===================================================================
--- trunk/psLib/Doxyfile	(revision 3127)
+++ trunk/psLib/Doxyfile	(revision 3127)
@@ -0,0 +1,1079 @@
+# Doxyfile 1.3.4
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
+# by quotes) that should identify the project.
+
+PROJECT_NAME           = "Pan-STARRS Foundation Library"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
+# if some version control system is used.
+
+PROJECT_NUMBER         = V1.4-R5
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = docs
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch,
+# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en
+# (Japanese with English messages), Korean, Norwegian, Polish, Portuguese,
+# Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
+
+OUTPUT_LANGUAGE        = English
+
+# This tag can be used to specify the encoding used in the generated output.
+# The encoding is not always determined by the language that is chosen,
+# but also whether or not the output is meant for Windows or non-Windows users.
+# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES
+# forces the Windows encoding (this is the default for the Windows binary),
+# whereas setting the tag to NO uses a Unix-style encoding (the default for
+# all platforms other than Windows).
+
+USE_WINDOWS_ENCODING   = NO
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
+# description.
+
+ALWAYS_DETAILED_SEC    = YES
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited
+# members of a class in the documentation of that class as if those members were
+# ordinary class members. Constructors, destructors and assignment operators of
+# the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. It is allowed to use relative paths in the argument list.
+
+STRIP_FROM_PATH        =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful is your file systems
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like the Qt-style comments (thus requiring an
+# explict @brief command for a brief description.
+
+JAVADOC_AUTOBRIEF      = YES
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the DETAILS_AT_TOP tag is set to YES then Doxygen
+# will output the detailed description near the top, like JavaDoc.
+# If set to NO, the detailed description appears after the member
+# documentation.
+
+DETAILS_AT_TOP         = YES
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
+# reimplements.
+
+INHERIT_DOCS           = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               = 4
+
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C  = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources
+# only. Doxygen will then generate output that is more tailored for Java.
+# For instance, namespaces will be presented as packages, qualified scopes
+# will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
+# the \nosubgrouping command.
+
+SUBGROUPING            = NO
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+# will be included in the documentation.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
+# will be included in the documentation.
+
+EXTRACT_STATIC         = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES  = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+# file names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# users are advised to set this option to NO.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the documentation
+# of that file.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
+# is inserted in the documentation for inline members.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
+# declaration order.
+
+SORT_MEMBER_DOCS       = YES
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or
+# disable (NO) the todo list. This list is created by putting \todo
+# commands in the documentation.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or
+# disable (NO) the test list. This list is created by putting \test
+# commands in the documentation.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
+# commands in the documentation.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+# disable (NO) the deprecated list. This list is created by putting
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or define consists of for it to appear in
+# the documentation. If the initializer consists of more lines than specified
+# here it will be hidden. Use a value of 0 to hide initializers completely.
+# The appearance of the initializer of individual variables and defines in the
+# documentation can be controlled using \showinitializer or \hideinitializer
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+# at the bottom of the documentation of classes and structs. If set to YES the
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES        = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated by doxygen. Possible values are YES and NO. If left blank
+# NO is used.
+
+WARNINGS               = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR      = YES
+
+# The WARN_FORMAT tag determines the format of the warning messages that
+# doxygen can produce. The string should contain the $file, $line, and $text
+# tags, which will be replaced by the file and line number from which the
+# warning originated and the warning text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning
+# and error messages should be written. If left blank the output is written
+# to stderr.
+
+WARN_LOGFILE           = DoxygenLog
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directories
+# with spaces.
+
+INPUT                  = src
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp
+# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc
+
+FILE_PATTERNS          = *.h *.dox
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
+# should be searched for input files as well. Possible values are YES and NO.
+# If left blank NO is used.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE                =
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories
+# that are symbolic links (a Unix filesystem feature) are excluded from the input.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+
+EXCLUDE_PATTERNS       = *_wrap.c
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
+# the \include command).
+
+EXAMPLE_PATH           =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank all files are included.
+
+EXAMPLE_PATTERNS       =
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation (see
+# the \image command).
+
+IMAGE_PATH             =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command <filter> <input-file>, where <filter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+# input file. Doxygen will then use the output that the filter program writes
+# to standard output.
+
+INPUT_FILTER           =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will be used to filter the input files when producing source
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES    = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
+# be generated. Documented entities will be cross-referenced with these sources.
+
+SOURCE_BROWSER         = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS    = NO
+
+# If the REFERENCED_BY_RELATION tag is set to YES (the default)
+# then for each documented function all documented
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = YES
+
+# If the REFERENCES_RELATION tag is set to YES (the default)
+# then for each documented function all documented entities
+# called/used by that function will be listed.
+
+REFERENCES_RELATION    = YES
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS       = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX     = YES
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all
+# classes will be put under the same header in the alphabetical index.
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX          =
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
+# generate HTML output.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard header.
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard footer.
+
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+# style sheet that is used by each HTML page. It can be used to
+# fine-tune the look of the HTML output. If the tag is left blank doxygen
+# will generate a default style sheet
+
+HTML_STYLESHEET        =
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+# files or namespaces will be aligned in HTML using tables. If set to
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS     = YES
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+# will be generated that can be used as input for tools like the
+# Microsoft HTML help workshop to generate a compressed HTML help file (.chm)
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP      = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
+# be used to specify the file name of the resulting .chm file. You
+# can add a path in front of the file if the result should not be
+# written to the html output dir.
+
+CHM_FILE               =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
+# be used to specify the location (absolute path including file name) of
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION           =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
+# controls if a separate .chi index file is generated (YES) or that
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI           = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
+# controls whether a binary table of contents is generated (YES) or a
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND             = YES
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
+# top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it.
+
+DISABLE_INDEX          = NO
+
+# This tag can be used to set the number of enum values (range [1..20])
+# that doxygen will group on one line in the generated HTML documentation.
+
+ENUM_VALUES_PER_LINE   = 10
+
+# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
+# generated containing a tree-like index structure (just like the one that
+# is generated for HTML Help). For this to work a browser that supports
+# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
+# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
+# probably better off using the HTML help feature.
+
+GENERATE_TREEVIEW      = NO
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
+# used to set the initial width (in pixels) of the frame in which the tree
+# is shown.
+
+TREEVIEW_WIDTH         = 250
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+# generate Latex output.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked. If left blank `latex' will be used as the default command name.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
+# generate index for LaTeX. If left blank `makeindex' will be used as the
+# default command name.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
+# LaTeX documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_LATEX          = YES
+
+# The PAPER_TYPE tag can be used to set the paper type that is used
+# by the printer. Possible values are: a4, a4wide, letter, legal and
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE             = letter
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES         = times
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
+# the generated latex document. The header should contain everything until
+# the first chapter. If it is left blank doxygen will generate a
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER           =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
+# contain links (just like the HTML output) instead of page references
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS         = YES
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
+# plain latex in the generated Makefile. Set this option to YES to get a
+# higher quality PDF documentation.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
+# command to the generated LaTeX files. This will instruct LaTeX to keep
+# running if errors occur, instead of asking the user for help.
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE        = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not
+# include the index chapters (such as File Index, Compound Index, etc.)
+# in the output.
+
+LATEX_HIDE_INDICES     = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
+# The RTF output is optimised for Word 97 and may not look very pretty with
+# other RTF readers or editors.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
+# RTF documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
+# will contain hyperlink fields. The RTF file will
+# contain links (just like the HTML output) instead of page references.
+# This makes the output suitable for online browsing using WORD or other
+# programs which support those fields.
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# config file, i.e. a series of assigments. You only have to provide
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an rtf document.
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE    =
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
+# generate man pages
+
+GENERATE_MAN           = YES
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION          = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
+# then it will generate one additional man file for each entity
+# documented in the real man page(s). These additional files
+# only source the real man page, but without them the man command
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS              = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will
+# generate an XML file that captures the structure of
+# the code including all documentation. Note that this
+# feature is still experimental and incomplete at the
+# moment.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT             = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_SCHEMA             =
+
+# The XML_DTD tag can be used to specify an XML DTD,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_DTD                =
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
+# generate an AutoGen Definitions (see autogen.sf.net) file
+# that captures the structure of the code including all
+# documentation. Note that this feature is still experimental
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
+# generate a Perl module file that captures the structure of
+# the code including all documentation. Note that this
+# feature is still experimental and incomplete at the
+# moment.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
+# nicely formatted so it can be parsed by a human reader.  This is useful
+# if you want to understand what is going on.  On the other hand, if this
+# tag is set to NO the size of the Perl module output will be much smaller
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
+# This is useful so different doxyrules.make files included by the same
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
+# evaluate all C-preprocessor directives found in the sources and include
+# files.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+# names in the source code. If set to NO (the default) only conditional
+# compilation will be performed. Macro expansion can be done in a controlled
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
+# then the macro expansion is limited to the macros specified with the
+# PREDEFINED and EXPAND_AS_PREDEFINED tags.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by
+# the preprocessor.
+
+INCLUDE_PATH           =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will
+# be used.
+
+INCLUDE_FILE_PATTERNS  =
+
+# The PREDEFINED tag can be used to specify one or more macro names that
+# are defined before the preprocessor is started (similar to the -D option of
+# gcc). The argument of the tag is a list of macros of the form: name
+# or name=definition (no spaces). If the definition and the = are
+# omitted =1 is assumed.
+
+PREDEFINED             = DOXYGEN
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
+# this tag can be used to specify a list of macro names that should be expanded.
+# The macro definition that is found in the sources will be used.
+# Use the PREDEFINED tag if you want to use a different macro definition.
+
+EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+# doxygen's preprocessor will remove all function-like macros that are alone
+# on a line, have an all uppercase name, and do not end with a semicolon. Such
+# function macros are typically used for boiler-plate code, and will confuse the
+# parser if not removed.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration::addtions related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles.
+# Optionally an initial location of the external documentation
+# can be added for each tagfile. The format of a tag file without
+# this location is as follows:
+#   TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+#   TAGFILES = file1=loc1 "file2 = loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths or
+# URLs. If a location is present for each tag, the installdox tool
+# does not have to be run to correct the links.
+# Note that each tag file must have a unique name
+# (where the name does NOT include the path)
+# If a tag file is not located in the directory in which doxygen
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE       =
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
+# in the class index. If set to NO only the inherited external classes
+# will be listed.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will
+# be listed.
+
+EXTERNAL_GROUPS        = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or
+# super classes. Setting the tag to NO turns the diagrams off. Note that this
+# option is superceded by the HAVE_DOT option below. This is only a fallback. It is
+# recommended to install and use dot, since it yields more powerful graphs.
+
+CLASS_DIAGRAMS         = YES
+
+# If set to YES, the inheritance and collaboration graphs will hide
+# inheritance and usage relations if the target is undocumented
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz, a graph visualization
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT               = YES
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect inheritance relations. Setting this tag to YES will force the
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect implementation dependencies (inheritance, containment, and
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH    = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similiar to the OMG's Unified Modeling
+# Language.
+
+UML_LOOK               = YES
+
+# If set to YES, the inheritance and collaboration graphs will show the
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS     = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
+# tags are set to YES then doxygen will generate a graph for each documented
+# file showing the direct and indirect include dependencies of the file with
+# other documented files.
+
+INCLUDE_GRAPH          = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
+# documented header file showing the documented files that directly or
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will
+# generate a call dependency graph for every global function or class method.
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command.
+
+CALL_GRAPH             = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
+# will graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. Possible values are png, jpg, or gif
+# If left blank png will be used.
+
+DOT_IMAGE_FORMAT       = png
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found on the path.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the
+# \dotfile command).
+
+DOTFILE_DIRS           =
+
+# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width
+# (in pixels) of the graphs generated by dot. If a graph becomes larger than
+# this value, doxygen will try to truncate the graph, so that it fits within
+# the specified constraint. Beware that most browsers cannot cope with very
+# large images.
+
+MAX_DOT_GRAPH_WIDTH    = 1024
+
+# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height
+# (in pixels) of the graphs generated by dot. If a graph becomes larger than
+# this value, doxygen will try to truncate the graph, so that it fits within
+# the specified constraint. Beware that most browsers cannot cope with very
+# large images.
+
+MAX_DOT_GRAPH_HEIGHT   = 1024
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
+# graphs generated by dot. A depth value of 3 means that only nodes reachable
+# from the root by following a path via at most 3 edges will be shown. Nodes that
+# lay further from the root node will be omitted. Note that setting this option to
+# 1 or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that a graph may be further truncated if the graph's image dimensions are
+# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT).
+# If 0 is used for the depth value (the default), the graph is not depth-constrained.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
+# generate a legend page explaining the meaning of the various boxes and
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
+# remove the intermediate dot files that are used to generate
+# the various graphs.
+
+DOT_CLEANUP            = YES
+
+#---------------------------------------------------------------------------
+# Configuration::addtions related to the search engine
+#---------------------------------------------------------------------------
+
+# The SEARCHENGINE tag specifies whether or not a search engine should be
+# used. If set to NO the values of all tags below this one will be ignored.
+
+SEARCHENGINE           = NO
+
Index: trunk/psLib/Makefile.am
===================================================================
--- trunk/psLib/Makefile.am	(revision 3125)
+++ trunk/psLib/Makefile.am	(revision 3127)
@@ -6,3 +6,6 @@
 pkgconfig_DATA= pslib.pc
 
-EXTRA_DIST = pslib-config.in pslib.pc.in 
+EXTRA_DIST = Doxyfile pslib-config.in pslib.pc.in 
+
+docs:
+	$(DOXYGEN)
Index: trunk/psLib/configure.in
===================================================================
--- trunk/psLib/configure.in	(revision 3125)
+++ trunk/psLib/configure.in	(revision 3127)
@@ -1,5 +1,5 @@
 AC_INIT([pslib],[1.5])
 AM_CONFIG_HEADER(src/config.h)
-AM_INIT_AUTOMAKE(pslib, 1.5)
+AM_INIT_AUTOMAKE(pslib, 1.4)
 
 PSLIB_LT_VERSION="0:0:0"
@@ -125,4 +125,8 @@
 AC_CHECK_LIB(mx,sqrtf)
 
+DOXYGEN="doxygen Doxyfile"
+AC_CHECK_PROG(DOXYGEN,doxygen,[echo Doxygen not detected in configure stage.])
+AC_SUBST(DOXYGEN,$DOXYGEN)
+
 dnl ---------------- export variables --------------------
 
Index: trunk/psLib/src/Doxyfile
===================================================================
--- trunk/psLib/src/Doxyfile	(revision 3125)
+++ 	(revision )
@@ -1,1086 +1,0 @@
-# Doxyfile 1.3.4
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
-#
-# All text after a hash (#) is considered a comment and will be ignored
-# The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
-# by quotes) that should identify the project.
-
-PROJECT_NAME           = "Pan-STARRS Foundation Library"
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
-
-PROJECT_NUMBER         = V1.3-R4
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = ../docs
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch,
-# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en
-# (Japanese with English messages), Korean, Norwegian, Polish, Portuguese,
-# Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
-
-OUTPUT_LANGUAGE        = English
-
-# This tag can be used to specify the encoding used in the generated output.
-# The encoding is not always determined by the language that is chosen,
-# but also whether or not the output is meant for Windows or non-Windows users.
-# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES
-# forces the Windows encoding (this is the default for the Windows binary),
-# whereas setting the tag to NO uses a Unix-style encoding (the default for
-# all platforms other than Windows).
-
-USE_WINDOWS_ENCODING   = NO
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF           = YES
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
-# description.
-
-ALWAYS_DETAILED_SEC    = YES
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited
-# members of a class in the documentation of that class as if those members were
-# ordinary class members. Constructors, destructors and assignment operators of
-# the base classes will not be shown.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES        = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. It is allowed to use relative paths in the argument list.
-
-STRIP_FROM_PATH        =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful is your file systems
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like the Qt-style comments (thus requiring an
-# explict @brief command for a brief description.
-
-JAVADOC_AUTOBRIEF      = YES
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen
-# will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member
-# documentation.
-
-DETAILS_AT_TOP         = YES
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
-# reimplements.
-
-INHERIT_DOCS           = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE               = 4
-
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES                =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
-# only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C  = YES
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources
-# only. Doxygen will then generate output that is more tailored for Java.
-# For instance, namespaces will be presented as packages, qualified scopes
-# will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
-# the \nosubgrouping command.
-
-SUBGROUPING            = NO
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL            = YES
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
-# will be included in the documentation.
-
-EXTRACT_PRIVATE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
-# will be included in the documentation.
-
-EXTRACT_STATIC         = NO
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES  = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
-# documentation.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
-# function's detailed documentation block.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
-# Set it to YES to include the internal documentation.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# users are advised to set this option to NO.
-
-CASE_SENSE_NAMES       = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
-# documentation. If set to YES the scope will be hidden.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the documentation
-# of that file.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
-# is inserted in the documentation for inline members.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
-# declaration order.
-
-SORT_MEMBER_DOCS       = YES
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
-# commands in the documentation.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
-# commands in the documentation.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
-# commands in the documentation.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
-# \deprecated commands in the documentation.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if sectionname ... \endif.
-
-ENABLED_SECTIONS       =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or define consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and defines in the
-# documentation can be controlled using \showinitializer or \hideinitializer
-# command in the documentation regardless of this setting.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
-# list will mention the files that were used to generate the documentation.
-
-SHOW_USED_FILES        = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
-# NO is used.
-
-WARNINGS               = YES
-
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
-# automatically be disabled.
-
-WARN_IF_UNDOCUMENTED   = YES
-
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
-# don't exist or using markup commands wrongly.
-
-WARN_IF_DOC_ERROR      = YES
-
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text.
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
-# to stderr.
-
-WARN_LOGFILE           = DoxygenLog
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
-# with spaces.
-
-INPUT                  = pslib.h \
-                         mainpage.dox \
-                         sysUtils \
-                         image \
-                         fileUtils \
-                         dataManip \
-                         collections \
-                         astronomy
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp
-# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc
-
-FILE_PATTERNS          = *.h *.dox
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
-# If left blank NO is used.
-
-RECURSIVE              = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-
-EXCLUDE                =
-
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories
-# that are symbolic links (a Unix filesystem feature) are excluded from the input.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories.
-
-EXCLUDE_PATTERNS       = *_wrap.c
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
-# the \include command).
-
-EXAMPLE_PATH           =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank all files are included.
-
-EXAMPLE_PATTERNS       =
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
-# Possible values are YES and NO. If left blank NO is used.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
-# the \image command).
-
-IMAGE_PATH             =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output.
-
-INPUT_FILTER           =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
-FILTER_SOURCE_FILES    = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-
-SOURCE_BROWSER         = YES
-
-# Setting the INLINE_SOURCES tag to YES will include the body
-# of functions and classes directly in the documentation.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C and C++ comments will always remain visible.
-
-STRIP_CODE_COMMENTS    = NO
-
-# If the REFERENCED_BY_RELATION tag is set to YES (the default)
-# then for each documented function all documented
-# functions referencing it will be listed.
-
-REFERENCED_BY_RELATION = YES
-
-# If the REFERENCES_RELATION tag is set to YES (the default)
-# then for each documented function all documented entities
-# called/used by that function will be listed.
-
-REFERENCES_RELATION    = YES
-
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
-# which an include is specified. Set to NO to disable this.
-
-VERBATIM_HEADERS       = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
-# contains a lot of classes, structs, unions or interfaces.
-
-ALPHABETICAL_INDEX     = YES
-
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
-# in which this list will be split (can be a number in the range [1..20])
-
-COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
-# should be ignored while generating the index headers.
-
-IGNORE_PREFIX          =
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-# generate HTML output.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `html' will be used as the default path.
-
-HTML_OUTPUT            = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
-# doxygen will generate files with .html extension.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard header.
-
-HTML_HEADER            =
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard footer.
-
-HTML_FOOTER            =
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet
-
-HTML_STYLESHEET        =
-
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS     = YES
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compressed HTML help file (.chm)
-# of the generated HTML documentation.
-
-GENERATE_HTMLHELP      = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
-# be used to specify the file name of the resulting .chm file. You
-# can add a path in front of the file if the result should not be
-# written to the html output dir.
-
-CHM_FILE               =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
-# be used to specify the location (absolute path including file name) of
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
-# the HTML help compiler on the generated index.hhp.
-
-HHC_LOCATION           =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-# controls if a separate .chi index file is generated (YES) or that
-# it should be included in the master .chm file (NO).
-
-GENERATE_CHI           = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-# controls whether a binary table of contents is generated (YES) or a
-# normal table of contents (NO) in the .chm file.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members
-# to the contents of the HTML help documentation and to the tree view.
-
-TOC_EXPAND             = YES
-
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
-# top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it.
-
-DISABLE_INDEX          = NO
-
-# This tag can be used to set the number of enum values (range [1..20])
-# that doxygen will group on one line in the generated HTML documentation.
-
-ENUM_VALUES_PER_LINE   = 10
-
-# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
-# generated containing a tree-like index structure (just like the one that
-# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
-# probably better off using the HTML help feature.
-
-GENERATE_TREEVIEW      = NO
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-# used to set the initial width (in pixels) of the frame in which the tree
-# is shown.
-
-TREEVIEW_WIDTH         = 250
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
-# generate Latex output.
-
-GENERATE_LATEX         = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `latex' will be used as the default path.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked. If left blank `latex' will be used as the default command name.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-# generate index for LaTeX. If left blank `makeindex' will be used as the
-# default command name.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-# LaTeX documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_LATEX          = YES
-
-# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, a4wide, letter, legal and
-# executive. If left blank a4wide will be used.
-
-PAPER_TYPE             = letter
-
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
-# packages that should be included in the LaTeX output.
-
-EXTRA_PACKAGES         = times
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-# the generated latex document. The header should contain everything until
-# the first chapter. If it is left blank doxygen will generate a
-# standard header. Notice: only use this tag if you know what you are doing!
-
-LATEX_HEADER           =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-# contain links (just like the HTML output) instead of page references
-# This makes the output suitable for online browsing using a pdf viewer.
-
-PDF_HYPERLINKS         = YES
-
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-# plain latex in the generated Makefile. Set this option to YES to get a
-# higher quality PDF documentation.
-
-USE_PDFLATEX           = YES
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-# command to the generated LaTeX files. This will instruct LaTeX to keep
-# running if errors occur, instead of asking the user for help.
-# This option is also used when generating formulas in HTML.
-
-LATEX_BATCHMODE        = NO
-
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not
-# include the index chapters (such as File Index, Compound Index, etc.)
-# in the output.
-
-LATEX_HIDE_INDICES     = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-# The RTF output is optimised for Word 97 and may not look very pretty with
-# other RTF readers or editors.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `rtf' will be used as the default path.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-# RTF documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-# will contain hyperlink fields. The RTF file will
-# contain links (just like the HTML output) instead of page references.
-# This makes the output suitable for online browsing using WORD or other
-# programs which support those fields.
-# Note: wordpad (write) and others do not support links.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
-# config file, i.e. a series of assigments. You only have to provide
-# replacements, missing definitions are set to their default value.
-
-RTF_STYLESHEET_FILE    =
-
-# Set optional variables used in the generation of an rtf document.
-# Syntax is similar to doxygen's config file.
-
-RTF_EXTENSIONS_FILE    =
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
-# generate man pages
-
-GENERATE_MAN           = YES
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `man' will be used as the default path.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to
-# the generated man pages (default is the subroutine's section .3)
-
-MAN_EXTENSION          = .3
-
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-# then it will generate one additional man file for each entity
-# documented in the real man page(s). These additional files
-# only source the real man page, but without them the man command
-# would be unable to find the correct page. The default is NO.
-
-MAN_LINKS              = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES Doxygen will
-# generate an XML file that captures the structure of
-# the code including all documentation. Note that this
-# feature is still experimental and incomplete at the
-# moment.
-
-GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `xml' will be used as the default path.
-
-XML_OUTPUT             = xml
-
-# The XML_SCHEMA tag can be used to specify an XML schema,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_SCHEMA             =
-
-# The XML_DTD tag can be used to specify an XML DTD,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_DTD                =
-
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-# generate an AutoGen Definitions (see autogen.sf.net) file
-# that captures the structure of the code including all
-# documentation. Note that this feature is still experimental
-# and incomplete at the moment.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will
-# generate a Perl module file that captures the structure of
-# the code including all documentation. Note that this
-# feature is still experimental and incomplete at the
-# moment.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able
-# to generate PDF and DVI output from the Perl module output.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader.  This is useful
-# if you want to understand what is going on.  On the other hand, if this
-# tag is set to NO the size of the Perl module output will be much smaller
-# and Perl will parse it just the same.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
-# This is useful so different doxyrules.make files included by the same
-# Makefile don't overwrite each other's variables.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-# evaluate all C-preprocessor directives found in the sources and include
-# files.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-# names in the source code. If set to NO (the default) only conditional
-# compilation will be performed. Macro expansion can be done in a controlled
-# way by setting EXPAND_ONLY_PREDEF to YES.
-
-MACRO_EXPANSION        = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-# then the macro expansion is limited to the macros specified with the
-# PREDEFINED and EXPAND_AS_PREDEFINED tags.
-
-EXPAND_ONLY_PREDEF     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by
-# the preprocessor.
-
-INCLUDE_PATH           =
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will
-# be used.
-
-INCLUDE_FILE_PATTERNS  =
-
-# The PREDEFINED tag can be used to specify one or more macro names that
-# are defined before the preprocessor is started (similar to the -D option of
-# gcc). The argument of the tag is a list of macros of the form: name
-# or name=definition (no spaces). If the definition and the = are
-# omitted =1 is assumed.
-
-PREDEFINED             = DOXYGEN
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-# this tag can be used to specify a list of macro names that should be expanded.
-# The macro definition that is found in the sources will be used.
-# Use the PREDEFINED tag if you want to use a different macro definition.
-
-EXPAND_AS_DEFINED      =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all function-like macros that are alone
-# on a line, have an all uppercase name, and do not end with a semicolon. Such
-# function macros are typically used for boiler-plate code, and will confuse the
-# parser if not removed.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration::addtions related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES option can be used to specify one or more tagfiles.
-# Optionally an initial location of the external documentation
-# can be added for each tagfile. The format of a tag file without
-# this location is as follows:
-#   TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-#   TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths or
-# URLs. If a location is present for each tag, the installdox tool
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen
-# is run, you must also specify the path to the tagfile here.
-
-TAGFILES               =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create
-# a tag file that is based on the input files it reads.
-
-GENERATE_TAGFILE       =
-
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-# in the class index. If set to NO only the inherited external classes
-# will be listed.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will
-# be listed.
-
-EXTERNAL_GROUPS        = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of `which perl').
-
-PERL_PATH              = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or
-# super classes. Setting the tag to NO turns the diagrams off. Note that this
-# option is superceded by the HAVE_DOT option below. This is only a fallback. It is
-# recommended to install and use dot, since it yields more powerful graphs.
-
-CLASS_DIAGRAMS         = YES
-
-# If set to YES, the inheritance and collaboration graphs will hide
-# inheritance and usage relations if the target is undocumented
-# or is not a class.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz, a graph visualization
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section
-# have no effect if this option is set to NO (the default)
-
-HAVE_DOT               = YES
-
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect inheritance relations. Setting this tag to YES will force the
-# the CLASS_DIAGRAMS tag to NO.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect implementation dependencies (inheritance, containment, and
-# class references variables) of the class with other documented classes.
-
-COLLABORATION_GRAPH    = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-# collaboration diagrams in a style similiar to the OMG's Unified Modeling
-# Language.
-
-UML_LOOK               = YES
-
-# If set to YES, the inheritance and collaboration graphs will show the
-# relations between templates and their instances.
-
-TEMPLATE_RELATIONS     = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-# tags are set to YES then doxygen will generate a graph for each documented
-# file showing the direct and indirect include dependencies of the file with
-# other documented files.
-
-INCLUDE_GRAPH          = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-# documented header file showing the documented files that directly or
-# indirectly include this file.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will
-# generate a call dependency graph for every global function or class method.
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command.
-
-CALL_GRAPH             = NO
-
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-# will graphical hierarchy of all classes instead of a textual one.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are png, jpg, or gif
-# If left blank png will be used.
-
-DOT_IMAGE_FORMAT       = png
-
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found on the path.
-
-DOT_PATH               =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the
-# \dotfile command).
-
-DOTFILE_DIRS           =
-
-# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than
-# this value, doxygen will try to truncate the graph, so that it fits within
-# the specified constraint. Beware that most browsers cannot cope with very
-# large images.
-
-MAX_DOT_GRAPH_WIDTH    = 1024
-
-# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than
-# this value, doxygen will try to truncate the graph, so that it fits within
-# the specified constraint. Beware that most browsers cannot cope with very
-# large images.
-
-MAX_DOT_GRAPH_HEIGHT   = 1024
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-# graphs generated by dot. A depth value of 3 means that only nodes reachable
-# from the root by following a path via at most 3 edges will be shown. Nodes that
-# lay further from the root node will be omitted. Note that setting this option to
-# 1 or 2 may greatly reduce the computation time needed for large code bases. Also
-# note that a graph may be further truncated if the graph's image dimensions are
-# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT).
-# If 0 is used for the depth value (the default), the graph is not depth-constrained.
-
-MAX_DOT_GRAPH_DEPTH    = 0
-
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-# generate a legend page explaining the meaning of the various boxes and
-# arrows in the dot generated graphs.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-# remove the intermediate dot files that are used to generate
-# the various graphs.
-
-DOT_CLEANUP            = YES
-
-#---------------------------------------------------------------------------
-# Configuration::addtions related to the search engine
-#---------------------------------------------------------------------------
-
-# The SEARCHENGINE tag specifies whether or not a search engine should be
-# used. If set to NO the values of all tags below this one will be ignored.
-
-SEARCHENGINE           = NO
-
Index: trunk/psLib/src/Makefile.am
===================================================================
--- trunk/psLib/src/Makefile.am	(revision 3125)
+++ trunk/psLib/src/Makefile.am	(revision 3127)
@@ -23,5 +23,5 @@
 libpslib_la_LDFLAGS = -version-info $(PSLIB_LT_VERSION) 
 
-EXTRA_DIST = parseErrorCodes.pl mainpage.dox Doxyfile psErrorCodes.dat psTest.h
+EXTRA_DIST = parseErrorCodes.pl mainpage.dox psErrorCodes.dat psTest.h
 
 pslibincludedir = $(includedir)
Index: trunk/psLib/src/astronomy/Makefile.am
===================================================================
--- trunk/psLib/src/astronomy/Makefile.am	(revision 3125)
+++ trunk/psLib/src/astronomy/Makefile.am	(revision 3127)
@@ -22,5 +22,5 @@
 BUILT_SOURCES = psAstronomyErrors.h
 
-EXTRA_DIST = psAstronomyErrors.dat psAstronomyErrors.h
+EXTRA_DIST = psAstronomyErrors.dat psAstronomyErrors.h astronomy.i
 
 psAstronomyErrors.h: psAstronomyErrors.dat
Index: trunk/psLib/src/collections/Makefile.am
===================================================================
--- trunk/psLib/src/collections/Makefile.am	(revision 3125)
+++ trunk/psLib/src/collections/Makefile.am	(revision 3127)
@@ -21,5 +21,5 @@
 
 BUILT_SOURCES = psCollectionsErrors.h
-EXTRA_DIST = psCollectionsErrors.dat psCollectionsErrors.h
+EXTRA_DIST = psCollectionsErrors.dat psCollectionsErrors.h collections.i
 
 psCollectionsErrors.h:psCollectionsErrors.dat
Index: trunk/psLib/src/dataIO/Makefile.am
===================================================================
--- trunk/psLib/src/dataIO/Makefile.am	(revision 3125)
+++ trunk/psLib/src/dataIO/Makefile.am	(revision 3127)
@@ -16,5 +16,5 @@
 
 BUILT_SOURCES = psFileUtilsErrors.h
-EXTRA_DIST = psFileUtilsErrors.dat psFileUtilsErrors.h
+EXTRA_DIST = psFileUtilsErrors.dat psFileUtilsErrors.h fileUtils.i
 
 psFileUtilsErrors.h: psFileUtilsErrors.dat
Index: trunk/psLib/src/dataManip/Makefile.am
===================================================================
--- trunk/psLib/src/dataManip/Makefile.am	(revision 3125)
+++ trunk/psLib/src/dataManip/Makefile.am	(revision 3127)
@@ -21,5 +21,5 @@
 	   
 BUILT_SOURCES = psDataManipErrors.h
-EXTRA_DIST = psDataManipErrors.dat psDataManipErrors.h
+EXTRA_DIST = psDataManipErrors.dat psDataManipErrors.h dataManip.i
 
 psDataManipErrors.h: psDataManipErrors.dat
Index: trunk/psLib/src/fileUtils/Makefile.am
===================================================================
--- trunk/psLib/src/fileUtils/Makefile.am	(revision 3125)
+++ trunk/psLib/src/fileUtils/Makefile.am	(revision 3127)
@@ -16,5 +16,5 @@
 
 BUILT_SOURCES = psFileUtilsErrors.h
-EXTRA_DIST = psFileUtilsErrors.dat psFileUtilsErrors.h
+EXTRA_DIST = psFileUtilsErrors.dat psFileUtilsErrors.h fileUtils.i
 
 psFileUtilsErrors.h: psFileUtilsErrors.dat
Index: trunk/psLib/src/image/Makefile.am
===================================================================
--- trunk/psLib/src/image/Makefile.am	(revision 3125)
+++ trunk/psLib/src/image/Makefile.am	(revision 3127)
@@ -21,5 +21,5 @@
 
 BUILT_SOURCES = psImageErrors.h
-EXTRA_DIST = psImageErrors.dat psImageErrors.h
+EXTRA_DIST = psImageErrors.dat psImageErrors.h image.i
 
 psImageErrors.h: psImageErrors.dat
Index: trunk/psLib/src/psTest.c
===================================================================
--- trunk/psLib/src/psTest.c	(revision 3125)
+++ trunk/psLib/src/psTest.c	(revision 3127)
@@ -38,4 +38,10 @@
     psS32 n;
     extern char *optarg;
+
+    char* fileName = (char*)testPointFile;
+    char* lastSlashInFile = strrchr(testPointFile,'/');
+    if (lastSlashInFile != NULL) {
+        fileName = lastSlashInFile+1;
+    }
 
     if ( argc > 0 ) {
@@ -58,5 +64,5 @@
                 break;
             case 'l':
-                printf( "Test Driver:  %s\n", testPointFile );
+                printf( "Test Driver:  %s\n", fileName );
                 printf( "Package Name: %s\n", packageName );
                 printf( "Testpoints:\n" );
@@ -73,5 +79,5 @@
                     if ( strcmp( optarg, tests[ index ].testPointName ) == 0 ) {
                         success = p_runTest( fp,
-                                             testPointFile,
+                                             fileName,
                                              packageName,
                                              tests[ index ].testPointName,
@@ -94,5 +100,5 @@
                         found = true;
                         success = p_runTest( fp,
-                                             testPointFile,
+                                             fileName,
                                              packageName,
                                              tests[ index ].testPointName,
@@ -119,5 +125,5 @@
             if ( ! tests[ index ].isDuplicateEntry ) {
                 success = p_runTest( fp,
-                                     testPointFile,
+                                     fileName,
                                      packageName,
                                      tests[ index ].testPointName,
@@ -143,5 +149,11 @@
     pid_t child;
 
-    p_printPositiveTestHeader( fp, testPointFile, packageName, testPointName );
+    char* fileName = (char*)testPointFile;
+    char* lastSlashInFile = strrchr(testPointFile,'/');
+    if (lastSlashInFile != NULL) {
+        fileName = lastSlashInFile+1;
+    }
+
+    p_printPositiveTestHeader( fp, fileName, packageName, testPointName );
 
     if ( useFork ) {
@@ -193,5 +205,5 @@
     }
 
-    p_printFooter( fp, testPointFile, packageName, testPointName,
+    p_printFooter( fp, fileName, packageName, testPointName,
                    ( childReturn == expectedReturn ) );
 
@@ -206,8 +218,14 @@
     char TP[ 80 ];
 
+    char* fileName = (char*)testPointFile;
+    char* lastSlashInFile = strrchr(testPointFile,'/');
+    if (lastSlashInFile != NULL) {
+        fileName = lastSlashInFile+1;
+    }
+
     snprintf( TP, 80, "%s{%s}", packageName, testPointName );
 
     fprintf( fp, HEADER_TOP );
-    fprintf( fp, HEADER_LINE_STRING, "TestFile", testPointFile );
+    fprintf( fp, HEADER_LINE_STRING, "TestFile", fileName);
     fprintf( fp, HEADER_LINE_STRING, "TestPoint", TP );
     fprintf( fp, HEADER_LINE_STRING, "TestType", "Positive" );
@@ -224,8 +242,14 @@
     char TP[ 80 ];
 
+    char* fileName = (char*)testPointFile;
+    char* lastSlashInFile = strrchr(testPointFile,'/');
+    if (lastSlashInFile != NULL) {
+        fileName = lastSlashInFile+1;
+    }
+
     snprintf( TP, 80, "%s{%s}", packageName, testPointName );
 
     fprintf( fp, HEADER_TOP );
-    fprintf( fp, HEADER_LINE_STRING, "TestFile", testPointFile );
+    fprintf( fp, HEADER_LINE_STRING, "TestFile", fileName);
     fprintf( fp, HEADER_LINE_STRING, "TestPoint", TP );
     fprintf( fp, HEADER_LINE_STRING, "TestType", "Negative" );
@@ -242,8 +266,14 @@
                     psBool success )
 {
+    char* fileName = (char*)testPointFile;
+    char* lastSlashInFile = strrchr(testPointFile,'/');
+    if (lastSlashInFile != NULL) {
+        fileName = lastSlashInFile+1;
+    }
+
     if ( success ) {
-        fprintf( fp, "\n---> TESTPOINT PASSED (%s{%s} | %s)\n\n", packageName, testPointName, testPointFile );
+        fprintf( fp, "\n---> TESTPOINT PASSED (%s{%s} | %s)\n\n", packageName, testPointName, fileName);
     } else {
-        fprintf( fp, "\n---> TESTPOINT FAILED (%s{%s} | %s)\n\n", packageName, testPointName, testPointFile );
-    }
-}
+        fprintf( fp, "\n---> TESTPOINT FAILED (%s{%s} | %s)\n\n", packageName, testPointName, fileName);
+    }
+}
Index: trunk/psLib/src/sysUtils/Makefile.am
===================================================================
--- trunk/psLib/src/sysUtils/Makefile.am	(revision 3125)
+++ trunk/psLib/src/sysUtils/Makefile.am	(revision 3127)
@@ -22,5 +22,5 @@
 
 BUILT_SOURCES = psSysUtilsErrors.h
-EXTRA_DIST = psSysUtilsErrors.dat psSysUtilsErrors.h
+EXTRA_DIST = psSysUtilsErrors.dat psSysUtilsErrors.h sysUtils.i
 
 psSysUtilsErrors.h: psSysUtilsErrors.dat
Index: trunk/psLib/swig/.cvsignore
===================================================================
--- trunk/psLib/swig/.cvsignore	(revision 3125)
+++ trunk/psLib/swig/.cvsignore	(revision 3127)
@@ -1,2 +1,3 @@
+psLibModule
 Makefile
 Makefile.in
Index: trunk/psLib/swig/Makefile.PL
===================================================================
--- trunk/psLib/swig/Makefile.PL	(revision 3127)
+++ trunk/psLib/swig/Makefile.PL	(revision 3127)
@@ -0,0 +1,35 @@
+# File : Makefile.PL 
+use ExtUtils::MakeMaker; 
+use FileHandle;
+
+sub ReadSetup {
+  my $filename = shift;
+      #return val
+  my %opts;
+
+  my $fh = FileHandle->new($filename, 'r');
+  while(<$fh>) {
+    /([a-z]+)=(.+)/ && do {
+      $opts{$1} = $2;
+      next;
+    };
+
+    #default:  
+    die "Error:  syntaxt error in setup.txt line $_";
+  }
+  return %opts;
+}
+
+###############  Main ##############
+
+my %opts = ReadSetup("setup.txt");
+
+
+WriteMakefile( 
+	'NAME' => 'pslib',             # Name of package 
+	'INC' => $opts{includes},
+	'LIBS' => ["$opts{ldflags}"],  # Name of custom libraries 
+	'OBJECT' => 'pslib_wrap.o',    # Name of custom libraries 
+	'OPTIMIZE' => $opts{cflags},
+	'LD' => $opts{ld}
+);
Index: trunk/psLib/swig/Makefile.am
===================================================================
--- trunk/psLib/swig/Makefile.am	(revision 3125)
+++ trunk/psLib/swig/Makefile.am	(revision 3127)
@@ -1,34 +1,49 @@
 
-EXTRA_DIST = pslib.i psLibModule/Makefile.PL
+EXTRA_DIST = pslib.i Makefile.PL 
 
-CLEANFILES = psLibModule/pslib_wrap.c psLibModule/pslib.pm \
-psLibModule/Makefile psLibModule/pm_to_blib psLibModule/pslib.bs \
-psLibModule/pslib_wrap.o psLibModule/setup.txt
+clean-generic:
+	rm -rf psLibModule
 
-SRCDIR = $(shell cd $(top_srcdir)/src && pwd)
-
-INCLUDES = -I$(SRCDIR) -I$(SRCDIR)/astronomy -I$(SRCDIR)/collections \
--I$(SRCDIR)/dataManip -I$(SRCDIR)/fileUtils -I$(SRCDIR)/image \
--I$(SRCDIR)/sysUtils
+INCLUDES = -I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/astronomy \
+	-I$(top_srcdir)/src/collections \
+	-I$(top_srcdir)/src/dataManip \
+	-I$(top_srcdir)/src/fileUtils \
+	-I$(top_srcdir)/src/image \
+	-I$(top_srcdir)/src/sysUtils
 
 ####################################################
 ## PsLibModule swig build section.  
 
-psLibModule/setup.txt:Makefile
+psLibModule:
+	mkdir psLibModule
+
+psLibModule/Makefile.PL: psLibModule
+	cp $(srcdir)/Makefile.PL psLibModule/Makefile.PL
+
+psLibModule/setup.txt:psLibModule Makefile
 	echo "includes=$(INCLUDES)" > psLibModule/setup.txt
-	echo "ldflags=$(PSLIB_LIBS)" >> psLibModule/setup.txt
+	echo "ldflags=-L$(top_builddir)/src $(PSLIB_LIBS)" >> psLibModule/setup.txt
 	echo "cflags=$(PSLIB_CFLAGS) -Wno-unused -Wno-strict-aliasing" >> psLibModule/setup.txt
 
-psLibModule/pslib_wrap.c: pslib.i
-	$(SWIG) -perl $(INCLUDES) -w451 -o $@ $?
+psLibModule/pslib_wrap.c: psLibModule pslib.i
+	echo Source directory = $(top_srcdir)
+	$(SWIG) -perl $(INCLUDES) -w451 -o $@ $(srcdir)/pslib.i 
 
-psLibModule/Makefile:psLibModule/Makefile.PL psLibModule/setup.txt
+psLibModule/Makefile:psLibModule psLibModule/Makefile.PL psLibModule/setup.txt
 	cd psLibModule && $(PERL) Makefile.PL PREFIX=$(PERL_PREFIX)
 
-all:psLibModule/pslib_wrap.c psLibModule/Makefile
+all: psLibModule psLibModule/pslib_wrap.c psLibModule/Makefile.PL
+
+swig: all psLibModule/Makefile
 	cd psLibModule && make
 
-install-exec-hook: all
+swig-check: swig
+	export PERLLIB=psLibModule && perl -Mpslib -e 'print "pslib version = " . pslib::psLibVersion() . "\n";'
+
+swig-install: swig
 	cd psLibModule && make install
+
+install-exec-hook: swig-install
 
 uninstall-local: psLibModule/Makefile
Index: trunk/psLib/test/FullUnitTest
===================================================================
--- trunk/psLib/test/FullUnitTest	(revision 3125)
+++ trunk/psLib/test/FullUnitTest	(revision 3127)
@@ -19,6 +19,6 @@
 #  RETURN : integer number of tests which failed
 #
-#  $Revision: 1.16 $  $Name: not supported by cvs2svn $
-#  $Date: 2005-02-03 00:54:12 $
+#  $Revision: 1.17 $  $Name: not supported by cvs2svn $
+#  $Date: 2005-02-04 22:49:37 $
 #
 #  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -659,5 +659,5 @@
         s/$hostname\s*/<HOST>/g;
         s/: Line \d+/: Line <LINENO>/g;
-        s/\:\d+/\:<LINENO>/g;
+        s/\(.*\:\d+\)/\(FILE\:LINENO\)/g;
         s/allocate \d+ bytes at/allocate <N> bytes at/g;
 
@@ -687,5 +687,5 @@
         s/$hostname\s*/<HOST>/g;
         s/: Line \d+/: Line <LINENO>/g;
-        s/\:\d+/\:<LINENO>/g;
+        s/\(.*\:\d+\)/\(FILE\:LINENO\)/g;
         s/allocate \d+ bytes at/allocate <N> bytes at/g;
 
Index: trunk/psLib/test/astronomy/Makefile.am
===================================================================
--- trunk/psLib/test/astronomy/Makefile.am	(revision 3125)
+++ trunk/psLib/test/astronomy/Makefile.am	(revision 3127)
@@ -11,6 +11,5 @@
 	$(all_includes)
 
-PSLIB_LIBS = `sh $(top_srcdir)/pslib-config --libs`
-AM_LDFLAGS = $(PSLIB_LIBS) -L$(top_srcdir)/src 
+AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
 
 check_PROGRAMS = tst_psTime_01 \
@@ -30,5 +29,6 @@
          tst_psAstrometry01
 
-TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest 
+TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest --verified=$(srcdir)/verified
+ 
 TESTS = tst_psTime_01 \
          tst_psTime_02 \
@@ -66,4 +66,10 @@
 BUILT_SOURCES = test.psTime.config1 test.psTime.config2 test.psTime.config3 test.psTime.config4
 
+EXTRA_DIST = test.psTime.config1.template \
+	test.psTime.config2.template \
+	test.psTime.config3.template \
+	test.psTime.config4.template \
+	verified
+
 test.psTime.config1: test.psTime.config1.template
 	sed 's|PREFIX|$(prefix)|' $? > $@
Index: trunk/psLib/test/astronomy/verified/tst_psCoord.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psCoord.stderr	(revision 3125)
+++ trunk/psLib/test/astronomy/verified/tst_psCoord.stderr	(revision 3127)
@@ -14,7 +14,7 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psPlaneTransformAlloc (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psPlaneTransformAlloc (FILE:LINENO)
     Error: n1 is less than 0.
-<DATE><TIME>|<HOST>|E|psPlaneTransformAlloc (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psPlaneTransformAlloc (FILE:LINENO)
     Error: n2 is less than 0.
 
@@ -27,11 +27,11 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psPlaneDistortAlloc (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psPlaneDistortAlloc (FILE:LINENO)
     Error: n1 is less than 0.
-<DATE><TIME>|<HOST>|E|psPlaneDistortAlloc (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psPlaneDistortAlloc (FILE:LINENO)
     Error: n2 is less than 0.
-<DATE><TIME>|<HOST>|E|psPlaneDistortAlloc (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psPlaneDistortAlloc (FILE:LINENO)
     Error: n3 is less than 0.
-<DATE><TIME>|<HOST>|E|psPlaneDistortAlloc (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psPlaneDistortAlloc (FILE:LINENO)
     Error: n4 is less than 0.
 
@@ -44,11 +44,11 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psPlaneTransformApply (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psPlaneTransformApply (FILE:LINENO)
     Unallowable operation: transform is NULL.
-<DATE><TIME>|<HOST>|E|psPlaneTransformApply (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psPlaneTransformApply (FILE:LINENO)
     Unallowable operation: transform->x is NULL.
-<DATE><TIME>|<HOST>|E|psPlaneTransformApply (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psPlaneTransformApply (FILE:LINENO)
     Unallowable operation: transform->y is NULL.
-<DATE><TIME>|<HOST>|E|psPlaneTransformApply (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psPlaneTransformApply (FILE:LINENO)
     Unallowable operation: coords is NULL.
 
@@ -61,11 +61,11 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psPlaneDistortApply (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psPlaneDistortApply (FILE:LINENO)
     Unallowable operation: transform is NULL.
-<DATE><TIME>|<HOST>|E|psPlaneDistortApply (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psPlaneDistortApply (FILE:LINENO)
     Unallowable operation: transform->x is NULL.
-<DATE><TIME>|<HOST>|E|psPlaneDistortApply (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psPlaneDistortApply (FILE:LINENO)
     Unallowable operation: transform->y is NULL.
-<DATE><TIME>|<HOST>|E|psPlaneDistortApply (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psPlaneDistortApply (FILE:LINENO)
     Unallowable operation: coords is NULL.
 
@@ -78,7 +78,7 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psSphereTransformApply (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psSphereTransformApply (FILE:LINENO)
     Unallowable operation: transform is NULL.
-<DATE><TIME>|<HOST>|E|psSphereTransformApply (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psSphereTransformApply (FILE:LINENO)
     Unallowable operation: coord is NULL.
 
@@ -100,5 +100,5 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psSphereTransformICRSToEcliptic (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psSphereTransformICRSToEcliptic (FILE:LINENO)
     Unallowable operation: time is NULL.
 
@@ -111,5 +111,5 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psSphereTransformEclipticToICRS (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psSphereTransformEclipticToICRS (FILE:LINENO)
     Unallowable operation: time is NULL.
 
@@ -140,11 +140,11 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psSphereGetOffset (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psSphereGetOffset (FILE:LINENO)
     Unallowable operation: position1 is NULL.
-<DATE><TIME>|<HOST>|E|psSphereGetOffset (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psSphereGetOffset (FILE:LINENO)
     Unallowable operation: position2 is NULL.
-<DATE><TIME>|<HOST>|E|psSphereGetOffset (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psSphereGetOffset (FILE:LINENO)
     Specified offset mode, 0x54321, is not supported.
-<DATE><TIME>|<HOST>|E|psSphereGetOffset (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psSphereGetOffset (FILE:LINENO)
     Specified units, 0x54321, is not supported.
 
@@ -157,11 +157,11 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psSphereSetOffset (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psSphereSetOffset (FILE:LINENO)
     Unallowable operation: position is NULL.
-<DATE><TIME>|<HOST>|E|psSphereSetOffset (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psSphereSetOffset (FILE:LINENO)
     Unallowable operation: offset is NULL.
-<DATE><TIME>|<HOST>|E|psSphereSetOffset (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psSphereSetOffset (FILE:LINENO)
     Specified offset mode, 0x54321, is not supported.
-<DATE><TIME>|<HOST>|E|psSphereSetOffset (psCoord.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psSphereSetOffset (FILE:LINENO)
     Specified units, 0x54321, is not supported.
 
Index: trunk/psLib/test/astronomy/verified/tst_psMetadataIO.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadataIO.stderr	(revision 3125)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadataIO.stderr	(revision 3127)
@@ -1,42 +1,42 @@
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     Failed to parse the value '9876.54qqq32' of metadata item xPosition, type F64, on line 90 of test.config.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     Failed to read a metadata value on line 96 of test.config.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     Metadata type '99.999', found on line 102 of test.config, is not invalid.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     More than one '*' character not allowed.  Found on line 108 of test.config.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     More than one '@' character not allowed.  Found on line 114 of test.config.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     More than one '~' character not allowed.  Found on line 120 of test.config.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     Failed to parse the value '9876.54qqq32' of metadata item xPosition, type F64, on line 90 of test.config.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     Failed to read a metadata value on line 96 of test.config.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     Metadata type '99.999', found on line 102 of test.config, is not invalid.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     More than one '*' character not allowed.  Found on line 108 of test.config.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     More than one '@' character not allowed.  Found on line 114 of test.config.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     More than one '~' character not allowed.  Found on line 120 of test.config.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     Duplicate Metadata item, speed, found on line 128 of test.config.  Overwrite not allowed.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     Failed to parse the value '9876.54qqq32' of metadata item xPosition, type F64, on line 90 of test.config.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     Failed to read a metadata value on line 96 of test.config.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     Metadata type '99.999', found on line 102 of test.config, is not invalid.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     More than one '*' character not allowed.  Found on line 108 of test.config.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     More than one '@' character not allowed.  Found on line 114 of test.config.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     More than one '~' character not allowed.  Found on line 120 of test.config.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     Unallowable operation: fileName is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     Failed to open file 'abcedfg'. Check if it exists and it has the proper permissions.
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stderr	(revision 3125)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stderr	(revision 3127)
@@ -1,18 +1,18 @@
-<DATE><TIME>|<HOST>|E|psListRemoveData (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListRemoveData (FILE:LINENO)
     Specified data item is not found in the psList.
-<DATE><TIME>|<HOST>|E|psMetadataRemove (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataRemove (FILE:LINENO)
     Failed to remove metadata item, HISTORY, from metadata list.
-<DATE><TIME>|<HOST>|E|psMetadataReadHeader (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataReadHeader (FILE:LINENO)
     Unallowable operation: fileName is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataReadHeader (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataReadHeader (FILE:LINENO)
     FITS error while opening file: missing.dat could not open the named file
-<DATE><TIME>|<HOST>|E|psMetadataReadHeader (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataReadHeader (FILE:LINENO)
     Couldn't close FITS file. FITS error: NULL input pointer
-<DATE><TIME>|<HOST>|E|psMetadataReadHeader (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataReadHeader (FILE:LINENO)
     Specified extension number, 0, is invalid.  Value must be positive if no extension name is given.
-<DATE><TIME>|<HOST>|E|psMetadataReadHeader (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataReadHeader (FILE:LINENO)
     FITS error while locating header 22: tried to move past end of file
-<DATE><TIME>|<HOST>|E|psMetadataReadHeader (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataReadHeader (FILE:LINENO)
     FITS error while locating header AARGH: illegal HDU number
-<DATE><TIME>|<HOST>|E|psMetadataReadHeader (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataReadHeader (FILE:LINENO)
     Specified extension number, 0, is invalid.  Value must be positive if no extension name is given.
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr	(revision 3125)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr	(revision 3127)
@@ -1,10 +1,10 @@
 <DATE><TIME>|<HOST>|I|main
     Following should produce error for null name.
-<DATE><TIME>|<HOST>|E|psMetadataItemAllocV (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataItemAllocV (FILE:LINENO)
     Unallowable operation: name is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataItemAllocV (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataItemAllocV (FILE:LINENO)
     Specified psMetadataType, 11, is not supported.
-<DATE><TIME>|<HOST>|E|psMetadataAddItem (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataAddItem (FILE:LINENO)
     Unallowable operation: md is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataAddItem (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataAddItem (FILE:LINENO)
     Unallowable operation: metadataItem is NULL.
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_03.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_03.stderr	(revision 3125)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_03.stderr	(revision 3127)
@@ -1,20 +1,20 @@
-<DATE><TIME>|<HOST>|E|psMetadataRemove (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataRemove (FILE:LINENO)
     Unallowable operation: md is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataRemove (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataRemove (FILE:LINENO)
     Could not find metadata item, AARGH.
-<DATE><TIME>|<HOST>|E|psMetadataRemove (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataRemove (FILE:LINENO)
     Could not find metadata item at index 22.
-<DATE><TIME>|<HOST>|E|psMetadataAddItem (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataAddItem (FILE:LINENO)
     Unallowable operation: md->table is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataRemove (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataRemove (FILE:LINENO)
     Unallowable operation: md->table is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataAddItem (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataAddItem (FILE:LINENO)
     Unallowable operation: md->list is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataRemove (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataRemove (FILE:LINENO)
     Unallowable operation: md->list is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataAddItem (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataAddItem (FILE:LINENO)
     Unallowable operation: metadataItem->name is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataAddItem (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataAddItem (FILE:LINENO)
     Unallowable operation: md->table is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataAdd (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataAdd (FILE:LINENO)
     Failed to add metadata item to metadata collection list.
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_04.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_04.stderr	(revision 3125)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_04.stderr	(revision 3127)
@@ -1,16 +1,16 @@
-<DATE><TIME>|<HOST>|E|psMetadataLookup (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataLookup (FILE:LINENO)
     Unallowable operation: md is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataLookup (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataLookup (FILE:LINENO)
     Unallowable operation: key is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataGet (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataGet (FILE:LINENO)
     Unallowable operation: md is NULL.
-<DATE><TIME>|<HOST>|E|psListIteratorSet (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListIteratorSet (FILE:LINENO)
     Specified location, 22, is invalid.
-<DATE><TIME>|<HOST>|E|psListGet (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListGet (FILE:LINENO)
     Specified location, 22, is invalid.
-<DATE><TIME>|<HOST>|E|psMetadataGet (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataGet (FILE:LINENO)
     Could not find metadata item at index 22.
-<DATE><TIME>|<HOST>|E|psMetadataLookup (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataLookup (FILE:LINENO)
     Unallowable operation: md->table is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataGet (psMetadata.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataGet (FILE:LINENO)
     Unallowable operation: md->list is NULL.
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stderr	(revision 3125)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stderr	(revision 3127)
@@ -1,6 +1,6 @@
-<DATE><TIME>|<HOST>|E|psMetadataItemPrint (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataItemPrint (FILE:LINENO)
     Unallowable operation: fd is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataItemPrint (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataItemPrint (FILE:LINENO)
     Unallowable operation: format is NULL.
-<DATE><TIME>|<HOST>|E|psMetadataItemPrint (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataItemPrint (FILE:LINENO)
     Unallowable operation: metadataItem is NULL.
Index: trunk/psLib/test/astronomy/verified/tst_psTime_02.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psTime_02.stderr	(revision 3125)
+++ trunk/psLib/test/astronomy/verified/tst_psTime_02.stderr	(revision 3127)
@@ -1,14 +1,14 @@
-<DATE><TIME>|<HOST>|E|psTimeFromISOTime (psTime.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psTimeFromISOTime (FILE:LINENO)
     Error: tmTime.tm_mon, 99, is out of range.  Must be between 1 and 12.
-<DATE><TIME>|<HOST>|E|psTimeFromISOTime (psTime.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psTimeFromISOTime (FILE:LINENO)
     Error: tmTime.tm_mday, 99, is out of range.  Must be between 1 and 31.
-<DATE><TIME>|<HOST>|E|psTimeFromISOTime (psTime.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psTimeFromISOTime (FILE:LINENO)
     Error: tmTime.tm_hour, 99, is out of range.  Must be between 0 and 23.
-<DATE><TIME>|<HOST>|E|psTimeFromISOTime (psTime.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psTimeFromISOTime (FILE:LINENO)
     Error: tmTime.tm_min, 99, is out of range.  Must be between 0 and 59.
-<DATE><TIME>|<HOST>|E|psTimeFromISOTime (psTime.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psTimeFromISOTime (FILE:LINENO)
     Error: tmTime.tm_sec, 99, is out of range.  Must be between 0 and 59.
-<DATE><TIME>|<HOST>|E|psTimeFromISOTime (psTime.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psTimeFromISOTime (FILE:LINENO)
     Error: millisecond, -999, is out of range.  Must be between 0 and 999.
-<DATE><TIME>|<HOST>|E|psTimeFromTimeval (psTime.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psTimeFromTimeval (FILE:LINENO)
     Unallowable operation: time is NULL.
Index: trunk/psLib/test/astronomy/verified/tst_psTime_03.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psTime_03.stderr	(revision 3125)
+++ trunk/psLib/test/astronomy/verified/tst_psTime_03.stderr	(revision 3127)
@@ -1,4 +1,4 @@
 <DATE><TIME>|<HOST>|I|main
     Invalid time type during allocation should generate error message
-<DATE><TIME>|<HOST>|E|psTimeAlloc (psTime.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psTimeAlloc (FILE:LINENO)
     Specified type, 10, is not supported.
Index: trunk/psLib/test/astronomy/verified/tst_psTime_04.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psTime_04.stderr	(revision 3125)
+++ trunk/psLib/test/astronomy/verified/tst_psTime_04.stderr	(revision 3127)
@@ -1,20 +1,20 @@
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (FILE:LINENO)
     Failed to open file 'zzz'. Check if it exists and it has the proper permissions.
-<DATE><TIME>|<HOST>|E|psLibInit (psConfigure.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psLibInit (FILE:LINENO)
     Failed to initialize psTime.
-<DATE><TIME>|<HOST>|E|psLookupTableRead (psLookupTable.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psLookupTableRead (FILE:LINENO)
     Failed to open file bogus/ser7.dat.
-<DATE><TIME>|<HOST>|E|psLookupTableRead (psLookupTable.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psLookupTableRead (FILE:LINENO)
     Failed to open file bogus/eopc01_1900_2004.dat.
-<DATE><TIME>|<HOST>|E|psLookupTableRead (psLookupTable.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psLookupTableRead (FILE:LINENO)
     Failed to open file bogus/finals_all.dat.
-<DATE><TIME>|<HOST>|E|psLookupTableRead (psLookupTable.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psLookupTableRead (FILE:LINENO)
     Failed to open file bogus/tai_utc.dat.
-<DATE><TIME>|<HOST>|E|p_psTimeInit (psTime.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|p_psTimeInit (FILE:LINENO)
     Incorrect number of table files entered. Found: 3. Expected: 4.
-<DATE><TIME>|<HOST>|E|p_psTimeInit (psTime.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|p_psTimeInit (FILE:LINENO)
     Incorrect vector size. Size: 3, Expected 4.
-<DATE><TIME>|<HOST>|E|psLibInit (psConfigure.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psLibInit (FILE:LINENO)
     Failed to initialize psTime.
-<DATE><TIME>|<HOST>|E|printError (psLookupTable.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|printError (FILE:LINENO)
     Unable to parse string, 53yyy244 on line 16.
Index: trunk/psLib/test/collections/Makefile.am
===================================================================
--- trunk/psLib/test/collections/Makefile.am	(revision 3125)
+++ trunk/psLib/test/collections/Makefile.am	(revision 3127)
@@ -1,4 +1,6 @@
-#Makefile for astronomy functions of psLib
+#Makefile for collections functions of psLib
 #
+EXTRA_DIST = verified
+
 INCLUDES = \
 	-I$(top_srcdir)/src \
@@ -11,5 +13,5 @@
 	$(all_includes)
 
-AM_LDFLAGS = -L$(top_srcdir)/src `sh $(top_srcdir)/pslib-config --libs`
+AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
 
 check_PROGRAMS = \
@@ -32,5 +34,5 @@
          tst_psScalar
  
-TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest 
+TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified 
 TESTS = \
          tst_psVector          \
Index: trunk/psLib/test/collections/verified/tst_psArray.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psArray.stderr	(revision 3125)
+++ trunk/psLib/test/collections/verified/tst_psArray.stderr	(revision 3127)
@@ -1,6 +1,6 @@
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message.
-<DATE><TIME>|<HOST>|E|psArrayRealloc (psArray.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psArrayRealloc (FILE:LINENO)
     psArrayRealloc must be given a non-NULL psArray to resize.
-<DATE><TIME>|<HOST>|E|psArrayRemove (psArray.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psArrayRemove (FILE:LINENO)
     Specified psArray can not be NULL.
Index: trunk/psLib/test/collections/verified/tst_psBitSet.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psBitSet.stderr	(revision 3125)
+++ trunk/psLib/test/collections/verified/tst_psBitSet.stderr	(revision 3127)
@@ -9,5 +9,5 @@
 <DATE><TIME>|<HOST>|I|testBitSet01a
     Following is an error.
-<DATE><TIME>|<HOST>|E|psBitSetAlloc (psBitSet.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBitSetAlloc (FILE:LINENO)
     The number of bit in a psBitSet (-4) must be greater than zero.
 
@@ -32,13 +32,13 @@
 <DATE><TIME>|<HOST>|I|testBitSet01b
     Following should be an error
-<DATE><TIME>|<HOST>|E|psBitSetSet (psBitSet.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBitSetSet (FILE:LINENO)
     The specified bit position (-4) is invalid.  Position must be between 0 and 23.
 <DATE><TIME>|<HOST>|I|testBitSet01b
     Following should be an error
-<DATE><TIME>|<HOST>|E|psBitSetSet (psBitSet.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBitSetSet (FILE:LINENO)
     The specified bit position (200) is invalid.  Position must be between 0 and 23.
 <DATE><TIME>|<HOST>|I|testBitSet01b
     Following should be an error
-<DATE><TIME>|<HOST>|E|psBitSetSet (psBitSet.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBitSetSet (FILE:LINENO)
     Can not operate on a NULL psBitSet.
 
@@ -56,13 +56,13 @@
 <DATE><TIME>|<HOST>|I|testBitSet01c
     Following should be an error
-<DATE><TIME>|<HOST>|E|psBitSetTest (psBitSet.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBitSetTest (FILE:LINENO)
     The specified bit position (-4) is invalid.  Position must be between 0 and 23.
 <DATE><TIME>|<HOST>|I|testBitSet01c
     Following should be an error
-<DATE><TIME>|<HOST>|E|psBitSetTest (psBitSet.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBitSetTest (FILE:LINENO)
     The specified bit position (200) is invalid.  Position must be between 0 and 23.
 <DATE><TIME>|<HOST>|I|testBitSet01c
     Following should be an error
-<DATE><TIME>|<HOST>|E|psBitSetTest (psBitSet.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBitSetTest (FILE:LINENO)
     Can not operate on a NULL psBitSet.
 
@@ -77,13 +77,13 @@
 <DATE><TIME>|<HOST>|I|testBitSet06
     Following should be an error
-<DATE><TIME>|<HOST>|E|psBitSetOp (psBitSet.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBitSetOp (FILE:LINENO)
     The psBitSet operand must be the same size.
 <DATE><TIME>|<HOST>|I|testBitSet06
     Following is an error.
-<DATE><TIME>|<HOST>|E|psBitSetOp (psBitSet.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBitSetOp (FILE:LINENO)
     Specified operator, FOO, is invalid.  Valid operators are AND, OR, and XOR.
 <DATE><TIME>|<HOST>|I|testBitSet06
     Following is an error.
-<DATE><TIME>|<HOST>|E|psBitSetOp (psBitSet.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBitSetOp (FILE:LINENO)
     Specified operator, FOO, is invalid.  Valid operators are AND, OR, and XOR.
 
Index: trunk/psLib/test/collections/verified/tst_psHash01.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psHash01.stderr	(revision 3125)
+++ trunk/psLib/test/collections/verified/tst_psHash01.stderr	(revision 3127)
@@ -1,12 +1,12 @@
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message: psHashAdd with null table
-<DATE><TIME>|<HOST>|E|psHashAdd (psHash.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psHashAdd (FILE:LINENO)
     Input psHash can not be NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message: psHashAdd with null key
-<DATE><TIME>|<HOST>|E|psHashAdd (psHash.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psHashAdd (FILE:LINENO)
     Input key can not be NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message: psHashAdd with null data
-<DATE><TIME>|<HOST>|E|psHashAdd (psHash.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psHashAdd (FILE:LINENO)
     Input data can not be NULL.
Index: trunk/psLib/test/collections/verified/tst_psHash02.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psHash02.stderr	(revision 3125)
+++ trunk/psLib/test/collections/verified/tst_psHash02.stderr	(revision 3127)
@@ -1,8 +1,8 @@
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message: psHashLookup with null table
-<DATE><TIME>|<HOST>|E|psHashLookup (psHash.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psHashLookup (FILE:LINENO)
     Input psHash can not be NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message: psHashLookup with null key
-<DATE><TIME>|<HOST>|E|psHashLookup (psHash.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psHashLookup (FILE:LINENO)
     Input key can not be NULL.
Index: trunk/psLib/test/collections/verified/tst_psHash03.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psHash03.stderr	(revision 3125)
+++ trunk/psLib/test/collections/verified/tst_psHash03.stderr	(revision 3127)
@@ -1,8 +1,8 @@
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message: psHashRemove with null table
-<DATE><TIME>|<HOST>|E|psHashRemove (psHash.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psHashRemove (FILE:LINENO)
     Input psHash can not be NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message: psHashRemove with null key
-<DATE><TIME>|<HOST>|E|psHashRemove (psHash.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psHashRemove (FILE:LINENO)
     Input key can not be NULL.
Index: trunk/psLib/test/collections/verified/tst_psHash05.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psHash05.stderr	(revision 3125)
+++ trunk/psLib/test/collections/verified/tst_psHash05.stderr	(revision 3127)
@@ -7,5 +7,5 @@
 <DATE><TIME>|<HOST>|I|hashToArray
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psHashToArray (psHash.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psHashToArray (FILE:LINENO)
     Input psHash can not be NULL.
 
Index: trunk/psLib/test/collections/verified/tst_psList.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psList.stderr	(revision 3125)
+++ trunk/psLib/test/collections/verified/tst_psList.stderr	(revision 3127)
@@ -20,13 +20,13 @@
 <DATE><TIME>|<HOST>|I|testListAdd
     Following should generate an error for using NULL list.
-<DATE><TIME>|<HOST>|E|psListAdd (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListAdd (FILE:LINENO)
     Specified psList reference is NULL.
 <DATE><TIME>|<HOST>|I|testListAdd
     Following should generate an error msg to add NULL data
-<DATE><TIME>|<HOST>|E|psListAdd (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListAdd (FILE:LINENO)
     Specified data item is NULL.
 <DATE><TIME>|<HOST>|I|testListAdd
     Following should error with invalid insert location
-<DATE><TIME>|<HOST>|E|psListIteratorSet (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListIteratorSet (FILE:LINENO)
     Specified location, -7, is invalid.
 <DATE><TIME>|<HOST>|I|testListAdd
@@ -45,13 +45,13 @@
 <DATE><TIME>|<HOST>|I|testListGet
     Following should be an error
-<DATE><TIME>|<HOST>|E|psListGet (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListGet (FILE:LINENO)
     Specified psList reference is NULL.
-<DATE><TIME>|<HOST>|E|psListIteratorSet (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListIteratorSet (FILE:LINENO)
     Specified location, 5, is invalid.
-<DATE><TIME>|<HOST>|E|psListGet (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListGet (FILE:LINENO)
     Specified location, 5, is invalid.
-<DATE><TIME>|<HOST>|E|psListIteratorSet (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListIteratorSet (FILE:LINENO)
     Specified location, 4, is invalid.
-<DATE><TIME>|<HOST>|E|psListGet (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListGet (FILE:LINENO)
     Specified location, 4, is invalid.
 
@@ -66,17 +66,17 @@
 <DATE><TIME>|<HOST>|I|testListRemove
     Following should be an error
-<DATE><TIME>|<HOST>|E|psListRemove (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListRemove (FILE:LINENO)
     Specified psList reference is NULL.
 <DATE><TIME>|<HOST>|I|testListRemove
     Next message should be an error
-<DATE><TIME>|<HOST>|E|psListRemoveData (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListRemoveData (FILE:LINENO)
     Specified data item is NULL.
 <DATE><TIME>|<HOST>|I|testListRemove
     Next message should be an error
-<DATE><TIME>|<HOST>|E|psListRemoveData (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListRemoveData (FILE:LINENO)
     Specified data item is not found in the psList.
 <DATE><TIME>|<HOST>|I|testListRemove
     NULL list in psListRemoveData should generate error message.
-<DATE><TIME>|<HOST>|E|psListRemoveData (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListRemoveData (FILE:LINENO)
     Specified psList reference is NULL.
 
@@ -131,13 +131,13 @@
 <DATE><TIME>|<HOST>|I|testListAddAfter
     NULL data pointer should generate error message
-<DATE><TIME>|<HOST>|E|psListAddAfter (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListAddAfter (FILE:LINENO)
     Specified data item is NULL.
 <DATE><TIME>|<HOST>|I|testListAddAfter
     NULL iterator should generate error message
-<DATE><TIME>|<HOST>|E|psListAddAfter (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListAddAfter (FILE:LINENO)
     Specified iterator is NULL.
 <DATE><TIME>|<HOST>|I|testListAddAfter
     Non-mutable list should generate error message
-<DATE><TIME>|<HOST>|E|psListAddAfter (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListAddAfter (FILE:LINENO)
     Specified iterator indicates list is non-mutable.
 
@@ -152,13 +152,13 @@
 <DATE><TIME>|<HOST>|I|testListAddBefore
     NULL data pointer should generate error message
-<DATE><TIME>|<HOST>|E|psListAddBefore (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListAddBefore (FILE:LINENO)
     Specified data item is NULL.
 <DATE><TIME>|<HOST>|I|testListAddBefore
     NULL iterator should generate error message
-<DATE><TIME>|<HOST>|E|psListAddBefore (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListAddBefore (FILE:LINENO)
     Specified iterator is NULL.
 <DATE><TIME>|<HOST>|I|testListAddBefore
     Non-mutable list should generate error message
-<DATE><TIME>|<HOST>|E|psListAddBefore (psList.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psListAddBefore (FILE:LINENO)
     Specified iterator indicates list is non-mutable.
 
Index: trunk/psLib/test/collections/verified/tst_psScalar.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psScalar.stderr	(revision 3125)
+++ trunk/psLib/test/collections/verified/tst_psScalar.stderr	(revision 3127)
@@ -9,5 +9,5 @@
 <DATE><TIME>|<HOST>|I|testScalarAlloc
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psScalarAlloc (psScalar.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psScalarAlloc (FILE:LINENO)
     Specified datatype (4865) is unsupported by psScalar.
 
@@ -24,9 +24,9 @@
 <DATE><TIME>|<HOST>|I|testScalarCopy
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psScalarCopy (psScalar.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psScalarCopy (FILE:LINENO)
     Specified datatype (4865) is unsupported by psScalar.
 <DATE><TIME>|<HOST>|I|testScalarCopy
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psScalarCopy (psScalar.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psScalarCopy (FILE:LINENO)
     Can not copy a NULL psScalar.
 
Index: trunk/psLib/test/collections/verified/tst_psVector.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psVector.stderr	(revision 3125)
+++ trunk/psLib/test/collections/verified/tst_psVector.stderr	(revision 3127)
@@ -3,4 +3,4 @@
 <DATE><TIME>|<HOST>|I|main
     Following should be an error message.
-<DATE><TIME>|<HOST>|E|psVectorRealloc (psVector.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorRealloc (FILE:LINENO)
     psVectorRealloc must a given a non-NULL psVector to resize.  Desired datatype unknown.
Index: trunk/psLib/test/collections/verified/tst_psVectorSort_01.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psVectorSort_01.stderr	(revision 3125)
+++ trunk/psLib/test/collections/verified/tst_psVectorSort_01.stderr	(revision 3127)
@@ -1,4 +1,4 @@
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error messgae
-<DATE><TIME>|<HOST>|E|psVectorSort (psVector.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorSort (FILE:LINENO)
     Input psVector is an unsupported type (4865).
Index: trunk/psLib/test/collections/verified/tst_psVectorSort_02.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psVectorSort_02.stderr	(revision 3125)
+++ trunk/psLib/test/collections/verified/tst_psVectorSort_02.stderr	(revision 3127)
@@ -1,10 +1,10 @@
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psVectorSortIndex (psVector.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorSortIndex (FILE:LINENO)
     psVectorSort can not sort a NULL psVector.
 <DATE><TIME>|<HOST>|I|main
     Following should generate two error messages(psVectorSort,psVectorSortIndex)
-<DATE><TIME>|<HOST>|E|psVectorSort (psVector.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorSort (FILE:LINENO)
     Input psVector is an unsupported type (4865).
-<DATE><TIME>|<HOST>|E|psVectorSortIndex (psVector.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorSortIndex (FILE:LINENO)
     Input psVector is an unsupported type (4865).
Index: trunk/psLib/test/collections/verified/tst_psVectorSort_04.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psVectorSort_04.stderr	(revision 3125)
+++ trunk/psLib/test/collections/verified/tst_psVectorSort_04.stderr	(revision 3127)
@@ -1,2 +1,2 @@
-<DATE><TIME>|<HOST>|E|psVectorSort (psVector.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorSort (FILE:LINENO)
     psVectorSort can not sort a NULL psVector.
Index: trunk/psLib/test/dataIO/Makefile.am
===================================================================
--- trunk/psLib/test/dataIO/Makefile.am	(revision 3125)
+++ trunk/psLib/test/dataIO/Makefile.am	(revision 3127)
@@ -1,4 +1,6 @@
-#Makefile for astronomy functions of psLib
+#Makefile for fileUtils functions of psLib
 #
+EXTRA_DIST = verified
+
 INCLUDES = \
 	-I$(top_srcdir)/src \
@@ -11,5 +13,5 @@
 	$(all_includes)
 
-AM_LDFLAGS = -L$(top_srcdir)/src `sh $(top_srcdir)/pslib-config --libs`
+AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
 
 check_PROGRAMS = \
@@ -17,5 +19,5 @@
 	tst_psFits
 
-TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest 
+TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified 
 TESTS = \
 	tst_psLookupTable_01 \
Index: trunk/psLib/test/dataIO/verified/tst_psFits.stderr
===================================================================
--- trunk/psLib/test/dataIO/verified/tst_psFits.stderr	(revision 3125)
+++ trunk/psLib/test/dataIO/verified/tst_psFits.stderr	(revision 3127)
@@ -16,14 +16,14 @@
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtName
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsMoveExtName (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsMoveExtName (FILE:LINENO)
     Could not find HDU 'bogus' in file multi.fits.
     CFITSIO Error: illegal HDU number
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtName
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsMoveExtName (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsMoveExtName (FILE:LINENO)
     The input psFits object can not NULL.
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtName
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsMoveExtName (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsMoveExtName (FILE:LINENO)
     Specified extension name can not be NULL.
 
@@ -38,29 +38,29 @@
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsGetSize (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsGetSize (FILE:LINENO)
     The input psFits object can not NULL.
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (FILE:LINENO)
     Could not move to specified HDU #-1 in file multi.fits.
     CFITSIO Error: illegal HDU number
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (FILE:LINENO)
     Could not move -1 HDUs from current position in file multi.fits.
     CFITSIO Error: illegal HDU number
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (FILE:LINENO)
     Could not move to specified HDU #8 in file multi.fits.
     CFITSIO Error: tried to move past end of file
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (FILE:LINENO)
     Could not move 1 HDUs from current position in file multi.fits.
     CFITSIO Error: tried to move past end of file
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (FILE:LINENO)
     The input psFits object can not NULL.
 
@@ -75,5 +75,5 @@
 <DATE><TIME>|<HOST>|I|tst_psFitsReadHeader
     following should be an error (input psFits = NULL)
-<DATE><TIME>|<HOST>|E|psFitsReadHeader (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsReadHeader (FILE:LINENO)
     The input psFits object can not NULL.
 
@@ -86,5 +86,5 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psFitsReadHeaderSet (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsReadHeaderSet (FILE:LINENO)
     The input psFits object can not NULL.
 
@@ -97,5 +97,5 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psFitsReadTable (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsReadTable (FILE:LINENO)
     The input psFits object can not NULL.
 
@@ -119,5 +119,5 @@
 <DATE><TIME>|<HOST>|I|testImageWrite
     Following should generate an error message because input image is null.
-<DATE><TIME>|<HOST>|E|psFitsWriteImage (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsWriteImage (FILE:LINENO)
     The input psImage was NULL.  Need a non-NULL psImage for operation to be performed.
 
Index: trunk/psLib/test/dataManip/Makefile.am
===================================================================
--- trunk/psLib/test/dataManip/Makefile.am	(revision 3125)
+++ trunk/psLib/test/dataManip/Makefile.am	(revision 3127)
@@ -1,4 +1,6 @@
-#Makefile for astronomy functions of psLib
+#Makefile for dataManip functions of psLib
 #
+EXTRA_DIST = verified
+
 INCLUDES = \
 	-I$(top_srcdir)/src \
@@ -11,5 +13,5 @@
 	$(all_includes)
 
-AM_LDFLAGS = -L$(top_srcdir)/src `sh $(top_srcdir)/pslib-config --libs`
+AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
 
 check_PROGRAMS = \
@@ -55,5 +57,5 @@
 	tst_psVectorFFT 
 
-TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest 
+TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified 
 TESTS = \
 	tst_psFunc00 \
Index: trunk/psLib/test/dataManip/verified/tst_psFunc02.stderr
===================================================================
--- trunk/psLib/test/dataManip/verified/tst_psFunc02.stderr	(revision 3125)
+++ trunk/psLib/test/dataManip/verified/tst_psFunc02.stderr	(revision 3127)
@@ -1,20 +1,20 @@
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message.
-<DATE><TIME>|<HOST>|E|psSpline1DAlloc (psFunctions.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psSpline1DAlloc (FILE:LINENO)
     Error: max and min are equal.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psSpline1DAlloc (psFunctions.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psSpline1DAlloc (FILE:LINENO)
     Error: max and min are equal.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message.
-<DATE><TIME>|<HOST>|E|psSpline1DAllocGeneric (psFunctions.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psSpline1DAllocGeneric (FILE:LINENO)
     Error: order is less than 0.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message.
-<DATE><TIME>|<HOST>|E|psSpline1DAllocGeneric (psFunctions.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psSpline1DAllocGeneric (FILE:LINENO)
     Unallowable operation: psVector bounds or its data is NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message.
-<DATE><TIME>|<HOST>|E|psSpline1DAllocGeneric (psFunctions.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psSpline1DAllocGeneric (FILE:LINENO)
     Unallowable operation: psVector bounds has no elements.
Index: trunk/psLib/test/dataManip/verified/tst_psHist00.stderr
===================================================================
--- trunk/psLib/test/dataManip/verified/tst_psHist00.stderr	(revision 3125)
+++ trunk/psLib/test/dataManip/verified/tst_psHist00.stderr	(revision 3127)
@@ -1,4 +1,4 @@
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message.
-<DATE><TIME>|<HOST>|E|psHistogramAlloc (psStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psHistogramAlloc (FILE:LINENO)
     Error: (lower > upper) (30.000000 20.000000)
Index: trunk/psLib/test/dataManip/verified/tst_psHist02.stderr
===================================================================
--- trunk/psLib/test/dataManip/verified/tst_psHist02.stderr	(revision 3125)
+++ trunk/psLib/test/dataManip/verified/tst_psHist02.stderr	(revision 3127)
@@ -1,8 +1,8 @@
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message.
-<DATE><TIME>|<HOST>|E|psVectorHistogram (psStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorHistogram (FILE:LINENO)
     Unallowable operation: out is NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message.
-<DATE><TIME>|<HOST>|E|psVectorHistogram (psStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorHistogram (FILE:LINENO)
     Unallowable operation: psVector in or its data is NULL.
Index: trunk/psLib/test/dataManip/verified/tst_psMatrix02.stderr
===================================================================
--- trunk/psLib/test/dataManip/verified/tst_psMatrix02.stderr	(revision 3125)
+++ trunk/psLib/test/dataManip/verified/tst_psMatrix02.stderr	(revision 3127)
@@ -1,6 +1,6 @@
-<DATE><TIME>|<HOST>|E|psMatrixTranspose (psMatrix.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMatrixTranspose (FILE:LINENO)
     Invalid operation: Pointer to inImage is same as outImage.
-<DATE><TIME>|<HOST>|E|psMatrixTranspose (psMatrix.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMatrixTranspose (FILE:LINENO)
     Unallowable operation: psImage inImage or its data is NULL.
-<DATE><TIME>|<HOST>|E|psMatrixTranspose (psMatrix.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMatrixTranspose (FILE:LINENO)
     Invalid operation. inImage not PS_TYPE_F64.
Index: trunk/psLib/test/dataManip/verified/tst_psMatrix03.stderr
===================================================================
--- trunk/psLib/test/dataManip/verified/tst_psMatrix03.stderr	(revision 3125)
+++ trunk/psLib/test/dataManip/verified/tst_psMatrix03.stderr	(revision 3127)
@@ -1,6 +1,6 @@
-<DATE><TIME>|<HOST>|E|psMatrixLUD (psMatrix.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMatrixLUD (FILE:LINENO)
     Unallowable operation: psImage inImage or its data is NULL.
-<DATE><TIME>|<HOST>|E|psMatrixLUSolve (psMatrix.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMatrixLUSolve (FILE:LINENO)
     Unallowable operation: psVector inVector or its data is NULL.
-<DATE><TIME>|<HOST>|E|psMatrixLUSolve (psMatrix.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMatrixLUSolve (FILE:LINENO)
     Unallowable operation: psImage inImage or its data is NULL.
Index: trunk/psLib/test/dataManip/verified/tst_psMatrix04.stderr
===================================================================
--- trunk/psLib/test/dataManip/verified/tst_psMatrix04.stderr	(revision 3125)
+++ trunk/psLib/test/dataManip/verified/tst_psMatrix04.stderr	(revision 3127)
@@ -1,4 +1,4 @@
-<DATE><TIME>|<HOST>|E|psMatrixInvert (psMatrix.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMatrixInvert (FILE:LINENO)
     Unallowable operation: psImage inImage or its data is NULL.
-<DATE><TIME>|<HOST>|E|psMatrixInvert (psMatrix.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMatrixInvert (FILE:LINENO)
     Unallowable operation: det is NULL.
Index: trunk/psLib/test/dataManip/verified/tst_psMatrix07.stderr
===================================================================
--- trunk/psLib/test/dataManip/verified/tst_psMatrix07.stderr	(revision 3125)
+++ trunk/psLib/test/dataManip/verified/tst_psMatrix07.stderr	(revision 3127)
@@ -1,6 +1,6 @@
-<DATE><TIME>|<HOST>|E|psMatrixToVector (psMatrix.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMatrixToVector (FILE:LINENO)
     Unallowable operation: psImage inImage or its data is NULL.
-<DATE><TIME>|<HOST>|E|psMatrixToVector (psMatrix.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMatrixToVector (FILE:LINENO)
     Image does not have dim with 1 col or 1 row: (2 x 2).
-<DATE><TIME>|<HOST>|E|psVectorToMatrix (psMatrix.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorToMatrix (FILE:LINENO)
     Unallowable operation: psVector inVector or its data is NULL.
Index: trunk/psLib/test/dataManip/verified/tst_psMatrixVectorArithmetic03.stderr
===================================================================
--- trunk/psLib/test/dataManip/verified/tst_psMatrixVectorArithmetic03.stderr	(revision 3125)
+++ trunk/psLib/test/dataManip/verified/tst_psMatrixVectorArithmetic03.stderr	(revision 3127)
@@ -1,66 +1,66 @@
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psBinaryOp (psMatrixVectorArithmetic.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBinaryOp (FILE:LINENO)
     Unallowable operation: input1 is NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psBinaryOp (psMatrixVectorArithmetic.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBinaryOp (FILE:LINENO)
     Unallowable operation: input2 is NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psBinaryOp (psMatrixVectorArithmetic.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBinaryOp (FILE:LINENO)
     Unallowable operation: op is NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psUnaryOp (psMatrixVectorArithmetic.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psUnaryOp (FILE:LINENO)
     Unallowable operation: in is NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psUnaryOp (psMatrixVectorArithmetic.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psUnaryOp (FILE:LINENO)
     Unallowable operation: op is NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psBinaryOp (psMatrixVectorArithmetic.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBinaryOp (FILE:LINENO)
     ptr input1 has type 1028, ptr input2 has type 1032.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psBinaryOp (psMatrixVectorArithmetic.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBinaryOp (FILE:LINENO)
     Specified psImage dimensions differed, 2x2 vs 3x3.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psBinaryOp (psMatrixVectorArithmetic.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBinaryOp (FILE:LINENO)
     Number of elements inconsistent, 2 vs 3.  Number of elements must match.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psBinaryOp (psMatrixVectorArithmetic.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBinaryOp (FILE:LINENO)
     Number of elements inconsistent, 2 vs 3.  Number of elements must match.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an two error messages
-<DATE><TIME>|<HOST>|E|psVectorRecycle (psVector.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorRecycle (FILE:LINENO)
     The input psVector must have a vector dimension type.
-<DATE><TIME>|<HOST>|E|psUnaryOp (psMatrixVectorArithmetic.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psUnaryOp (FILE:LINENO)
     Couldn't create a proper output psVector.
 <DATE><TIME>|<HOST>|I|main
     Following should generate error message
-<DATE><TIME>|<HOST>|E|psBinaryOp (psMatrixVectorArithmetic.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBinaryOp (FILE:LINENO)
     The minimum operation is not supported with complex data.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psBinaryOp (psMatrixVectorArithmetic.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBinaryOp (FILE:LINENO)
     The maximum operation is not supported with complex data.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error messgae
-<DATE><TIME>|<HOST>|E|psBinaryOp (psMatrixVectorArithmetic.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBinaryOp (FILE:LINENO)
     Specified operation, yarg, is not supported.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psUnaryOp (psMatrixVectorArithmetic.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psUnaryOp (FILE:LINENO)
     Specified operation, yarg, is not supported.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psBinaryOp (psMatrixVectorArithmetic.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psBinaryOp (FILE:LINENO)
     Unallowable operation: input1 has incorrect dimensionality.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psUnaryOp (psMatrixVectorArithmetic.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psUnaryOp (FILE:LINENO)
     Specified parameter, in, has invalid dimensionality, 4.
Index: trunk/psLib/test/dataManip/verified/tst_psMinimize04.stderr
===================================================================
--- trunk/psLib/test/dataManip/verified/tst_psMinimize04.stderr	(revision 3125)
+++ trunk/psLib/test/dataManip/verified/tst_psMinimize04.stderr	(revision 3127)
@@ -1,4 +1,4 @@
 <DATE><TIME>|<HOST>|I|t03
     Following should generate an error for null input polynomial.
-<DATE><TIME>|<HOST>|E|psVectorFitPolynomial1D (psMinimize.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorFitPolynomial1D (FILE:LINENO)
     Unallowable operation: polynomial myPoly or its coeffs is NULL.
Index: trunk/psLib/test/dataManip/verified/tst_psMinimize04_F32.stderr
===================================================================
--- trunk/psLib/test/dataManip/verified/tst_psMinimize04_F32.stderr	(revision 3125)
+++ trunk/psLib/test/dataManip/verified/tst_psMinimize04_F32.stderr	(revision 3127)
@@ -1,4 +1,4 @@
 <DATE><TIME>|<HOST>|I|t03
     Following should generate an error for null input polynomial.
-<DATE><TIME>|<HOST>|E|psVectorFitPolynomial1D (psMinimize.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorFitPolynomial1D (FILE:LINENO)
     Unallowable operation: polynomial myPoly or its coeffs is NULL.
Index: trunk/psLib/test/dataManip/verified/tst_psMinimize04b.stderr
===================================================================
--- trunk/psLib/test/dataManip/verified/tst_psMinimize04b.stderr	(revision 3125)
+++ trunk/psLib/test/dataManip/verified/tst_psMinimize04b.stderr	(revision 3127)
@@ -1,4 +1,4 @@
 <DATE><TIME>|<HOST>|I|t03
     Following should generate an error for null arguments.
-<DATE><TIME>|<HOST>|E|psVectorFitPolynomial1D (psMinimize.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorFitPolynomial1D (FILE:LINENO)
     Unallowable operation: polynomial myPoly or its coeffs is NULL.
Index: trunk/psLib/test/dataManip/verified/tst_psMinimize04b_F32.stderr
===================================================================
--- trunk/psLib/test/dataManip/verified/tst_psMinimize04b_F32.stderr	(revision 3125)
+++ trunk/psLib/test/dataManip/verified/tst_psMinimize04b_F32.stderr	(revision 3127)
@@ -1,4 +1,4 @@
 <DATE><TIME>|<HOST>|I|t03
     Following should generate an error for null arguments.
-<DATE><TIME>|<HOST>|E|psVectorFitPolynomial1D (psMinimize.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorFitPolynomial1D (FILE:LINENO)
     Unallowable operation: polynomial myPoly or its coeffs is NULL.
Index: trunk/psLib/test/dataManip/verified/tst_psMinimize05.stderr
===================================================================
--- trunk/psLib/test/dataManip/verified/tst_psMinimize05.stderr	(revision 3125)
+++ trunk/psLib/test/dataManip/verified/tst_psMinimize05.stderr	(revision 3127)
@@ -1,16 +1,16 @@
 <DATE><TIME>|<HOST>|I|t02
     Following should generate error for null minimize.
-<DATE><TIME>|<HOST>|E|psMinimizePowell (psMinimize.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMinimizePowell (FILE:LINENO)
     Unallowable operation: min is NULL.
 <DATE><TIME>|<HOST>|I|t02
     Following should generate error for null parameter vector
-<DATE><TIME>|<HOST>|E|psMinimizePowell (psMinimize.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMinimizePowell (FILE:LINENO)
     Unallowable operation: psVector params or its data is NULL.
 <DATE><TIME>|<HOST>|I|t02
     Following should generate error for null coords.
-<DATE><TIME>|<HOST>|E|psMinimizePowell (psMinimize.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMinimizePowell (FILE:LINENO)
     Unallowable operation: coords is NULL.
 <DATE><TIME>|<HOST>|I|t02
     Following should generate error for null function
-<DATE><TIME>|<HOST>|E|psMinimizePowell (psMinimize.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psMinimizePowell (FILE:LINENO)
     Unallowable operation: func is NULL.
Index: trunk/psLib/test/dataManip/verified/tst_psRandom.stderr
===================================================================
--- trunk/psLib/test/dataManip/verified/tst_psRandom.stderr	(revision 3125)
+++ trunk/psLib/test/dataManip/verified/tst_psRandom.stderr	(revision 3127)
@@ -1,20 +1,20 @@
 <DATE><TIME>|<HOST>|I|t00
     Invalid type, should generate error message
-<DATE><TIME>|<HOST>|E|psRandomAlloc (psRandom.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psRandomAlloc (FILE:LINENO)
     Unknown Random Number Generator Type
 <DATE><TIME>|<HOST>|I|t01
     NULL psRandom variable, should generate error message
-<DATE><TIME>|<HOST>|E|psRandomUniform (psRandom.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psRandomUniform (FILE:LINENO)
     Random variable is NULL.
 <DATE><TIME>|<HOST>|I|t02
     NULL psRandom variable, should generate error message
-<DATE><TIME>|<HOST>|E|psRandomGaussian (psRandom.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psRandomGaussian (FILE:LINENO)
     Random variable is NULL.
 <DATE><TIME>|<HOST>|I|t03
     NULL psRandom variable, should generate error message
-<DATE><TIME>|<HOST>|E|psRandomPoisson (psRandom.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psRandomPoisson (FILE:LINENO)
     Random variable is NULL.
 <DATE><TIME>|<HOST>|I|t04
     Reset a NULL psRandom variable, should generate an error message
-<DATE><TIME>|<HOST>|E|psRandomReset (psRandom.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psRandomReset (FILE:LINENO)
     Random variable is NULL.
Index: trunk/psLib/test/dataManip/verified/tst_psStats00.stderr
===================================================================
--- trunk/psLib/test/dataManip/verified/tst_psStats00.stderr	(revision 3125)
+++ trunk/psLib/test/dataManip/verified/tst_psStats00.stderr	(revision 3127)
@@ -1,8 +1,8 @@
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message.
-<DATE><TIME>|<HOST>|E|psVectorStats (psStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorStats (FILE:LINENO)
     Unallowable operation: psVector in or its data is NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should generate an error message.
-<DATE><TIME>|<HOST>|E|psVectorStats (psStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorStats (FILE:LINENO)
     Unallowable operation: stats is NULL.
Index: trunk/psLib/test/dataManip/verified/tst_psVectorFFT.stderr
===================================================================
--- trunk/psLib/test/dataManip/verified/tst_psVectorFFT.stderr	(revision 3125)
+++ trunk/psLib/test/dataManip/verified/tst_psVectorFFT.stderr	(revision 3127)
@@ -7,5 +7,5 @@
 <DATE><TIME>|<HOST>|I|testVectorFFT
     Following should generate an error message.
-<DATE><TIME>|<HOST>|E|psVectorFFT (psVectorFFT.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorFFT (FILE:LINENO)
     Must specify the direction as either PS_FFT_FORWARD or PS_FFT_REVERSE.
 
@@ -37,9 +37,9 @@
 <DATE><TIME>|<HOST>|I|testVectorComplex
     Following should be an error (type mismatch).
-<DATE><TIME>|<HOST>|E|psVectorComplex (psVectorFFT.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorComplex (FILE:LINENO)
     Real psVector type, psF32, and imaginary psVector type, psF64, must be the same.
 <DATE><TIME>|<HOST>|I|testVectorComplex
     Following should generate an error message.
-<DATE><TIME>|<HOST>|E|psVectorComplex (psVectorFFT.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorComplex (FILE:LINENO)
     Input psVector type, psS8, is required to be either psF32 or psF64.
 
@@ -67,5 +67,5 @@
 <DATE><TIME>|<HOST>|I|testVectorPowerSpectrum
     Following should generate an error message.
-<DATE><TIME>|<HOST>|E|psVectorPowerSpectrum (psVectorFFT.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psVectorPowerSpectrum (FILE:LINENO)
     Input psVector type, psF32, is required to be either psC32 or psC64.
 
Index: trunk/psLib/test/fileUtils/Makefile.am
===================================================================
--- trunk/psLib/test/fileUtils/Makefile.am	(revision 3125)
+++ trunk/psLib/test/fileUtils/Makefile.am	(revision 3127)
@@ -1,4 +1,6 @@
-#Makefile for astronomy functions of psLib
+#Makefile for fileUtils functions of psLib
 #
+EXTRA_DIST = verified
+
 INCLUDES = \
 	-I$(top_srcdir)/src \
@@ -11,5 +13,5 @@
 	$(all_includes)
 
-AM_LDFLAGS = -L$(top_srcdir)/src `sh $(top_srcdir)/pslib-config --libs`
+AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
 
 check_PROGRAMS = \
@@ -17,5 +19,5 @@
 	tst_psFits
 
-TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest 
+TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified 
 TESTS = \
 	tst_psLookupTable_01 \
Index: trunk/psLib/test/fileUtils/verified/tst_psFits.stderr
===================================================================
--- trunk/psLib/test/fileUtils/verified/tst_psFits.stderr	(revision 3125)
+++ trunk/psLib/test/fileUtils/verified/tst_psFits.stderr	(revision 3127)
@@ -16,14 +16,14 @@
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtName
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsMoveExtName (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsMoveExtName (FILE:LINENO)
     Could not find HDU 'bogus' in file multi.fits.
     CFITSIO Error: illegal HDU number
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtName
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsMoveExtName (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsMoveExtName (FILE:LINENO)
     The input psFits object can not NULL.
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtName
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsMoveExtName (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsMoveExtName (FILE:LINENO)
     Specified extension name can not be NULL.
 
@@ -38,29 +38,29 @@
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsGetSize (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsGetSize (FILE:LINENO)
     The input psFits object can not NULL.
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (FILE:LINENO)
     Could not move to specified HDU #-1 in file multi.fits.
     CFITSIO Error: illegal HDU number
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (FILE:LINENO)
     Could not move -1 HDUs from current position in file multi.fits.
     CFITSIO Error: illegal HDU number
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (FILE:LINENO)
     Could not move to specified HDU #8 in file multi.fits.
     CFITSIO Error: tried to move past end of file
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (FILE:LINENO)
     Could not move 1 HDUs from current position in file multi.fits.
     CFITSIO Error: tried to move past end of file
 <DATE><TIME>|<HOST>|I|tst_psFitsMoveExtNum
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsMoveExtNum (FILE:LINENO)
     The input psFits object can not NULL.
 
@@ -75,5 +75,5 @@
 <DATE><TIME>|<HOST>|I|tst_psFitsReadHeader
     following should be an error (input psFits = NULL)
-<DATE><TIME>|<HOST>|E|psFitsReadHeader (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsReadHeader (FILE:LINENO)
     The input psFits object can not NULL.
 
@@ -86,5 +86,5 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psFitsReadHeaderSet (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsReadHeaderSet (FILE:LINENO)
     The input psFits object can not NULL.
 
@@ -97,5 +97,5 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psFitsReadTable (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsReadTable (FILE:LINENO)
     The input psFits object can not NULL.
 
@@ -119,5 +119,5 @@
 <DATE><TIME>|<HOST>|I|testImageWrite
     Following should generate an error message because input image is null.
-<DATE><TIME>|<HOST>|E|psFitsWriteImage (psFits.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psFitsWriteImage (FILE:LINENO)
     The input psImage was NULL.  Need a non-NULL psImage for operation to be performed.
 
Index: trunk/psLib/test/image/Makefile.am
===================================================================
--- trunk/psLib/test/image/Makefile.am	(revision 3125)
+++ trunk/psLib/test/image/Makefile.am	(revision 3127)
@@ -1,4 +1,6 @@
-#Makefile for astronomy functions of psLib
+#Makefile for image functions of psLib
 #
+EXTRA_DIST = verified
+
 INCLUDES = \
 	-I$(top_srcdir)/src \
@@ -11,5 +13,5 @@
 	$(all_includes)
 
-AM_LDFLAGS = -L$(top_srcdir)/src `sh $(top_srcdir)/pslib-config --libs`
+AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
 
 check_PROGRAMS = \
@@ -27,5 +29,5 @@
 	tst_psImageInterpolate
 
-TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest 
+TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified 
 TESTS = \
 	tst_psImage \
Index: trunk/psLib/test/image/verified/tst_psImage.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImage.stderr	(revision 3125)
+++ trunk/psLib/test/image/verified/tst_psImage.stderr	(revision 3127)
@@ -11,5 +11,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -17,5 +17,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -23,5 +23,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -29,5 +29,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -35,5 +35,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -41,5 +41,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -47,5 +47,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -53,5 +53,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -59,5 +59,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -65,5 +65,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -71,5 +71,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -77,5 +77,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
     Specified number of rows (0) or columns (0) is invalid.
 <DATE><TIME>|<HOST>|I|testImageAlloc
@@ -83,5 +83,5 @@
 <DATE><TIME>|<HOST>|I|testImageAlloc
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageAlloc (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageAlloc (FILE:LINENO)
     Specified number of rows (0) or columns (0) is invalid.
 
@@ -112,5 +112,5 @@
 <DATE><TIME>|<HOST>|I|testImageCopy
     An error should follow...
-<DATE><TIME>|<HOST>|E|psImageCopy (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageCopy (FILE:LINENO)
     Can not operate on a NULL psImage.
 
@@ -123,6 +123,6 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psRegionFromString (psImage.c:<LINENO>)
-    Specified subsection string, '[1:<LINENO>,3:]', can not be parsed.  Must be in the form '[x1:x2,y1:y2]'.
+<DATE><TIME>|<HOST>|E|psRegionFromString (FILE:LINENO)
+    Specified subsection string, '[1:2,3:]', can not be parsed.  Must be in the form '[x1:x2,y1:y2]'.
 
 ---> TESTPOINT PASSED (psImage{psRegionAlloc} | tst_psImage.c)
Index: trunk/psLib/test/image/verified/tst_psImageConvolve.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImageConvolve.stderr	(revision 3125)
+++ trunk/psLib/test/image/verified/tst_psImageConvolve.stderr	(revision 3127)
@@ -24,17 +24,17 @@
 <DATE><TIME>|<HOST>|I|testKernelGenerate
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psKernelGenerate (psImageConvolve.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psKernelGenerate (FILE:LINENO)
     Shift vectors can not be of different sizes.
 <DATE><TIME>|<HOST>|I|testKernelGenerate
     Following should be a error (time vector NULL).
-<DATE><TIME>|<HOST>|E|psKernelGenerate (psImageConvolve.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psKernelGenerate (FILE:LINENO)
     Specified shift vectors can not be NULL.
 <DATE><TIME>|<HOST>|I|testKernelGenerate
     Following should be a error (x vector NULL).
-<DATE><TIME>|<HOST>|E|psKernelGenerate (psImageConvolve.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psKernelGenerate (FILE:LINENO)
     Specified shift vectors can not be NULL.
 <DATE><TIME>|<HOST>|I|testKernelGenerate
     Following should be a error (y vector NULL).
-<DATE><TIME>|<HOST>|E|psKernelGenerate (psImageConvolve.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psKernelGenerate (FILE:LINENO)
     Specified shift vectors can not be NULL.
 
Index: trunk/psLib/test/image/verified/tst_psImageExtraction.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImageExtraction.stderr	(revision 3125)
+++ trunk/psLib/test/image/verified/tst_psImageExtraction.stderr	(revision 3127)
@@ -23,5 +23,5 @@
 <DATE><TIME>|<HOST>|I|testImageSubset
     An error should follow...
-<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
     Can not operate on a NULL psImage.
 <DATE><TIME>|<HOST>|I|testImageSubset
@@ -29,42 +29,42 @@
 <DATE><TIME>|<HOST>|I|testImageSubset
     An error should follow...
-<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
-    Specified subset range, [0:<LINENO>,128:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageSubset
-    An error should follow...
-<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
-    Specified subset range, [64:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
+<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
+    Specified subset range, [0:63,128:127], is invalid or outside input psImage's boundaries, [0:127,0:255].
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
+    Specified subset range, [64:63,0:127], is invalid or outside input psImage's boundaries, [0:127,0:255].
 <DATE><TIME>|<HOST>|I|testImageSubset
     Verify the returned psImage structure pointer is null and program execution doesn't stop, if the input parameters row0 and col0 are not within the range of values of psImage structure image.
 <DATE><TIME>|<HOST>|I|testImageSubset
     An error should follow...
-<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
-    Specified subset range, [0:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageSubset
-    An error should follow...
-<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
-    Specified subset range, [0:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageSubset
-    An error should follow...
-<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
-    Specified subset range, [-1:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageSubset
-    An error should follow...
-<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
-    Specified subset range, [0:<LINENO>,-1:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
+<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
+    Specified subset range, [0:63,0:511], is invalid or outside input psImage's boundaries, [0:127,0:255].
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
+    Specified subset range, [0:255,0:127], is invalid or outside input psImage's boundaries, [0:127,0:255].
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
+    Specified subset range, [-1:63,0:127], is invalid or outside input psImage's boundaries, [0:127,0:255].
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
+    Specified subset range, [0:63,-1:127], is invalid or outside input psImage's boundaries, [0:127,0:255].
 <DATE><TIME>|<HOST>|I|testImageSubset
     Verify the returned psImage structure pointer is null and program execution doesn't stop if the input parameters nrow, ncol, row0 and col0 specify a range of data not within the input psImage structure image.  Also verify the input psImage structure is not modified.
 <DATE><TIME>|<HOST>|I|testImageSubset
     An error should follow...
-<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
-    Specified subset range, [0:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageSubset
-    An error should follow...
-<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
-    Specified subset range, [0:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageSubset
-    An error should follow...
-<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
-    Specified subset range, [0:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
+<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
+    Specified subset range, [0:63,0:256], is invalid or outside input psImage's boundaries, [0:127,0:255].
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
+    Specified subset range, [0:128,0:127], is invalid or outside input psImage's boundaries, [0:127,0:255].
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
+    Specified subset range, [0:128,0:256], is invalid or outside input psImage's boundaries, [0:127,0:255].
 <DATE><TIME>|<HOST>|I|testImageSubset
     psImageFreeChildren shall deallocate any children images of a psImage structure
@@ -79,46 +79,46 @@
 
 <DATE><TIME>|<HOST>|I|testImageSubsection
-    Testing subsection [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageSubsection
-    Testing subsection [32:<LINENO>,32:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageSubsection
-    Testing subsection [64:<LINENO>,32:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageSubsection
-    Testing subsection [32:<LINENO>,128:<LINENO>].
+    Testing subsection [0:32,0:32].
+<DATE><TIME>|<HOST>|I|testImageSubsection
+    Testing subsection [32:64,32:64].
+<DATE><TIME>|<HOST>|I|testImageSubsection
+    Testing subsection [64:127,32:64].
+<DATE><TIME>|<HOST>|I|testImageSubsection
+    Testing subsection [32:64,128:255].
 <DATE><TIME>|<HOST>|I|testImageSubsection
     An error should follow (x1>x2)
-<DATE><TIME>|<HOST>|E|psImageSubsection (psImageExtraction.c:<LINENO>)
-    Specified subset range, [64:<LINENO>,32:<LINENO>], is invalid.  Ranges must be incremental.
+<DATE><TIME>|<HOST>|E|psImageSubsection (FILE:LINENO)
+    Specified subset range, [64:32,32:64], is invalid.  Ranges must be incremental.
 <DATE><TIME>|<HOST>|I|testImageSubsection
     An error should follow (y1>y2)
-<DATE><TIME>|<HOST>|E|psImageSubsection (psImageExtraction.c:<LINENO>)
-    Specified subset range, [32:<LINENO>,64:<LINENO>], is invalid.  Ranges must be incremental.
+<DATE><TIME>|<HOST>|E|psImageSubsection (FILE:LINENO)
+    Specified subset range, [32:64,64:32], is invalid.  Ranges must be incremental.
 <DATE><TIME>|<HOST>|I|testImageSubsection
     An error should follow (x2>nCols)
-<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
-    Specified subset range, [64:<LINENO>,32:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
+<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
+    Specified subset range, [64:256,32:64], is invalid or outside input psImage's boundaries, [0:127,0:255].
 <DATE><TIME>|<HOST>|I|testImageSubsection
     An error should follow (y2>=nRows)
-<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
-    Specified subset range, [32:<LINENO>,64:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
+<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
+    Specified subset range, [32:64,64:256], is invalid or outside input psImage's boundaries, [0:127,0:255].
 <DATE><TIME>|<HOST>|I|testImageSubsection
     An error should follow (malformed string - no brackets)
-<DATE><TIME>|<HOST>|E|psImageSubsection (psImageExtraction.c:<LINENO>)
-    Specified subsection string, '32:<LINENO>,32:<LINENO>', can not be parsed.  Must be in the form '[x1:x2,y1:y2]'.
+<DATE><TIME>|<HOST>|E|psImageSubsection (FILE:LINENO)
+    Specified subsection string, '32:64,32:64', can not be parsed.  Must be in the form '[x1:x2,y1:y2]'.
 <DATE><TIME>|<HOST>|I|testImageSubsection
     An error should follow (malformed string - no colons)
-<DATE><TIME>|<HOST>|E|psImageSubsection (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageSubsection (FILE:LINENO)
     Specified subsection string, '[32-64,32-64]', can not be parsed.  Must be in the form '[x1:x2,y1:y2]'.
 <DATE><TIME>|<HOST>|I|testImageSubsection
     An error should follow (malformed string - not four numbers)
-<DATE><TIME>|<HOST>|E|psImageSubsection (psImageExtraction.c:<LINENO>)
-    Specified subsection string, '[32:<LINENO>,32]', can not be parsed.  Must be in the form '[x1:x2,y1:y2]'.
+<DATE><TIME>|<HOST>|E|psImageSubsection (FILE:LINENO)
+    Specified subsection string, '[32:64,32]', can not be parsed.  Must be in the form '[x1:x2,y1:y2]'.
 <DATE><TIME>|<HOST>|I|testImageSubsection
     An error should follow (image is NULL)
-<DATE><TIME>|<HOST>|E|imageSubset (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|imageSubset (FILE:LINENO)
     Can not operate on a NULL psImage.
 <DATE><TIME>|<HOST>|I|testImageSubsection
     An error should follow (subsection string is NULL)
-<DATE><TIME>|<HOST>|E|psImageSubsection (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageSubsection (FILE:LINENO)
     Specified subsection string can not be NULL.
 
@@ -133,49 +133,49 @@
 <DATE><TIME>|<HOST>|I|testImageSlice
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
-    Can not operate on a NULL psImage.
-<DATE><TIME>|<HOST>|I|testImageSlice
-    Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
+    Can not operate on a NULL psImage.
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
     Specified statistic can not be NULL.
 <DATE><TIME>|<HOST>|I|testImageSlice
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
     Specified slice direction, 5, is invalid.
 <DATE><TIME>|<HOST>|I|testImageSlice
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
-    Specified subset range, [30:<LINENO>,20:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageSlice
-    Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
-    Specified subset range, [301:<LINENO>,20:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageSlice
-    Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
-    Specified subset range, [30:<LINENO>,201:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageSlice
-    Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
-    Specified subset range, [30:<LINENO>,20:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageSlice
-    Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
-    Specified subset range, [30:<LINENO>,20:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageSlice
-    Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
+    Specified subset range, [30:30,20:20], is invalid or outside input psImage's boundaries, [0:300,0:200].
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
+    Specified subset range, [301:302,20:30], is invalid or outside input psImage's boundaries, [0:300,0:200].
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
+    Specified subset range, [30:31,201:205], is invalid or outside input psImage's boundaries, [0:300,0:200].
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
+    Specified subset range, [30:301,20:21], is invalid or outside input psImage's boundaries, [0:300,0:200].
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
+    Specified subset range, [30:31,20:201], is invalid or outside input psImage's boundaries, [0:300,0:200].
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
     Specified statistic option, 0, is not valid.  Must specify one and only one statistic type.
 <DATE><TIME>|<HOST>|I|testImageSlice
     Following should be an error mask size != image size.
-<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
     Input psImage mask size, 200x300, does not match psImage input size, 300x200.
 <DATE><TIME>|<HOST>|I|testImageSlice
     Following should be an error invalid mask type.
-<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
     Input psImage mask type, psS8, is not the supported mask datatype of psU8.
 <DATE><TIME>|<HOST>|I|testImageSlice
     Following should be an error invalid image type.
-<DATE><TIME>|<HOST>|E|psImageSlice (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageSlice (FILE:LINENO)
     Specified psImage type, psU8, is not supported.
 
@@ -188,18 +188,18 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psImageTrim (psImageExtraction.c:<LINENO>)
-    Can not operate on a NULL psImage.
-<DATE><TIME>|<HOST>|E|psImageTrim (psImageExtraction.c:<LINENO>)
-    Specified subset range, [-1:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|E|psImageTrim (psImageExtraction.c:<LINENO>)
-    Specified subset range, [0:<LINENO>,-1:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|E|psImageTrim (psImageExtraction.c:<LINENO>)
-    Specified subset range, [0:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|E|psImageTrim (psImageExtraction.c:<LINENO>)
-    Specified subset range, [0:<LINENO>,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|E|psImageTrim (psImageExtraction.c:<LINENO>)
-    Specified subset range, [0:-1,0:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|E|psImageTrim (psImageExtraction.c:<LINENO>)
-    Specified subset range, [0:<LINENO>,0:-1], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
+<DATE><TIME>|<HOST>|E|psImageTrim (FILE:LINENO)
+    Can not operate on a NULL psImage.
+<DATE><TIME>|<HOST>|E|psImageTrim (FILE:LINENO)
+    Specified subset range, [-1:299,0:199], is invalid or outside input psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|E|psImageTrim (FILE:LINENO)
+    Specified subset range, [0:299,-1:199], is invalid or outside input psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|E|psImageTrim (FILE:LINENO)
+    Specified subset range, [0:300,0:199], is invalid or outside input psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|E|psImageTrim (FILE:LINENO)
+    Specified subset range, [0:299,0:200], is invalid or outside input psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|E|psImageTrim (FILE:LINENO)
+    Specified subset range, [0:-1,0:199], is invalid or outside input psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|E|psImageTrim (FILE:LINENO)
+    Specified subset range, [0:299,0:-1], is invalid or outside input psImage's boundaries, [0:299,0:199].
 
 ---> TESTPOINT PASSED (psImage{psImageTrim} | tst_psImageExtraction.c)
@@ -213,41 +213,41 @@
 <DATE><TIME>|<HOST>|I|testImageCut
     The following should be an error.
-<DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
-    Specified line, (-1.000000,10.000000)->(240.000000,180.000000), does not entirely lie in psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageCut
-    The following should be an error.
-<DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
-    Specified line, (300.000000,10.000000)->(240.000000,180.000000), does not entirely lie in psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageCut
-    The following should be an error.
-<DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
-    Specified line, (20.000000,10.000000)->(-1.000000,180.000000), does not entirely lie in psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageCut
-    The following should be an error.
-<DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
-    Specified line, (20.000000,10.000000)->(300.000000,180.000000), does not entirely lie in psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageCut
-    The following should be an error.
-<DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
-    Specified line, (20.000000,-1.000000)->(240.000000,180.000000), does not entirely lie in psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageCut
-    The following should be an error.
-<DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
-    Specified line, (20.000000,200.000000)->(240.000000,180.000000), does not entirely lie in psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageCut
-    The following should be an error.
-<DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
-    Specified line, (20.000000,10.000000)->(240.000000,-1.000000), does not entirely lie in psImage's boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageCut
-    The following should be an error.
-<DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
-    Specified line, (20.000000,10.000000)->(240.000000,200.000000), does not entirely lie in psImage's boundaries, [0:<LINENO>,0:<LINENO>].
+<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
+    Specified line, (-1.000000,10.000000)->(240.000000,180.000000), does not entirely lie in psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|I|testImageCut
+    The following should be an error.
+<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
+    Specified line, (300.000000,10.000000)->(240.000000,180.000000), does not entirely lie in psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|I|testImageCut
+    The following should be an error.
+<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
+    Specified line, (20.000000,10.000000)->(-1.000000,180.000000), does not entirely lie in psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|I|testImageCut
+    The following should be an error.
+<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
+    Specified line, (20.000000,10.000000)->(300.000000,180.000000), does not entirely lie in psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|I|testImageCut
+    The following should be an error.
+<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
+    Specified line, (20.000000,-1.000000)->(240.000000,180.000000), does not entirely lie in psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|I|testImageCut
+    The following should be an error.
+<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
+    Specified line, (20.000000,200.000000)->(240.000000,180.000000), does not entirely lie in psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|I|testImageCut
+    The following should be an error.
+<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
+    Specified line, (20.000000,10.000000)->(240.000000,-1.000000), does not entirely lie in psImage's boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|I|testImageCut
+    The following should be an error.
+<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
+    Specified line, (20.000000,10.000000)->(240.000000,200.000000), does not entirely lie in psImage's boundaries, [0:299,0:199].
 <DATE><TIME>|<HOST>|I|testImageCut
     Following should be an error (NULL image).
-<DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
     Can not operate on a NULL psImage.
 <DATE><TIME>|<HOST>|I|testImageCut
     Following should be an error (length=0).
-<DATE><TIME>|<HOST>|E|psImageCut (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageCut (FILE:LINENO)
     Specified number of samples, 0, must be greater than 1 to make a line.
 
@@ -262,37 +262,37 @@
 <DATE><TIME>|<HOST>|I|testImageRadialCut
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
-    Can not operate on a NULL psImage.
-<DATE><TIME>|<HOST>|I|testImageRadialCut
-    Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE:LINENO)
+    Can not operate on a NULL psImage.
+<DATE><TIME>|<HOST>|I|testImageRadialCut
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE:LINENO)
     Specified radii vector can not be NULL.
 <DATE><TIME>|<HOST>|I|testImageRadialCut
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE:LINENO)
     Specified statistic can not be NULL.
 <DATE><TIME>|<HOST>|I|testImageRadialCut
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
-    Specified center, (301,100), is outside of the psImage boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageRadialCut
-    Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
-    Specified center, (150,201), is outside of the psImage boundaries, [0:<LINENO>,0:<LINENO>].
-<DATE><TIME>|<HOST>|I|testImageRadialCut
-    Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE:LINENO)
+    Specified center, (301,100), is outside of the psImage boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|I|testImageRadialCut
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE:LINENO)
+    Specified center, (150,201), is outside of the psImage boundaries, [0:299,0:199].
+<DATE><TIME>|<HOST>|I|testImageRadialCut
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE:LINENO)
     Input psImage mask type, psF32, is not the supported mask datatype of psU8.
 <DATE><TIME>|<HOST>|I|testImageRadialCut
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE:LINENO)
     Input psImage mask size, 150x100, does not match psImage input size, 300x200.
 <DATE><TIME>|<HOST>|I|testImageRadialCut
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE:LINENO)
     Input radii vector size, 1, can not be less than 2.
 <DATE><TIME>|<HOST>|I|testImageRadialCut
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageRadialCut (psImageExtraction.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRadialCut (FILE:LINENO)
     Specified statistic option, 0, is not valid.  Must specify one and only one statistic type.
 
Index: trunk/psLib/test/image/verified/tst_psImageFFT.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImageFFT.stderr	(revision 3125)
+++ trunk/psLib/test/image/verified/tst_psImageFFT.stderr	(revision 3127)
@@ -7,13 +7,13 @@
 <DATE><TIME>|<HOST>|I|testImageFFT
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageFFT (psImageFFT.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageFFT (FILE:LINENO)
     Can not specify both PS_FFT_FORWARD and PS_FFT_REVERSE options.
 <DATE><TIME>|<HOST>|I|testImageFFT
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psImageFFT (psImageFFT.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageFFT (FILE:LINENO)
     The PS_FFT_FORWARD and PS_FFT_REAL_RESULT combinition is not supported.
 <DATE><TIME>|<HOST>|I|testImageFFT
     Following should generate error for invalid direction.
-<DATE><TIME>|<HOST>|E|psImageFFT (psImageFFT.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageFFT (FILE:LINENO)
     Must specify either PS_FFT_FORWARD or PS_FFT_REVERSE option.
 
@@ -37,13 +37,13 @@
 <DATE><TIME>|<HOST>|I|testImageComplex
     Following should be an error (type mismatch).
-<DATE><TIME>|<HOST>|E|psImageComplex (psImageFFT.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageComplex (FILE:LINENO)
     Real psImage type (psF32) and imaginary psImage type (psF64) must be the same.
 <DATE><TIME>|<HOST>|I|testImageComplex
     Following should be an error (size mismatch).
-<DATE><TIME>|<HOST>|E|psImageComplex (psImageFFT.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageComplex (FILE:LINENO)
     Real psImage size (128x64) and imaginary psImage size (64x64) must be the same.
 <DATE><TIME>|<HOST>|I|testImageComplex
     Following should generate an error message.
-<DATE><TIME>|<HOST>|E|psImageComplex (psImageFFT.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageComplex (FILE:LINENO)
     Input psImage type, psS16, is required to be either psF32 or psF64.
 
@@ -67,5 +67,5 @@
 <DATE><TIME>|<HOST>|I|testImagePowerSpectrum
     Following should generate error message.
-<DATE><TIME>|<HOST>|E|psImagePowerSpectrum (psImageFFT.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImagePowerSpectrum (FILE:LINENO)
     Input psImage type, psF32, is required to be either psC32 or psC64.
 
Index: trunk/psLib/test/image/verified/tst_psImageIO.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImageIO.stderr	(revision 3125)
+++ trunk/psLib/test/image/verified/tst_psImageIO.stderr	(revision 3127)
@@ -329,5 +329,5 @@
 <DATE><TIME>|<HOST>|W|psImageReadSection
     psImageReadSection is deprecated.  Consider using psFitsReadImage instead.
-<DATE><TIME>|<HOST>|E|psImageReadSection (psImageIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageReadSection (FILE:LINENO)
     Could not open file,'foobar.fits'.
     CFITSIO Error: could not open the named file
@@ -336,5 +336,5 @@
 <DATE><TIME>|<HOST>|W|psImageReadSection
     psImageReadSection is deprecated.  Consider using psFitsReadImage instead.
-<DATE><TIME>|<HOST>|E|psImageReadSection (psImageIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageReadSection (FILE:LINENO)
     Specified filename can not be NULL.
 <DATE><TIME>|<HOST>|I|testImageRead
@@ -342,5 +342,5 @@
 <DATE><TIME>|<HOST>|W|psImageReadSection
     psImageReadSection is deprecated.  Consider using psFitsReadImage instead.
-<DATE><TIME>|<HOST>|E|psImageReadSection (psImageIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageReadSection (FILE:LINENO)
     Could not find HDU #4 in file tmpImages/MxN_F32.fits.
     CFITSIO Error: tried to move past end of file
@@ -349,5 +349,5 @@
 <DATE><TIME>|<HOST>|W|psImageReadSection
     psImageReadSection is deprecated.  Consider using psFitsReadImage instead.
-<DATE><TIME>|<HOST>|E|psImageReadSection (psImageIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageReadSection (FILE:LINENO)
     Could not find HDU with extension name 'bogus' in file tmpImages/MxN_F32.fits.
     CFITSIO Error: illegal HDU number
@@ -371,5 +371,5 @@
 <DATE><TIME>|<HOST>|W|psImageWriteSection
     psImageWriteSection is deprecated.  Consider using psFitsWriteImage instead.
-<DATE><TIME>|<HOST>|E|psImageWriteSection (psImageIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageWriteSection (FILE:LINENO)
     Can not operate on a NULL psImage.
 <DATE><TIME>|<HOST>|I|testImageWrite
@@ -377,5 +377,5 @@
 <DATE><TIME>|<HOST>|W|psImageWriteSection
     psImageWriteSection is deprecated.  Consider using psFitsWriteImage instead.
-<DATE><TIME>|<HOST>|E|psImageWriteSection (psImageIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageWriteSection (FILE:LINENO)
     Could not create file,'panstarrs/writeFits.fits'.
     CFITSIO Error: couldn't create the named file
@@ -384,5 +384,5 @@
 <DATE><TIME>|<HOST>|W|psImageWriteSection
     psImageWriteSection is deprecated.  Consider using psFitsWriteImage instead.
-<DATE><TIME>|<HOST>|E|psImageWriteSection (psImageIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageWriteSection (FILE:LINENO)
     Could not open file,'tmpImages/writeInvalidFile.fits'.
     CFITSIO Error: tried to move past end of file
@@ -391,5 +391,5 @@
 <DATE><TIME>|<HOST>|W|psImageWriteSection
     psImageWriteSection is deprecated.  Consider using psFitsWriteImage instead.
-<DATE><TIME>|<HOST>|E|psImageWriteSection (psImageIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageWriteSection (FILE:LINENO)
     Could not find HDU with extension name 'ext2' in file tmpImages/writeTest.fits.
     CFITSIO Error: illegal HDU number
@@ -398,5 +398,5 @@
 <DATE><TIME>|<HOST>|W|psImageWriteSection
     psImageWriteSection is deprecated.  Consider using psFitsWriteImage instead.
-<DATE><TIME>|<HOST>|E|psImageWriteSection (psImageIO.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageWriteSection (FILE:LINENO)
     Specified extension number, 99, must not exceed number of HDUs, 1, by more than one.
 
Index: trunk/psLib/test/image/verified/tst_psImageInterpolate.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImageInterpolate.stderr	(revision 3125)
+++ trunk/psLib/test/image/verified/tst_psImageInterpolate.stderr	(revision 3127)
@@ -16,13 +16,13 @@
 <DATE><TIME>|<HOST>|I|testInterpolateError
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psImagePixelInterpolate (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImagePixelInterpolate (FILE:LINENO)
     Can not operate on a NULL psImage.
 <DATE><TIME>|<HOST>|I|testInterpolateError
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psImagePixelInterpolate (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImagePixelInterpolate (FILE:LINENO)
     Specified psImage type, psPtr, is not supported.
 <DATE><TIME>|<HOST>|I|testInterpolateError
     Following should generate an error message
-<DATE><TIME>|<HOST>|E|psImagePixelInterpolate (psImage.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImagePixelInterpolate (FILE:LINENO)
     Specified psImage type, psPtr, is not supported.
 
Index: trunk/psLib/test/image/verified/tst_psImageManip.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImageManip.stderr	(revision 3125)
+++ trunk/psLib/test/image/verified/tst_psImageManip.stderr	(revision 3127)
@@ -27,5 +27,5 @@
 <DATE><TIME>|<HOST>|I|testImageClip
     Following should be an error (max<min)
-<DATE><TIME>|<HOST>|E|psImageClip (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageClip (FILE:LINENO)
     Specified min value, 256, can not be greater than the specified max value, 128.
 
@@ -42,5 +42,5 @@
 <DATE><TIME>|<HOST>|I|testImageClipNAN
     Following should be an error (invalid type)
-<DATE><TIME>|<HOST>|E|psImageClipNaN (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageClipNaN (FILE:LINENO)
     Specified psImage type, psS32, is not supported.
 
@@ -61,53 +61,53 @@
 <DATE><TIME>|<HOST>|I|testImageClipComplexRegion
     Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
-    Can not operate on a NULL psImage.
-<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
-    Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
+    Can not operate on a NULL psImage.
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
     Specified real-portion of min value, 10, can not be greater than the real-portion of max value, 5.
 <DATE><TIME>|<HOST>|I|testImageClipComplexRegion
     Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
     Specified imaginary-portion of min value, 10, can not be greater than the imaginary-portion of max value, 5.
 <DATE><TIME>|<HOST>|I|testImageClipComplexRegion
     Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
     Specified real-portion of min value, 10, can not be greater than the real-portion of max value, 5.
 <DATE><TIME>|<HOST>|I|testImageClipComplexRegion
     Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
-    Specified vmin value, -6.80565e+38+0i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:<LINENO>.40282e+38].
-<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
-    Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
-    Specified vmin value, 6.80565e+38+0i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:<LINENO>.40282e+38].
-<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
-    Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
-    Specified vmin value, -0-6.80565e+38i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:<LINENO>.40282e+38].
-<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
-    Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
-    Specified vmin value, 0+6.80565e+38i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:<LINENO>.40282e+38].
-<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
-    Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
-    Specified vmax value, -6.80565e+38+0i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:<LINENO>.40282e+38].
-<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
-    Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
-    Specified vmax value, 6.80565e+38+0i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:<LINENO>.40282e+38].
-<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
-    Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
-    Specified vmax value, -0-6.80565e+38i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:<LINENO>.40282e+38].
-<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
-    Following should be an error:
-<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
-    Specified vmax value, 0+6.80565e+38i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:<LINENO>.40282e+38].
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
+    Specified vmin value, -6.80565e+38+0i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:3.40282e+38].
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
+    Specified vmin value, 6.80565e+38+0i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:3.40282e+38].
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
+    Specified vmin value, -0-6.80565e+38i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:3.40282e+38].
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
+    Specified vmin value, 0+6.80565e+38i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:3.40282e+38].
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
+    Specified vmax value, -6.80565e+38+0i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:3.40282e+38].
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
+    Specified vmax value, 6.80565e+38+0i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:3.40282e+38].
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
+    Specified vmax value, -0-6.80565e+38i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:3.40282e+38].
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
+    Specified vmax value, 0+6.80565e+38i, is not the the range of input psImage's valid pixel values (psC32), i.e. [-3.40282e+38:3.40282e+38].
 <DATE><TIME>|<HOST>|I|testImageClipComplexRegion
     Following should be an error (invalid type)
-<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion (FILE:LINENO)
     Specified psImage type, psS32, is not supported.
 
@@ -122,25 +122,25 @@
 <DATE><TIME>|<HOST>|I|testImageOverlay
     Following should error as overlay isn't within image boundaries
-<DATE><TIME>|<HOST>|E|psImageOverlaySection (psImageManip.c:<LINENO>)
-    Specified subset range, [32:<LINENO>,64:<LINENO>], is invalid or outside input psImage's boundaries, [0:<LINENO>,0:<LINENO>].
+<DATE><TIME>|<HOST>|E|psImageOverlaySection (FILE:LINENO)
+    Specified subset range, [32:160,64:320], is invalid or outside input psImage's boundaries, [0:128,0:256].
 <DATE><TIME>|<HOST>|I|testImageOverlay
     Following should error as overlay is NULL
-<DATE><TIME>|<HOST>|E|psImageOverlaySection (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageOverlaySection (FILE:LINENO)
     Can not operate on a NULL psImage.
 <DATE><TIME>|<HOST>|I|testImageOverlay
     Following should error as image input is NULL
-<DATE><TIME>|<HOST>|E|psImageOverlaySection (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageOverlaySection (FILE:LINENO)
     Can not operate on a NULL psImage.
 <DATE><TIME>|<HOST>|I|testImageOverlay
     Following should error as operator is invalid
-<DATE><TIME>|<HOST>|E|psImageOverlaySection (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageOverlaySection (FILE:LINENO)
     Specified operation, '$', is not supported.
 <DATE><TIME>|<HOST>|I|testImageOverlay
     Following should error as operator is invalid
-<DATE><TIME>|<HOST>|E|psImageOverlaySection (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageOverlaySection (FILE:LINENO)
     Operation can not be NULL.
 <DATE><TIME>|<HOST>|I|testImageOverlay
     Following should error as overlay is a different type
-<DATE><TIME>|<HOST>|E|psImageOverlaySection (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageOverlaySection (FILE:LINENO)
     Input overlay psImage type, psS64, must match input psImage type, psF32.
 
@@ -155,31 +155,31 @@
 <DATE><TIME>|<HOST>|I|testImageRebin
     Following should be an error for unsupported type.
-<DATE><TIME>|<HOST>|E|psImageRebin (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRebin (FILE:LINENO)
     Specified psImage type, psU8, is not supported.
 <DATE><TIME>|<HOST>|I|testImageRebin
     Following should be an error for invallid mask type.
-<DATE><TIME>|<HOST>|E|psImageRebin (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRebin (FILE:LINENO)
     Input psImage mask type, psF32, is not the supported mask datatype of psU8.
-<DATE><TIME>|<HOST>|E|psImageRebin (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRebin (FILE:LINENO)
     Can not operate on a NULL psImage.
 <DATE><TIME>|<HOST>|I|testImageRebin
     Following should be an error for scale < 0.
-<DATE><TIME>|<HOST>|E|psImageRebin (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRebin (FILE:LINENO)
     Specified scale value, 0, must be a positive value.
 <DATE><TIME>|<HOST>|I|testImageRebin
     Following should be an error for stats null.
-<DATE><TIME>|<HOST>|E|psImageRebin (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRebin (FILE:LINENO)
     Specified statistic can not be NULL.
 <DATE><TIME>|<HOST>|I|testImageRebin
     Following should be an error for stats options 0.
-<DATE><TIME>|<HOST>|E|psImageRebin (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRebin (FILE:LINENO)
     Specified statistic option, 0, is not valid.  Must specify one and only one statistic type.
 <DATE><TIME>|<HOST>|I|testImageRebin
     Following should be an error for stat options use range.
-<DATE><TIME>|<HOST>|E|psImageRebin (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRebin (FILE:LINENO)
     Specified statistic option, 8192, is not valid.  Must specify one and only one statistic type.
 <DATE><TIME>|<HOST>|I|testImageRebin
     Following should be an error for stats with multiple options.
-<DATE><TIME>|<HOST>|E|psImageRebin (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRebin (FILE:LINENO)
     Specified statistic option, 2049, is not valid.  Must specify one and only one statistic type.
 
@@ -194,5 +194,5 @@
 <DATE><TIME>|<HOST>|I|testImageRoll
     Following should generate an error.
-<DATE><TIME>|<HOST>|E|psImageRoll (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRoll (FILE:LINENO)
     Can not operate on a NULL psImage.
 
@@ -351,9 +351,9 @@
 <DATE><TIME>|<HOST>|I|testImageRotate
     Following should be an error
-<DATE><TIME>|<HOST>|E|psImageRotate (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRotate (FILE:LINENO)
     Can not operate on a NULL psImage.
 <DATE><TIME>|<HOST>|I|testImageRotate
     Following should be an error for invalid interpolation type.
-<DATE><TIME>|<HOST>|E|psImageRotate (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageRotate (FILE:LINENO)
     Specified interpolation mode, -1, is unsupported.
 
@@ -402,9 +402,9 @@
 <DATE><TIME>|<HOST>|I|testImageShift
     Following should be an error...
-<DATE><TIME>|<HOST>|E|psImageShift (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageShift (FILE:LINENO)
     Can not operate on a NULL psImage.
 <DATE><TIME>|<HOST>|I|testImageShift
     Following should be an error for invalid interpolation mode.
-<DATE><TIME>|<HOST>|E|psImageShift (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageShift (FILE:LINENO)
     Specified interpolation mode, -1, is unsupported.
 
@@ -417,11 +417,11 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psImageResample (psImageManip.c:<LINENO>)
-    Can not operate on a NULL psImage.
-<DATE><TIME>|<HOST>|E|psImageResample (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageResample (FILE:LINENO)
+    Can not operate on a NULL psImage.
+<DATE><TIME>|<HOST>|E|psImageResample (FILE:LINENO)
     Specified scale value, 0, must be a positive value.
-<DATE><TIME>|<HOST>|E|psImageResample (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageResample (FILE:LINENO)
     Specified interpolation mode, 0, is unsupported.
-<DATE><TIME>|<HOST>|E|psImageResample (psImageManip.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageResample (FILE:LINENO)
     Specified psImage type, psPtr, is not supported.
 
Index: trunk/psLib/test/image/verified/tst_psImageStats00.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImageStats00.stderr	(revision 3125)
+++ trunk/psLib/test/image/verified/tst_psImageStats00.stderr	(revision 3127)
@@ -1,10 +1,10 @@
-<DATE><TIME>|<HOST>|E|psImageHistogram (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageHistogram (FILE:LINENO)
     Unallowable operation: out is NULL.
-<DATE><TIME>|<HOST>|E|psImageHistogram (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageHistogram (FILE:LINENO)
     Unallowable operation: in is NULL.
-<DATE><TIME>|<HOST>|E|psImageHistogram (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageHistogram (FILE:LINENO)
     Unallowable operation: out is NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should be an error for invalid mask type.
-<DATE><TIME>|<HOST>|E|psImageHistogram (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageHistogram (FILE:LINENO)
     Unallowable operation: psImage mask has incorrect type.
Index: trunk/psLib/test/image/verified/tst_psImageStats01.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImageStats01.stderr	(revision 3125)
+++ trunk/psLib/test/image/verified/tst_psImageStats01.stderr	(revision 3127)
@@ -1,8 +1,8 @@
-<DATE><TIME>|<HOST>|E|psImageStats (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageStats (FILE:LINENO)
     Error: stats->options is 0.
-<DATE><TIME>|<HOST>|E|psImageStats (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageStats (FILE:LINENO)
     Unallowable operation: stats is NULL.
-<DATE><TIME>|<HOST>|E|psImageStats (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageStats (FILE:LINENO)
     Error: stats->options is 0.
-<DATE><TIME>|<HOST>|E|psImageStats (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageStats (FILE:LINENO)
     Unallowable operation: psImage mask has incorrect type.
Index: trunk/psLib/test/image/verified/tst_psImageStats02.stderr
===================================================================
--- trunk/psLib/test/image/verified/tst_psImageStats02.stderr	(revision 3125)
+++ trunk/psLib/test/image/verified/tst_psImageStats02.stderr	(revision 3127)
@@ -1,16 +1,16 @@
 <DATE><TIME>|<HOST>|I|main
     Following should be an error message for NULL coeffs argument.
-<DATE><TIME>|<HOST>|E|psImageFitPolynomial (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageFitPolynomial (FILE:LINENO)
     Unallowable operation: polynomial coeffs or its coeffs is NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should be a error message for NULL input argument.
-<DATE><TIME>|<HOST>|E|psImageFitPolynomial (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageFitPolynomial (FILE:LINENO)
     Unallowable operation: psImage input or its data is NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should be an error message for NULL coeffs argument.
-<DATE><TIME>|<HOST>|E|psImageEvalPolynomial (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageEvalPolynomial (FILE:LINENO)
     Unallowable operation: polynomial coeffs or its coeffs is NULL.
 <DATE><TIME>|<HOST>|I|main
     Following should be a error message for NULL input argument.
-<DATE><TIME>|<HOST>|E|psImageEvalPolynomial (psImageStats.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psImageEvalPolynomial (FILE:LINENO)
     Unallowable operation: psImage input or its data is NULL.
Index: trunk/psLib/test/runTest
===================================================================
--- trunk/psLib/test/runTest	(revision 3125)
+++ trunk/psLib/test/runTest	(revision 3127)
@@ -28,5 +28,5 @@
 #
 #  $Revison:  $  $Name: not supported by cvs2svn $
-#  $Date: 2005-02-03 00:54:12 $
+#  $Date: 2005-02-04 22:49:37 $
 #
 #  Copyright 2004 Maui High Performance Computering Center, University of Hawaii
@@ -36,4 +36,6 @@
 # Provides functions for handling psS64 command line options
 use Getopt::Long;
+
+$verifiedDir = "verified";
 
 # Assign variables based on the presence of command line options to the script
@@ -42,4 +44,5 @@
     "resetStderr!" => \$resetStderr,
     "resetStdout!" => \$resetStdout,
+    "verified=s"   => \$verifiedDir,
     "help!"        => \$help
 );
@@ -83,5 +86,5 @@
 
     # Check if a verified directory exists in the current work directory
-    if ( !( -e "verified" ) ) {
+    if ( !( -e $verifiedDir ) ) {
 
         # Display message that verified subdirectory doesn't exist
@@ -133,5 +136,5 @@
             # Open mod file to place filtered STDOUT
             open( MODFILE,  "> temp/$testFile.stdout.mod" );
-            open( MODFILE2, "> verified/$testFile.stdout" ) if $resetStdout;
+            open( MODFILE2, "> $verifiedDir/$testFile.stdout" ) if $resetStdout;
 
            # Replace the variable date, time and host information with constants
@@ -143,5 +146,5 @@
                 s/$hostname\s*/<HOST>/g;
                 s/: Line \d+/: Line <LINENO>/g;
-                s/\:\d+/\:<LINENO>/g;
+                s/\(.*\:\d+\)/\(FILE\:LINENO\)/g;
                 s/allocate \d+ bytes at/allocate <N> bytes at/g;
 
@@ -166,5 +169,5 @@
             # Open mod file to place filtered STDERR
             open( MODFILE,  "> temp/$testFile.stderr.mod" );
-            open( MODFILE2, "> verified/$testFile.stderr" ) if $resetStderr;
+            open( MODFILE2, "> $verifiedDir/$testFile.stderr" ) if $resetStderr;
 
            # Replace the variable date, time and host information with constants
@@ -174,5 +177,5 @@
                 s/$hostname\s*/<HOST>/g;
                 s/: Line \d+/: Line <LINENO>/g;
-                s/\:\d+/\:<LINENO>/g;
+                s/\(.*\:\d+\)/\(FILE\:LINENO\)/g;
                 s/allocate \d+ bytes at/allocate <N> bytes at/g;
 
@@ -193,5 +196,5 @@
 
             # Compare STDOUT capture with verified file
-            $exitValue |= &compareStream("verified/$testFile.stdout");
+            $exitValue |= &compareStream("$verifiedDir/$testFile.stdout");
 
             # Check exit value to determine if verified file doesn't exist
@@ -204,5 +207,5 @@
 
             # Compare STDERR capture with verified file
-            $exitValue |= &compareStream("verified/$testFile.stderr");
+            $exitValue |= &compareStream("$verifiedDir/$testFile.stderr");
 
             # Check exit value to determine if verified file doesn't exist
@@ -330,5 +333,5 @@
         # Create name of the temp file to compare
         $tempFile = $streamFile;
-        $tempFile =~ s/verified/temp/;
+        $tempFile =~ s/$verifiedDir/temp/;
         $tempFile = $tempFile . ".mod";
 
Index: trunk/psLib/test/sysUtils/Makefile.am
===================================================================
--- trunk/psLib/test/sysUtils/Makefile.am	(revision 3125)
+++ trunk/psLib/test/sysUtils/Makefile.am	(revision 3127)
@@ -1,4 +1,6 @@
-#Makefile for astronomy functions of psLib
+#Makefile for sysUtils functions of psLib
 #
+EXTRA_DIST = verified
+
 INCLUDES = \
 	-I$(top_srcdir)/src \
@@ -11,5 +13,5 @@
 	$(all_includes)
 
-AM_LDFLAGS = -L$(top_srcdir)/src `sh $(top_srcdir)/pslib-config --libs`
+AM_LDFLAGS = -L$(top_builddir)/src $(PSLIB_LIBS)
 
 check_PROGRAMS = \
@@ -22,5 +24,5 @@
 	tst_psConfigure
 
-TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest 
+TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified 
 TESTS = \
 	tst_psAbort      \
Index: trunk/psLib/test/sysUtils/verified/tst_psError.stderr
===================================================================
--- trunk/psLib/test/sysUtils/verified/tst_psError.stderr	(revision 3125)
+++ trunk/psLib/test/sysUtils/verified/tst_psError.stderr	(revision 3127)
@@ -5,9 +5,9 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|testError00 (tst_psError.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|testError00 (FILE:LINENO)
     ALL TYPES intval = 1 longval = 2 floatval = 3.010000 charval = E strval = E R R O R
-<DATE><TIME>|<HOST>|E|testError00 (tst_psError.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|testError00 (FILE:LINENO)
     NO VALUES
-<DATE><TIME>|<HOST>|E|testError00 (tst_psError.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|testError00 (FILE:LINENO)
 
 ---> TESTPOINT PASSED (psError{psError()} | tst_psError.c)
@@ -19,25 +19,25 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|testError01 (tst_psError.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|testError01 (FILE:LINENO)
     Error code = 262
-ERROR STACK PRINT Test1A -> testError01 (tst_psError.c:<LINENO>): parameter is out-of-range
+ERROR STACK PRINT Test1A -> testError01 (FILE:LINENO): parameter is out-of-range
      Error code = 262
-<DATE><TIME>|<HOST>|E|testError01 (tst_psError.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|testError01 (FILE:LINENO)
     Error code = 263
-ERROR STACK PRINT Test1B -> testError01 (tst_psError.c:<LINENO>): parameter is of unsupported type
+ERROR STACK PRINT Test1B -> testError01 (FILE:LINENO): parameter is of unsupported type
      Error code = 263
-<DATE><TIME>|<HOST>|E|testError01 (tst_psError.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|testError01 (FILE:LINENO)
     Error code = -1
-ERROR STACK PRINT Test1D -> testError01 (tst_psError.c:<LINENO>): (null)
+ERROR STACK PRINT Test1D -> testError01 (FILE:LINENO): (null)
      Error code = -1
-<DATE><TIME>|<HOST>|E|testError01 (tst_psError.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|testError01 (FILE:LINENO)
     Error code = 262
-ERROR STACK PRINT Test1E -> testError01 (tst_psError.c:<LINENO>): (null)
+ERROR STACK PRINT Test1E -> testError01 (FILE:LINENO): (null)
      Error code = -1
- -> testError01 (tst_psError.c:<LINENO>): parameter is out-of-range
+ -> testError01 (FILE:LINENO): parameter is out-of-range
      Error code = 262
-<DATE><TIME>|<HOST>|E|testError01 (tst_psError.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|testError01 (FILE:LINENO)
     Errno code = 9
-ERROR STACK PRINT Test1F -> testError01 (tst_psError.c:<LINENO>): Bad file descriptor
+ERROR STACK PRINT Test1F -> testError01 (FILE:LINENO): Bad file descriptor
      Errno code = 9
 
@@ -50,7 +50,7 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|testError02 (tst_psError.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|testError02 (FILE:LINENO)
     Error code = 262
-ERROR STACK PRINT Test2A -> testError02 (tst_psError.c:<LINENO>): parameter is out-of-range
+ERROR STACK PRINT Test2A -> testError02 (FILE:LINENO): parameter is out-of-range
      Error code = 262
 
@@ -63,9 +63,9 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|testError03 (tst_psError.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|testError03 (FILE:LINENO)
     Error code = 262
-<DATE><TIME>|<HOST>|E|testError03 (tst_psError.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|testError03 (FILE:LINENO)
     Error code = 263
-<DATE><TIME>|<HOST>|E|testError03 (tst_psError.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|testError03 (FILE:LINENO)
     Error code = 264
 
@@ -78,9 +78,9 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|testError04 (tst_psError.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|testError04 (FILE:LINENO)
     Error code = 262
-<DATE><TIME>|<HOST>|E|testError04 (tst_psError.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|testError04 (FILE:LINENO)
     Error code = 263
-<DATE><TIME>|<HOST>|E|testError04 (tst_psError.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|testError04 (FILE:LINENO)
     Error code = 264
 
@@ -106,5 +106,5 @@
 <DATE><TIME>|<HOST>|I|testErrorRegister
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psErrorRegister (psErrorCodes.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psErrorRegister (FILE:LINENO)
     Specified psErrorDescription pointer can not be NULL.
 
Index: trunk/psLib/test/sysUtils/verified/tst_psMemory.stderr
===================================================================
--- trunk/psLib/test/sysUtils/verified/tst_psMemory.stderr	(revision 3125)
+++ trunk/psLib/test/sysUtils/verified/tst_psMemory.stderr	(revision 3127)
@@ -21,5 +21,5 @@
     Custom MemExhaustedCallback was invoked.
 <DATE><TIME>|<HOST>|A|p_psAlloc
-    Failed to allocate <N> bytes at tst_psMemory.c:<LINENO>
+    Failed to allocate <N> bytes at tst_psMemory.c:206
 
 ---> TESTPOINT PASSED (psMemory{outOfMemory} | tst_psMemory.c)
@@ -36,5 +36,5 @@
     Custom MemExhaustedCallback was invoked.
 <DATE><TIME>|<HOST>|A|p_psRealloc
-    Failed to reallocate <N> bytes at tst_psMemory.c:<LINENO>
+    Failed to reallocate <N> bytes at tst_psMemory.c:171
 
 ---> TESTPOINT PASSED (psMemory{reallocOutOfMemory} | tst_psMemory.c)
@@ -91,5 +91,5 @@
     following psMemCheckLeaks call should produce one instance.
                    file:line ID
-         tst_psMemory.c:<LINENO>  1
+         tst_psMemory.c:356  1
 <DATE><TIME>|<HOST>|I|TPcheckLeaks
     Testing psMemCheckLeaks again with a different leak location
@@ -97,5 +97,5 @@
     following psMemCheckLeaks call should produce one error.
                    file:line ID
-         tst_psMemory.c:<LINENO>  11
+         tst_psMemory.c:386  11
 <DATE><TIME>|<HOST>|I|TPcheckLeaks
     Testing psMemCheckLeaks again with multiple leak locations.
@@ -103,6 +103,6 @@
     following psMemCheckLeaks call should produce two errors.
                    file:line ID
-         tst_psMemory.c:<LINENO>  16
-         tst_psMemory.c:<LINENO>  14
+         tst_psMemory.c:414  16
+         tst_psMemory.c:414  14
 
 ---> TESTPOINT PASSED (psMemory{checkLeaks} | tst_psMemory.c)
@@ -118,8 +118,8 @@
 <DATE><TIME>|<HOST>|I|TPmemCorruption
     psMemCheckCorruption should output an error message and memProblemCallback callback should be called.
-<DATE><TIME>|<HOST>|E|checkMemBlock (psMemory.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|checkMemBlock (FILE:LINENO)
     Memory block 1 is corrupted; buffer underflow detected.
 <DATE><TIME>|<HOST>|I|memProblemCallback
-    memory callback called for id 1 (psMemCheckCorruption:<LINENO>).
+    memory callback called for id 1 (FILE:LINENO).
 
 ---> TESTPOINT PASSED (psMemory{psMemCorruption} | tst_psMemory.c)
@@ -147,5 +147,5 @@
     Next should abort due to multiple freeing.
 <DATE><TIME>|<HOST>|A|p_psFree
-    Block 1, allocated at tst_psMemory.c:<LINENO>, freed multiple times at tst_psMemory.c:<LINENO>.
+    Block 1, allocated at tst_psMemory.c:526, freed multiple times at tst_psMemory.c:531.
 
 ---> TESTPOINT PASSED (psMemory{multipleFree} | tst_psMemory.c)
Index: trunk/psLib/test/sysUtils/verified/tst_psStringCopy.stderr
===================================================================
--- trunk/psLib/test/sysUtils/verified/tst_psStringCopy.stderr	(revision 3125)
+++ trunk/psLib/test/sysUtils/verified/tst_psStringCopy.stderr	(revision 3127)
@@ -50,5 +50,5 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psStringNCopy (psString.c:<LINENO>)
+<DATE><TIME>|<HOST>|E|psStringNCopy (FILE:LINENO)
     Can not copy a negative number of characters (-5).
 
