Index: trunk/psLib/src/Makefile.am
===================================================================
--- trunk/psLib/src/Makefile.am	(revision 4235)
+++ trunk/psLib/src/Makefile.am	(revision 4540)
@@ -1,28 +1,17 @@
-SUBDIRS = astronomy collections dataManip dataIO image sysUtils
-
-INCLUDES = \
-	-I$(top_srcdir)/src/astronomy \
-	-I$(top_srcdir)/src/collections \
-	-I$(top_srcdir)/src/dataManip \
-	-I$(top_srcdir)/src/dataIO \
-	-I$(top_srcdir)/src/image \
-	-I$(top_srcdir)/src/sysUtils \
-	$(all_includes)
+SUBDIRS = $(SRCDIRS)
 
 lib_LTLIBRARIES = libpslib.la
-bin_SCRIPTS = psParseErrorCodes
 
-libpslib_la_LIBADD = \
-	$(top_builddir)/src/astronomy/libpslibastronomy.la \
-	$(top_builddir)/src/collections/libpslibcollections.la \
-	$(top_builddir)/src/dataManip/libpslibdataManip.la \
-	$(top_builddir)/src/dataIO/libpslibdataIO.la \
-	$(top_builddir)/src/image/libpslibimage.la \
-	$(top_builddir)/src/sysUtils/libpslibsysUtils.la
+libpslib_la_LIBADD = $(SRCSUBLIBS)
 
 libpslib_la_SOURCES = psTest.c
 libpslib_la_LDFLAGS = -version-info $(PSLIB_LT_VERSION)
 
-EXTRA_DIST = mainpage.dox psErrorCodes.dat psTest.h psParseErrorCodes
+
+EXTRA_DIST = mainpage.dox psErrorCodes.dat psTest.h psErrorText.h.in psErrorText_en.dat
+
+BUILT_SOURCES = psErrorText.h
+psErrorText.h: psErrorText_$(LANG).dat
+	$(top_srcdir)/psParseErrorCodes --data=$? $@
 
 pslibincludedir = $(includedir)