Index: trunk/psastro/src/Makefile.am
===================================================================
--- trunk/psastro/src/Makefile.am	(revision 26173)
+++ trunk/psastro/src/Makefile.am	(revision 38040)
@@ -1,23 +1,8 @@
 lib_LTLIBRARIES = libpsastro.la
-
-if HAVE_SVNVERSION
-PSASTRO_VERSION=`$(SVNVERSION) ..`
-else
-PSASTRO_VERSION="UNKNOWN"
-endif
-
-if HAVE_SVN
-PSASTRO_BRANCH=`$(SVN) info .. | $(SED) -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'`
-PSASTRO_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
-else
-PSASTRO_BRANCH="UNKNOWN"
-PSASTRO_SOURCE="UNKNOWN"
-endif
 
 # Force recompilation of psastroVersion.c, since it gets the version information
 psastroVersion.c: psastroVersionDefinitions.h
 psastroVersionDefinitions.h: psastroVersionDefinitions.h.in FORCE
-	-$(RM) psastroVersionDefinitions.h
-	$(SED) -e "s|@PSASTRO_VERSION@|\"$(PSASTRO_VERSION)\"|" -e "s|@PSASTRO_BRANCH@|\"$(PSASTRO_BRANCH)\"|" -e "s|@PSASTRO_SOURCE@|\"$(PSASTRO_SOURCE)\"|" psastroVersionDefinitions.h.in > psastroVersionDefinitions.h
+	pslib-setsvnversion.pl PSASTRO psastroVersionDefinitions.h.in psastroVersionDefinitions.h
 FORCE: ;
 
@@ -87,4 +72,5 @@
 
 libpsastro_la_SOURCES = \
+	psastroGalaxyShapeErrors.c  \
 	psastroMaskUpdates.c        \
 	psastroMaskUtils.c          \