Index: /branches/eam_branches/ipp-20150112/ppConfigDump/src/Makefile.am
===================================================================
--- /branches/eam_branches/ipp-20150112/ppConfigDump/src/Makefile.am	(revision 38050)
+++ /branches/eam_branches/ipp-20150112/ppConfigDump/src/Makefile.am	(revision 38051)
@@ -2,5 +2,5 @@
 
 ppConfigDump_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(ppConfigDump_CFLAGS)
-ppConfigDump_LDFLAGS = $(PSLIB_LIBS) $(PSMODULE_LIBS)
+ppConfigDump_LDFLAGS = $(PSLIB_LIBS) $(PSMODULE_LIBS) -lz
 ppConfigDump_SOURCES = ppConfigDump.c
 
Index: /branches/eam_branches/ipp-20150112/ppSim/src/Makefile.am
===================================================================
--- /branches/eam_branches/ipp-20150112/ppSim/src/Makefile.am	(revision 38050)
+++ /branches/eam_branches/ipp-20150112/ppSim/src/Makefile.am	(revision 38051)
@@ -1,23 +1,8 @@
 bin_PROGRAMS = ppSim ppSimSequence
-
-if HAVE_SVNVERSION
-PPSIM_VERSION=`$(SVNVERSION) ..`
-else
-PPSIM_VERSION="UNKNOWN"
-endif
-
-if HAVE_SVN
-PPSIM_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 }'`
-PPSIM_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
-else
-PPSIM_BRANCH="UNKNOWN"
-PPSIM_SOURCE="UNKNOWN"
-endif
 
 # Force recompilation of ppSimVersion.c, since it gets the version information
 ppSimVersion.c: ppSimVersionDefinitions.h
 ppSimVersionDefinitions.h: ppSimVersionDefinitions.h.in FORCE
-	-$(RM) ppSimVersionDefinitions.h
-	$(SED) -e "s|@PPSIM_VERSION@|\"$(PPSIM_VERSION)\"|" -e "s|@PPSIM_BRANCH@|\"$(PPSIM_BRANCH)\"|" -e "s|@PPSIM_SOURCE@|\"$(PPSIM_SOURCE)\"|" ppSimVersionDefinitions.h.in > ppSimVersionDefinitions.h
+	pslib-setsvnversion.pl PPSIM ppSimVersionDefinitions.h.in ppSimVersionDefinitions.h
 FORCE: ;
 
Index: /branches/eam_branches/ipp-20150112/ppSim/src/ppSimInsertGalaxies.c
===================================================================
--- /branches/eam_branches/ipp-20150112/ppSim/src/ppSimInsertGalaxies.c	(revision 38050)
+++ /branches/eam_branches/ipp-20150112/ppSim/src/ppSimInsertGalaxies.c	(revision 38051)
@@ -82,5 +82,5 @@
 
     pmPSF *psf = psMetadataLookupPtr (&mdok, chip->analysis, "PSPHOT.PSF");
-    assert (psf);
+    psAssert (psf, "missing PSPHOT.PSF on chip.analysis");
 
     int dX = PM_CELL_TO_CHIP (0.0, x0Cell, xParityCell, binning);
Index: /branches/eam_branches/ipp-20150112/ppStack/src/Makefile.am
===================================================================
--- /branches/eam_branches/ipp-20150112/ppStack/src/Makefile.am	(revision 38050)
+++ /branches/eam_branches/ipp-20150112/ppStack/src/Makefile.am	(revision 38051)
@@ -1,23 +1,8 @@
 bin_PROGRAMS = ppStack ppStackMedian
-
-if HAVE_SVNVERSION
-PPSTACK_VERSION=`$(SVNVERSION) ..`
-else
-PPSTACK_VERSION="UNKNOWN"
-endif
-
-if HAVE_SVN
-PPSTACK_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 }'`
-PPSTACK_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
-else
-PPSTACK_BRANCH="UNKNOWN"
-PPSTACK_SOURCE="UNKNOWN"
-endif
 
 # Force recompilation of ppStackVersion.c, since it gets the version information
 ppStackVersion.c: ppStackVersionDefinitions.h
 ppStackVersionDefinitions.h: ppStackVersionDefinitions.h.in FORCE
