Index: trunk/psLib/src/astro/Makefile.am
===================================================================
--- trunk/psLib/src/astro/Makefile.am	(revision 4502)
+++ trunk/psLib/src/astro/Makefile.am	(revision 4540)
@@ -3,17 +3,10 @@
 AM_CFLAGS=$(CFLAGS) -DPS_CONFIG_FILE_DEFAULT=\"$(sysconfdir)/pslib/psTime.config\"
 
-INCLUDES = `echo "$(SRCLIBS} | sed sed "s|\(\\w\+\)|-I\$(top_builddir)/src/\1|g"`
-
 noinst_LTLIBRARIES = libpslibastro.la
 libpslibastro_la_SOURCES = \
 	psTime.c \
-	psCoord.c 
-	
-BUILT_SOURCES = psAstroErrors.h
+	psCoord.c
 
-EXTRA_DIST = psAstroErrors_$(LANG).dat astro.i
-
-psAstroErrors.h: psAstroErrors_$(LANG).dat
-	$(top_srcdir)/src/psParseErrorCodes --data=$? $@
+EXTRA_DIST = astro.i
 
 pslibincludedir = $(includedir)
Index: trunk/psLib/src/astro/psAstroErrors_en.dat
===================================================================
--- trunk/psLib/src/astro/psAstroErrors_en.dat	(revision 4502)
+++ 	(revision )
@@ -1,34 +1,0 @@
-#
-#  This file is used to generate psAstroErrors.h content
-#
-#  Format is:
-#  ERRORNAME(one word)    ERROR_TEXT
-#
-#  N.B. in code, the ERRORNAME appears as PS_ERRORTEXT_ERRORNAME
-####################################################################
-psTime_FILE_NOT_FOUND                  Failed to open file %s.
-psTime_FILE_TOO_MANY_ROWS              Too many rows found in file %s. Max number of rows allowed is %d.
-psTime_TIME_POSTDATES_TABLE            Specified psTime postdates (%g) the table of %s information.
-psTime_TIME_PREDATES_TABLE             Specified psTime predates (%g) the table of %s information.
-psTime_TIME_POSTDATES_TABLES           Specified psTime postdates (%g) all tables of %s information.
-psTime_TIME_PREDATES_TABLES            Specified psTime predates (%g) all tables of %s information.
-psTime_TABLE_DUPLICATE_ROWS            The %s table was found to have two rows of the same time value.
-psTime_TYPE_UNKNOWN                    Specified type, %d, is not supported.
-psTime_TYPE_INCORRECT                  Specified type, %d, is incorrect.
-psTime_TYPE_MISMATCH                   Specified psTime parameters must have same type.
-psTime_GET_TOD_FAILED                  Failed to determine the current time from gettimeofday function.
-psTime_CONVERT_TIME_TO_STRING_FAILED   Failed to convert a time via strftime function.
-psTime_APPEND_MSEC_FAILED              Failed to append millisecond to time string with snprintf function.
-psTime_USEC_INVALID                    The psTime usec attribute value, %u, is invalid.  Must be less than 1e6.
-psTime_ISOTIME_MALFORMED               Specified ISO Time string, '%s', is malformed.  Must be in 'YYYY-MM-DDThh:mm:ss.sss' format.
-psTime_INTERPOLATION_FAILED            Failed time table interpolation.
-psTime_INTERPOLATION_FAILED_NAME       Failed time table interpolation for '%s'.
-psTime_LOOKUP_METADATA_FAILED          Failed find '%s' in time metadata.
-psTime_BAD_TABLE_COUNT                 Incorrect number of table files entered. Found: %d. Expected: %d.
-psTime_BAD_VECTOR                      Incorrect vector size. Size: %d, Expected %d.
-#
-psCoord_PROJECTION_TYPE_UNDEFINED      The projection type, %s, is undefined.
-psCoord_PROJECTION_TYPE_UNKNOWN        The projection type, %d, is unknown.
-psCoord_UNITS_UNKNOWN                  Specified units, 0x%x, is not supported.
-psCoord_OFFSET_MODE_UNKNOWN            Specified offset mode, 0x%x, is not supported.
-psCoord_INVALID_MJD                    Specified time is less than 1900.
Index: trunk/psLib/src/astro/psCoord.c
===================================================================
--- trunk/psLib/src/astro/psCoord.c	(revision 4502)
+++ trunk/psLib/src/astro/psCoord.c	(revision 4540)
@@ -10,6 +10,6 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.78 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-27 20:38:11 $
+*  @version $Revision: 1.79 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-07-12 19:12:00 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -25,6 +25,5 @@
 #include "psError.h"
 #include "psLogMsg.h"
-#include "psAstronomyErrors.h"
-#include "psAstrometry.h"
+#include "psErrorText.h"
 #include "psMatrix.h"
 #include <math.h>
Index: trunk/psLib/src/astro/psTime.c
===================================================================
--- trunk/psLib/src/astro/psTime.c	(revision 4502)
+++ trunk/psLib/src/astro/psTime.c	(revision 4540)
@@ -10,6 +10,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.65 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-28 20:17:52 $
+ *  @version $Revision: 1.66 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-12 19:12:00 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -31,8 +31,8 @@
 #include "psString.h"
 #include "psMetadata.h"
-#include "psMetadataIO.h"
+#include "psMetadataConfig.h"
 #include "psLookupTable.h"
 #include "psConstants.h"
-#include "psAstronomyErrors.h"
+#include "psErrorText.h"
 
 #include "config.h"