Index: trunk/psLib/src/db/Makefile.am
===================================================================
--- trunk/psLib/src/db/Makefile.am	(revision 4446)
+++ trunk/psLib/src/db/Makefile.am	(revision 4502)
@@ -1,27 +1,14 @@
-#Makefile for dataIO functions of psLib
+#Makefile for db functions of psLib
 #
-INCLUDES = \
-	-I$(top_srcdir)/src/astro \
-	-I$(top_srcdir)/src/db \
-	-I$(top_srcdir)/src/fft \
-	-I$(top_srcdir)/src/fits \
-	-I$(top_srcdir)/src/imageops \
-	-I$(top_srcdir)/src/math \
-	-I$(top_srcdir)/src/mathtypes \
-	-I$(top_srcdir)/src/sys \
-	-I$(top_srcdir)/src/types \
-	-I$(top_srcdir)/src/xml \
-	$(all_includes)
+INCLUDES = `echo "$(SRCLIBS} | sed sed "s|\(\\w\+\)|-I\$(top_builddir)/src/\1|g"`
 
-noinst_LTLIBRARIES = libpslibdataIO.la
+noinst_LTLIBRARIES = libpslibdb.la
 
 libpslibdataIO_la_SOURCES = \
-	psLookupTable.c \
-	psFits.c \
 	psDB.c
 
 
-BUILT_SOURCES = psFileUtilsErrors.h
-EXTRA_DIST = psFileUtilsErrors.dat psFileUtilsErrors.h dataIO.i
+BUILT_SOURCES = psDBErrors.h
+EXTRA_DIST = psDBErrors_en.dat db.i
 
 psFileUtilsErrors.h: psFileUtilsErrors.dat
Index: trunk/psLib/src/db/db.i
===================================================================
--- trunk/psLib/src/db/db.i	(revision 4502)
+++ trunk/psLib/src/db/db.i	(revision 4502)
@@ -0,0 +1,2 @@
+/* db headers */
+%include "psDB.h"
Index: trunk/psLib/src/db/psDBErrors_en.dat
===================================================================
--- trunk/psLib/src/db/psDBErrors_en.dat	(revision 4502)
+++ trunk/psLib/src/db/psDBErrors_en.dat	(revision 4502)
@@ -0,0 +1,26 @@
+#
+#  This file is used to generate psDBErrors.h content
+#
+#  Format is:
+#  ERRORNAME(one word)    ERROR_TEXT
+#
+#  N.B. in code, the ERRORNAME appears as PS_ERRORTEXT_ERRORNAME
+####################################################################
+psDB_INVALID_PSDB                      Invalid psDB has been specified.
+psDB_NULL_TABLE                        NULL table specified.
+psDB_FAILED_TO_CONNECT                 Failed to connect to database.  Error: %s
+psDB_FAILED_TO_CHANGE                  Failed to change database.  Error: %s
+psDB_TABLE_PARAM_NULL                  Create table parameters may not be NULL.
+psDB_QUERY_GEN_FAIL                    Query generation failed.
+psDB_TABLE_CREATE_FAIL                 Failed to create table.
+psDB_SQL_PREPARE_FAIL                  Failed to prepare query.  Error: %s
+psDB_SQL_QUERY_FAIL                    Failed to execute SQL query.  Error: %s
+psDB_TABLE_DROP_FAIL                   Failed to drop table.
+psDB_SEL_COL_FAIL                      Failed to select column.
+psDB_QUERY_NO_DATA                     Query returned no data.  Error: %s
+psDB_INSERT_ROW_FAIL                   Failed to insert row.
+psDB_UPDATE_ROW_FAIL                   Update row SQL generate fail: values and where params may not be NULL.
+psDB_SQL_SUBSTR_FAIL                   SQL substring generation failed.
+psDB_WHERE_SUBSTR_FAIL                 WHERE parameter my not be NULL.
+
+