-	-$(RM) ppStackVersionDefinitions.h
-	$(SED) -e "s|@PPSTACK_VERSION@|\"$(PPSTACK_VERSION)\"|" -e "s|@PPSTACK_BRANCH@|\"$(PPSTACK_BRANCH)\"|" -e "s|@PPSTACK_SOURCE@|\"$(PPSTACK_SOURCE)\"|" ppStackVersionDefinitions.h.in > ppStackVersionDefinitions.h
+	pslib-setsvnversion.pl PPSTACK ppStackVersionDefinitions.h.in ppStackVersionDefinitions.h
 FORCE: ;
 
Index: /branches/eam_branches/ipp-20150112/ppbgrestore/src/Makefile.am
===================================================================
--- /branches/eam_branches/ipp-20150112/ppbgrestore/src/Makefile.am	(revision 38050)
+++ /branches/eam_branches/ipp-20150112/ppbgrestore/src/Makefile.am	(revision 38051)
@@ -1,27 +1,11 @@
 bin_PROGRAMS = ppbgrestore
-
 
 noinst_HEADERS = \
 	ppbgrestore.h
 
-if HAVE_SVNVERSION
-PPBGRESTORE_VERSION=`$(SVNVERSION) ..`
-else
-PPBGRESTORE_VERSION="UNKNOWN"
-endif
-
-if HAVE_SVN
-PPBGRESTORE_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 }'`
-PPBGRESTORE_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
-else
-PPBGRESTORE_BRANCH="UNKNOWN"
-PPBGRESTORE_SOURCE="UNKNOWN"
-endif
-
 # Force recompilation of ppbgrestoreVersion.c, since it gets the version information
 ppbgrestoreVersion.c: ppbgrestoreVersionDefinitions.h
 ppbgrestoreVersionDefinitions.h: ppbgrestoreVersionDefinitions.h.in FORCE
-	-$(RM) ppbgrestoreVersionDefinitions.h
-	$(SED) -e "s|@PPBGRESTORE_VERSION@|\"$(PPBGRESTORE_VERSION)\"|" -e "s|@PPBGRESTORE_BRANCH@|\"$(PPBGRESTORE_BRANCH)\"|" -e "s|@PPBGRESTORE_SOURCE@|\"$(PPBGRESTORE_SOURCE)\"|" ppbgrestoreVersionDefinitions.h.in > ppbgrestoreVersionDefinitions.h
+	pslib-setsvnversion.pl PPBGRESTORE ppbgrestoreVersionDefinitions.h.in ppbgrestoreVersionDefinitions.h
 FORCE: ;
 
Index: /branches/eam_branches/ipp-20150112/psvideophot/src/Makefile.am
===================================================================
--- /branches/eam_branches/ipp-20150112/psvideophot/src/Makefile.am	(revision 38050)
+++ /branches/eam_branches/ipp-20150112/psvideophot/src/Makefile.am	(revision 38051)
@@ -5,23 +5,8 @@
 	psvideophot.h 
 
-if HAVE_SVNVERSION
-PSVIDEOPHOT_VERSION=`$(SVNVERSION) ..`
-else
-PSVIDEOPHOT_VERSION="UNKNOWN"
-endif
-
-if HAVE_SVN
-PSVIDEOPHOT_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 }'`
-PSVIDEOPHOT_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
-else
-PSVIDEOPHOT_BRANCH="UNKNOWN"
-PSVIDEOPHOT_SOURCE="UNKNOWN"
-endif
-
 # Force recompilation of psvideophotVersion.c, since it gets the version information
 psvideophotVersion.c: psvideophotVersionDefinitions.h
 psvideophotVersionDefinitions.h: psvideophotVersionDefinitions.h.in FORCE
-	-$(RM) psvideophotVersionDefinitions.h
-	$(SED) -e "s|@PSVIDEOPHOT_VERSION@|\"$(PSVIDEOPHOT_VERSION)\"|" -e "s|@PSVIDEOPHOT_BRANCH@|\"$(PSVIDEOPHOT_BRANCH)\"|" -e "s|@PSVIDEOPHOT_SOURCE@|\"$(PSVIDEOPHOT_SOURCE)\"|" psvideophotVersionDefinitions.h.in > psvideophotVersionDefinitions.h
+	pslib-setsvnversion.pl PSVIDEOPHOT psvideophotVersionDefinitions.h.in psvideophotVersionDefinitions.h
 FORCE: ;