Index: /trunk/psLib/src/Makefile.am =================================================================== --- /trunk/psLib/src/Makefile.am (revision 8913) +++ /trunk/psLib/src/Makefile.am (revision 8914) @@ -13,7 +13,5 @@ EXTRA_DIST = mainpage.dox psErrorCodes_en.dat psTest.h -pslibincludedir = $(includedir) -pslibinclude_HEADERS = \ - psTest.h \ +include_HEADERS = \ pslib.h \ pslib_strict.h Index: /trunk/psLib/src/astro/Makefile.am =================================================================== --- /trunk/psLib/src/astro/Makefile.am (revision 8913) +++ /trunk/psLib/src/astro/Makefile.am (revision 8914) @@ -14,10 +14,9 @@ EXTRA_DIST = astro.i -pslibincludedir = $(includedir) -pslibinclude_HEADERS = \ +pkginclude_HEADERS = \ psTime.h \ psCoord.h \ psSphereOps.h \ - psEarthOrientation.h + psEarthOrientation.h CLEANFILES = *~ *.bb *.bbg *.da Index: /trunk/psLib/src/db/Makefile.am =================================================================== --- /trunk/psLib/src/db/Makefile.am (revision 8913) +++ /trunk/psLib/src/db/Makefile.am (revision 8914) @@ -9,6 +9,5 @@ EXTRA_DIST = db.i -pslibincludedir = $(includedir) -pslibinclude_HEADERS = \ +pkginclude_HEADERS = \ psDB.h Index: /trunk/psLib/src/fft/Makefile.am =================================================================== --- /trunk/psLib/src/fft/Makefile.am (revision 8913) +++ /trunk/psLib/src/fft/Makefile.am (revision 8914) @@ -10,6 +10,5 @@ EXTRA_DIST = fft.i -pslibincludedir = $(includedir) -pslibinclude_HEADERS = \ +pkginclude_HEADERS = \ psVectorFFT.h \ psImageFFT.h Index: /trunk/psLib/src/fits/Makefile.am =================================================================== --- /trunk/psLib/src/fits/Makefile.am (revision 8913) +++ /trunk/psLib/src/fits/Makefile.am (revision 8914) @@ -12,6 +12,5 @@ EXTRA_DIST = fits.i -pslibincludedir = $(includedir) -pslibinclude_HEADERS = \ +pkginclude_HEADERS = \ psFits.h \ psFitsHeader.h \ Index: /trunk/psLib/src/imageops/Makefile.am =================================================================== --- /trunk/psLib/src/imageops/Makefile.am (revision 8913) +++ /trunk/psLib/src/imageops/Makefile.am (revision 8914) @@ -17,6 +17,5 @@ EXTRA_DIST = imageops.i -pslibincludedir = $(includedir) -pslibinclude_HEADERS = \ +pkginclude_HEADERS = \ psImageBackground.h \ psImageConvolve.h \ Index: /trunk/psLib/src/jpeg/Makefile.am =================================================================== --- /trunk/psLib/src/jpeg/Makefile.am (revision 8913) +++ /trunk/psLib/src/jpeg/Makefile.am (revision 8914) @@ -7,6 +7,5 @@ psImageJpeg.c -pslibincludedir = $(includedir) -pslibinclude_HEADERS = \ +pkginclude_HEADERS = \ psImageJpeg.h Index: /trunk/psLib/src/math/Makefile.am =================================================================== --- /trunk/psLib/src/math/Makefile.am (revision 8913) +++ /trunk/psLib/src/math/Makefile.am (revision 8914) @@ -26,6 +26,5 @@ EXTRA_DIST = math.i -pslibincludedir = $(includedir) -pslibinclude_HEADERS = \ +pkginclude_HEADERS = \ psUnaryOp.h \ psBinaryOp.h \ Index: /trunk/psLib/src/mathtypes/Makefile.am =================================================================== --- /trunk/psLib/src/mathtypes/Makefile.am (revision 8913) +++ /trunk/psLib/src/mathtypes/Makefile.am (revision 8914) @@ -11,6 +11,5 @@ EXTRA_DIST = mathtypes.i -pslibincludedir = $(includedir) -pslibinclude_HEADERS = \ +pkginclude_HEADERS = \ psImage.h \ psScalar.h \ Index: unk/psLib/src/psTest.h =================================================================== --- /trunk/psLib/src/psTest.h (revision 8913) +++ (revision ) @@ -1,110 +1,0 @@ -/** @file psTest.h - * - * Testing infrastructure functions. - * - * @author Robert DeSonia, MHPCC - * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-17 00:10:55 $ - * - * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii - * - */ - - -#ifndef PSTEST_H -#define PSTEST_H - -#include - -#include "psType.h" - -#define printPositiveTestHeader(filePtr, packageName, testPointName) \ -p_printPositiveTestHeader(filePtr, __FILE__, packageName, testPointName) - -#define printNegativeTestHeader(filePtr, packageName, testPointName, expectedError, exitValue) \ -p_printNegativeTestHeader(filePtr, __FILE__, packageName, testPointName, expectedError, exitValue) - -#define printFooter(filePtr, packageName, testPointName, success) \ -p_printFooter(filePtr, __FILE__, packageName, testPointName, success) - -/** Specifies the format of a user-defined function for use with psTest functions. */ -typedef psS32 (*testFcn)(void); - -/** Defines a data structure containing test description information. */ -typedef struct -{ - testFcn fcn; ///< Specified test function - psS32 testPointNumber; ///< Test Point Number - const char* testPointName; ///< Test Point Name - psS32 expectedReturn; ///< Expected return value - psBool isDuplicateEntry; ///< Is the entry a duplicate? -} -testDescription; - -#define runTest(filePtr, packageName, testPointName, fcn, expectedReturn, useFork) \ -p_runTest(filePtr, __FILE__, packageName, testPointName, fcn, expectedReturn, useFork) - -#define runTestSuite(filePtr, packageName, tests, argc, argv) \ -p_runTestSuite(filePtr, __FILE__, packageName, tests, argc, argv) - - -/////////////////////////// PRIVATE FUNCTIONS ////////////////////////////// - -///XXX: Comments correct? - -/** Procedure used to run a test. - * - * @return psBool: True if successful. - */ -psBool p_runTest( - FILE *fp, ///< File to test - const char* testPointFile, ///< Test point in file - const char* packageName, ///< Package name - const char* testPointName, ///< Test point name - testFcn fcn, ///< Function tested - psS32 expectedReturn, ///< Expected return - psBool useFork ///< Fork to use -); - -/** Procedure used to run the test suite. - * - * @return psBool: True if successful. - */ -psBool p_runTestSuite( - FILE *fp, ///< File to test - const char* testPointFile, ///< Test point in file - const char* packageName, ///< Package name - testDescription tests[], ///< Description of tests - psS32 argc, ///< Number of test arguments - char * const argv[] ///< Test arguments -); - -/** Prints a positive test header to file */ -void p_printPositiveTestHeader( - FILE *fp, ///< File to which to print - const char* testPointFile, ///< Test point in file - const char* packageName, ///< Package name - const char* testPointName ///< Test point name -); - -/** Prints a negative test header to file */ -void p_printNegativeTestHeader( - FILE *fp, ///< File to which to print - const char* testPointFile, ///< Test point in file - const char* packageName, ///< Package name - const char* testPointName, ///< Test point name - const char* expectedError, ///< Expected error - psS32 exitValue ///< Exit value -); - -/** Prints a footer to file */ -void p_printFooter( - FILE *fp, ///< File to which to print - const char* testPointFile, ///< Test point in file - const char* packageName, ///< Package name - const char* testPointName, ///< Test point name - psBool success ///< True if successful -); - -#endif // #ifndef PSTEST_H Index: /trunk/psLib/src/sys/Makefile.am =================================================================== --- /trunk/psLib/src/sys/Makefile.am (revision 8913) +++ /trunk/psLib/src/sys/Makefile.am (revision 8914) @@ -27,6 +27,5 @@ $(top_srcdir)/utils/psParseErrorCodes --data=../psErrorCodes_$(PS_LANG).dat $@ -pslibincludedir = $(includedir) -pslibinclude_HEADERS = \ +pkginclude_HEADERS = \ psAbort.h \ psAssert.h \ Index: /trunk/psLib/src/types/Makefile.am =================================================================== --- /trunk/psLib/src/types/Makefile.am (revision 8913) +++ /trunk/psLib/src/types/Makefile.am (revision 8914) @@ -19,6 +19,5 @@ EXTRA_DIST = types.i -pslibincludedir = $(includedir) -pslibinclude_HEADERS = \ +pkginclude_HEADERS = \ psArray.h \ psBitSet.h \ Index: /trunk/psLib/src/xml/Makefile.am =================================================================== --- /trunk/psLib/src/xml/Makefile.am (revision 8913) +++ /trunk/psLib/src/xml/Makefile.am (revision 8914) @@ -9,6 +9,5 @@ EXTRA_DIST = xml.i -pslibincludedir = $(includedir) -pslibinclude_HEADERS = \ +pkginclude_HEADERS = \ psXML.h