Index: trunk/psLib/src/sys/Makefile.am
===================================================================
--- trunk/psLib/src/sys/Makefile.am	(revision 4446)
+++ trunk/psLib/src/sys/Makefile.am	(revision 4540)
@@ -1,45 +1,37 @@
-#Makefile for sysUtils functions of psLib
+#Makefile for sys 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)
+noinst_LTLIBRARIES = libpslibsys.la
 
-noinst_LTLIBRARIES = libpslibsysUtils.la
+libpslibsys_la_SOURCES = \
+	psAbort.c \
+	psConfigure.c  \
+	psError.c      \
+	psErrorCodes.c \
+	psLogMsg.c     \
+	psMemory.c     \
+	psString.c     \
+	psTrace.c
 
-libpslibsysUtils_la_SOURCES = \
-	psMemory.c     \
-	psError.c      \
-	psTrace.c      \
-	psLogMsg.c     \
-	psAbort.c      \
-	psString.c     \
-	psConfigure.c  \
-	psErrorCodes.c
+EXTRA_DIST = sys.i
 
-BUILT_SOURCES = psSysUtilsErrors.h
-EXTRA_DIST = psSysUtilsErrors.dat psSysUtilsErrors.h sysUtils.i
+BUILT_SOURCES = psErrorCodes.c
 
-psSysUtilsErrors.h: psSysUtilsErrors.dat
-	$(top_srcdir)/src/psParseErrorCodes --data=$? $@
+psErrorCodes.c: ../psErrorCodes_$(LANG).dat psErrorCodes.c.in psErrorCodes.h
+	$(top_srcdir)/psParseErrorCodes --data=../psErrorCodes_$(LANG).dat $@
+
+psError.h: psErrorCodes.h
+
+psErrorCodes.h: ../psErrorCodes_$(LANG).dat psErrorCodes.h.in
+	$(top_srcdir)/psParseErrorCodes --data=../psErrorCodes_$(LANG).dat $@
 
 pslibincludedir = $(includedir)
 pslibinclude_HEADERS = \
-	psType.h       \
+	psAbort.h \
+	psConfigure.h  \
+	psError.h      \
+	psErrorCodes.h \
+	psLogMsg.h     \
 	psMemory.h     \
-	psError.h      \
+	psString.h     \
 	psTrace.h      \
-	psLogMsg.h     \
-	psAbort.h      \
-	psString.h     \
-	psConfigure.h  \
-	psErrorCodes.h
-
+	psType.h