Index: /trunk/ippToPsps/src/Makefile.am
===================================================================
--- /trunk/ippToPsps/src/Makefile.am	(revision 38033)
+++ /trunk/ippToPsps/src/Makefile.am	(revision 38034)
@@ -1,21 +1,7 @@
-if HAVE_SVNVERSION
-IPPTOPSPS_VERSION=`$(SVNVERSION) ..`
-else
-IPPTOPSPS_VERSION="UNKNOWN"
-endif
-
-if HAVE_SVN
-IPPTOPSPS_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 }'`
-IPPTOPSPS_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
-else
-IPPTOPSPS_BRANCH="UNKNOWN"
-IPPTOPSPS_SOURCE="UNKNOWN"
-endif
 
 # Force recompilation of ippToPspsVersion.c, since it gets the version information
 Version.c: VersionDefinitions.h
 VersionDefinitions.h: VersionDefinitions.h.in FORCE
-	-$(RM) VersionDefinitions.h
-	$(SED) -e "s|@IPPTOPSPS_VERSION@|\"$(IPPTOPSPS_VERSION)\"|" -e "s|@IPPTOPSPS_BRANCH@|\"$(IPPTOPSPS_BRANCH)\"|" -e "s|@IPPTOPSPS_SOURCE@|\"$(IPPTOPSPS_SOURCE)\"|" VersionDefinitions.h.in > VersionDefinitions.h
+	pslib-setsvnversion.pl IPPTOPSPS VersionDefinitions.h.in VersionDefinitions.h
 FORCE: ;
 
Index: /trunk/magic/censorObjects/src/Makefile.am
===================================================================
--- /trunk/magic/censorObjects/src/Makefile.am	(revision 38033)
+++ /trunk/magic/censorObjects/src/Makefile.am	(revision 38034)
@@ -1,21 +1,7 @@
-if HAVE_SVNVERSION
-CENSOR_VERSION=`$(SVNVERSION) ..`
-else
-CENSOR_VERSION="UNKNOWN"
-endif
-
-if HAVE_SVN
-CENSOR_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 }'`
-CENSOR_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
-else
-CENSOR_BRANCH="UNKNOWN"
-CENSOR_SOURCE="UNKNOWN"
-endif
 
 # Force recompilation of censorVersion.c, since it gets the version information
 censorVersion.c: censorVersionDefinitions.h
 censorVersionDefinitions.h: censorVersionDefinitions.h.in FORCE
-	-$(RM) censorVersionDefinitions.h
-	$(SED) -e "s|@CENSOR_VERSION@|\"$(CENSOR_VERSION)\"|" -e "s|@CENSOR_BRANCH@|\"$(CENSOR_BRANCH)\"|" -e "s|@CENSOR_SOURCE@|\"$(CENSOR_SOURCE)\"|" censorVersionDefinitions.h.in > censorVersionDefinitions.h
+	pslib-setsvnversion.pl CENSOR censorVersionDefinitions.h.in censorVersionDefinitions.h
 FORCE: ;
 
Index: /trunk/magic/remove/src/Makefile.am
===================================================================
--- /trunk/magic/remove/src/Makefile.am	(revision 38033)
+++ /trunk/magic/remove/src/Makefile.am	(revision 38034)
@@ -1,21 +1,7 @@
-if HAVE_SVNVERSION
-STREAKS_VERSION=`$(SVNVERSION) ..`
-else
-STREAKS_VERSION="UNKNOWN"
-endif
-
-if HAVE_SVN
-STREAKS_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 }'`
-STREAKS_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
-else
-STREAKS_BRANCH="UNKNOWN"
-STREAKS_SOURCE="UNKNOWN"
-endif
 
 # Force recompilation of streaksVersion.c, since it gets the version information
 streaksVersion.c: streaksVersionDefinitions.h
 streaksVersionDefinitions.h: streaksVersionDefinitions.h.in FORCE
-	-$(RM) streaksVersionDefinitions.h
-	$(SED) -e "s|@STREAKS_VERSION@|\"$(STREAKS_VERSION)\"|" -e "s|@STREAKS_BRANCH@|\"$(STREAKS_BRANCH)\"|" -e "s|@STREAKS_SOURCE@|\"$(STREAKS_SOURCE)\"|" streaksVersionDefinitions.h.in > streaksVersionDefinitions.h
+	pslib-setsvnversion.pl STREAKS streaksVersionDefinitions.h.in streaksVersionDefinitions.h
 FORCE: ;
 
Index: /trunk/ppArith/src/Makefile.am
===================================================================
--- /trunk/ppArith/src/Makefile.am	(revision 38033)
+++ /trunk/ppArith/src/Makefile.am	(revision 38034)
@@ -1,23 +1,8 @@
 bin_PROGRAMS = ppArith
-
-if HAVE_SVNVERSION
-PPARITH_VERSION=`$(SVNVERSION) ..`
-else
-PPARITH_VERSION="UNKNOWN"
-endif
-
-if HAVE_SVN
-PPARITH_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 }'`
-PPARITH_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
-else
-PPARITH_BRANCH="UNKNOWN"
-PPARITH_SOURCE="UNKNOWN"
-endif
 
 # Force recompilation of ppArithVersion.c, since it gets the version information
 ppArithVersion.c: ppArithVersionDefinitions.h
 ppArithVersionDefinitions.h: ppArithVersionDefinitions.h.in FORCE
-	-$(RM) ppArithVersionDefinitions.h
-	$(SED) -e "s|@PPARITH_VERSION@|\"$(PPARITH_VERSION)\"|" -e "s|@PPARITH_BRANCH@|\"$(PPARITH_BRANCH)\"|" -e "s|@PPARITH_SOURCE@|\"$(PPARITH_SOURCE)\"|" ppArithVersionDefinitions.h.in > ppArithVersionDefinitions.h
+	pslib-setsvnversion.pl PPARITH ppArithVersionDefinitions.h.in ppArithVersionDefinitions.h
 FORCE: ;
 
Index: /trunk/ppBackground/src/Makefile.am
===================================================================
--- /trunk/ppBackground/src/Makefile.am	(revision 38033)
+++ /trunk/ppBackground/src/Makefile.am	(revision 38034)
@@ -1,23 +1,8 @@
 bin_PROGRAMS = ppBackground ppBackgroundStack
-
-if HAVE_SVNVERSION
-PPBACKGROUND_VERSION=`$(SVNVERSION) ..`
-else
-PPBACKGROUND_VERSION="UNKNOWN"
-endif
-
-if HAVE_SVN
-PPBACKGROUND_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 }'`
-PPBACKGROUND_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
-else
-PPBACKGROUND_BRANCH="UNKNOWN"
-PPBACKGROUND_SOURCE="UNKNOWN"
-endif
 
 # Force recompilation of ppBackgroundVersion.c, since it gets the version information
 ppBackgroundVersion.c: ppBackgroundVersionDefinitions.h
 ppBackgroundVersionDefinitions.h: ppBackgroundVersionDefinitions.h.in FORCE
-	-$(RM) ppBackgroundVersionDefinitions.h
-	$(SED) -e "s|@PPBACKGROUND_VERSION@|\"$(PPBACKGROUND_VERSION)\"|" -e "s|@PPBACKGROUND_BRANCH@|\"$(PPBACKGROUND_BRANCH)\"|" -e "s|@PPBACKGROUND_SOURCE@|\"$(PPBACKGROUND_SOURCE)\"|" ppBackgroundVersionDefinitions.h.in > ppBackgroundVersionDefinitions.h
+	pslib-setsvnversion.pl PPBACKGROUND ppBackgroundVersionDefinitions.h.in ppBackgroundVersionDefinitions.h
 FORCE: ;
 
Index: /trunk/ppImage/src/Makefile.am
===================================================================
--- /trunk/ppImage/src/Makefile.am	(revision 38033)
+++ /trunk/ppImage/src/Makefile.am	(revision 38034)
@@ -4,23 +4,8 @@
 	ppImage.h
 
-if HAVE_SVNVERSION
-PPIMAGE_VERSION=`$(SVNVERSION) ..`
-else
-PPIMAGE_VERSION="UNKNOWN"
-endif
-
-if HAVE_SVN
-PPIMAGE_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 }'`
-PPIMAGE_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
-else
-PPIMAGE_BRANCH="UNKNOWN"
-PPIMAGE_SOURCE="UNKNOWN"
-endif
-
 # Force recompilation of ppImageVersion.c, since it gets the version information
 ppImageVersion.c: ppImageVersionDefinitions.h
 ppImageVersionDefinitions.h: ppImageVersionDefinitions.h.in FORCE
-	-$(RM) ppImageVersionDefinitions.h
-	$(SED) -e "s|@PPIMAGE_VERSION@|\"$(PPIMAGE_VERSION)\"|" -e "s|@PPIMAGE_BRANCH@|\"$(PPIMAGE_BRANCH)\"|" -e "s|@PPIMAGE_SOURCE@|\"$(PPIMAGE_SOURCE)\"|" ppImageVersionDefinitions.h.in > ppImageVersionDefinitions.h
+	pslib-setsvnversion.pl PPIMAGE ppImageVersionDefinitions.h.in ppImageVersionDefinitions.h
 FORCE: ;
 
Index: /trunk/ppMerge/src/Makefile.am
===================================================================
--- /trunk/ppMerge/src/Makefile.am	(revision 38033)
+++ /trunk/ppMerge/src/Makefile.am	(revision 38034)
@@ -1,25 +1,9 @@
 bin_PROGRAMS = ppMerge
-
-if HAVE_SVNVERSION
-PPMERGE_VERSION=`$(SVNVERSION) ..`
-else
-PPMERGE_VERSION="UNKNOWN"
-endif
-
-if HAVE_SVN
-PPMERGE_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 }'`
-PPMERGE_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
-else
-PPMERGE_BRANCH="UNKNOWN"
-PPMERGE_SOURCE="UNKNOWN"
-endif
 
 # Force recompilation of ppMergeVersion.c, since it gets the version information
 ppMergeVersion.c: ppMergeVersionDefinitions.h
 ppMergeVersionDefinitions.h: ppMergeVersionDefinitions.h.in FORCE
-	-$(RM) ppMergeVersionDefinitions.h
-	$(SED) -e "s|@PPMERGE_VERSION@|\"$(PPMERGE_VERSION)\"|" -e "s|@PPMERGE_BRANCH@|\"$(PPMERGE_BRANCH)\"|" -e "s|@PPMERGE_SOURCE@|\"$(PPMERGE_SOURCE)\"|" ppMergeVersionDefinitions.h.in > ppMergeVersionDefinitions.h
+	pslib-setsvnversion.pl PPMERGE ppMergeVersionDefinitions.h.in ppMergeVersionDefinitions.h
 FORCE: ;
-
 
 ppMerge_CFLAGS = $(PPMERGE_CFLAGS) $(PPSTATS_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
Index: /trunk/ppNoiseMap/src/Makefile.am
===================================================================
--- /trunk/ppNoiseMap/src/Makefile.am	(revision 38033)
+++ /trunk/ppNoiseMap/src/Makefile.am	(revision 38034)
@@ -4,23 +4,8 @@
 	ppNoiseMap.h 
 
-if HAVE_SVNVERSION
-PPNOISEMAP_VERSION=`$(SVNVERSION) ..`
-else
-PPNOISEMAP_VERSION="UNKNOWN"
-endif
-
-if HAVE_SVN
-PPIMAGE_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 }'`
-PPIMAGE_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
-else
-PPIMAGE_BRANCH="UNKNOWN"
-PPIMAGE_SOURCE="UNKNOWN"
-endif
-
 # Force recompilation of ppNoiseMapVersion.c, since it gets the version information
 ppNoiseMapVersion.c: ppNoiseMapVersionDefinitions.h
 ppNoiseMapVersionDefinitions.h: ppNoiseMapVersionDefinitions.h.in FORCE
-	-$(RM) ppNoiseMapVersionDefinitions.h
-	$(SED) -e "s|@PPNOISEMAP_VERSION@|\"$(PPNOISEMAP_VERSION)\"|" -e "s|@PPNOISEMAP_BRANCH@|\"$(PPNOISEMAP_BRANCH)\"|" -e "s|@PPNOISEMAP_SOURCE@|\"$(PPNOISEMAP_SOURCE)\"|" ppNoiseMapVersionDefinitions.h.in > ppNoiseMapVersionDefinitions.h
+	pslib-setsvnversion.pl PPNOISEMAP ppNoiseMapVersionDefinitions.h.in ppNoiseMapVersionDefinitions.h
 FORCE: ;
 
Index: /trunk/ppSkycell/src/Makefile.am
===================================================================
--- /trunk/ppSkycell/src/Makefile.am	(revision 38033)
+++ /trunk/ppSkycell/src/Makefile.am	(revision 38034)
@@ -1,23 +1,8 @@
 bin_PROGRAMS = ppSkycell
-
-if HAVE_SVNVERSION
-PPSKYCELL_VERSION=`$(SVNVERSION) ..`
-else
-PPSKYCELL_VERSION="UNKNOWN"
-endif
-
-if HAVE_SVN
-PPSKYCELL_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 }'`
-PPSKYCELL_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
-else
-PPSKYCELL_BRANCH="UNKNOWN"
-PPSKYCELL_SOURCE="UNKNOWN"
-endif
 
 # Force recompilation of ppSkycellVersion.c, since it gets the version information
 ppSkycellVersion.c: ppSkycellVersionDefinitions.h
 ppSkycellVersionDefinitions.h: ppSkycellVersionDefinitions.h.in FORCE
-	-$(RM) ppSkycellVersionDefinitions.h
-	$(SED) -e "s|@PPSKYCELL_VERSION@|\"$(PPSKYCELL_VERSION)\"|" -e "s|@PPSKYCELL_BRANCH@|\"$(PPSKYCELL_BRANCH)\"|" -e "s|@PPSKYCELL_SOURCE@|\"$(PPSKYCELL_SOURCE)\"|" ppSkycellVersionDefinitions.h.in > ppSkycellVersionDefinitions.h
+	pslib-setsvnversion.pl PPSKYCELL ppSkycellVersionDefinitions.h.in ppSkycellVersionDefinitions.h
 FORCE: ;
 
Index: /trunk/ppSmooth/src/Makefile.am
===================================================================
--- /trunk/ppSmooth/src/Makefile.am	(revision 38033)
+++ /trunk/ppSmooth/src/Makefile.am	(revision 38034)
@@ -3,23 +3,8 @@
 noinst_HEADERS = ppSmooth.h 
 
-if HAVE_SVNVERSION
-PPSMOOTH_VERSION=`$(SVNVERSION) ..`
-else
-PPSMOOTH_VERSION="UNKNOWN"
-endif
-
-if HAVE_SVN
-PPSMOOTH_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 }'`
-PPSMOOTH_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
-else
-PPSMOOTH_BRANCH="UNKNOWN"
-PPSMOOTH_SOURCE="UNKNOWN"
-endif
-
 # Force recompilation of ppSmoothVersion.c, since it gets the version information
 ppSmoothVersion.c: ppSmoothVersionDefinitions.h
 ppSmoothVersionDefinitions.h: ppSmoothVersionDefinitions.h.in FORCE
-	-$(RM) ppSmoothVersionDefinitions.h
-	$(SED) -e "s|@PPSMOOTH_VERSION@|\"$(PPSMOOTH_VERSION)\"|" -e "s|@PPSMOOTH_BRANCH@|\"$(PPSMOOTH_BRANCH)\"|" -e "s|@PPSMOOTH_SOURCE@|\"$(PPSMOOTH_SOURCE)\"|" ppSmoothVersionDefinitions.h.in > ppSmoothVersionDefinitions.h
+	pslib-setsvnversion.pl PPSMOOTH ppSmoothVersionDefinitions.h.in ppSmoothVersionDefinitions.h
 FORCE: ;
 
Index: /trunk/ppStack/src/Makefile.am
===================================================================
--- /trunk/ppStack/src/Makefile.am	(revision 38033)
+++ /trunk/ppStack/src/Makefile.am	(revision 38034)
@@ -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: /trunk/ppStats/src/Makefile.am
===================================================================
--- /trunk/ppStats/src/Makefile.am	(revision 38033)
+++ /trunk/ppStats/src/Makefile.am	(revision 38034)
@@ -1,23 +1,8 @@
 lib_LTLIBRARIES = libppStats.la
-
-if HAVE_SVNVERSION
-PPSTATS_VERSION=`$(SVNVERSION) ..`
-else
-PPSTATS_VERSION="UNKNOWN"
-endif
-
-if HAVE_SVN
-PPSTATS_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 }'`
-PPSTATS_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
-else
-PPSTATS_BRANCH="UNKNOWN"
-PPSTATS_SOURCE="UNKNOWN"
-endif
 
 # Force recompilation of ppStatsVersion.c, since it gets the version information
 ppStatsVersion.c: ppStatsVersionDefinitions.h
 ppStatsVersionDefinitions.h: ppStatsVersionDefinitions.h.in FORCE
-	-$(RM) ppStatsVersionDefinitions.h
-	$(SED) -e "s|@PPSTATS_VERSION@|\"$(PPSTATS_VERSION)\"|" -e "s|@PPSTATS_BRANCH@|\"$(PPSTATS_BRANCH)\"|" -e "s|@PPSTATS_SOURCE@|\"$(PPSTATS_SOURCE)\"|" ppStatsVersionDefinitions.h.in > ppStatsVersionDefinitions.h
+	pslib-setsvnversion.pl PPSTATS ppStatsVersionDefinitions.h.in ppStatsVersionDefinitions.h
 FORCE: ;
 
Index: /trunk/ppSub/src/Makefile.am
===================================================================
--- /trunk/ppSub/src/Makefile.am	(revision 38033)
+++ /trunk/ppSub/src/Makefile.am	(revision 38034)
@@ -1,23 +1,8 @@
 bin_PROGRAMS = ppSub ppSubKernel ppSubConvolve
-
-if HAVE_SVNVERSION
-PPSUB_VERSION=`$(SVNVERSION) ..`
-else
-PPSUB_VERSION="UNKNOWN"
-endif
-
-if HAVE_SVN
-PPSUB_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 }'`
-PPSUB_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
-else
-PPSUB_BRANCH="UNKNOWN"
-PPSUB_SOURCE="UNKNOWN"
-endif
 
 # Force recompilation of ppSubVersion.c, since it gets the version information
 ppSubVersion.c: ppSubVersionDefinitions.h
 ppSubVersionDefinitions.h: ppSubVersionDefinitions.h.in FORCE
-	-$(RM) ppSubVersionDefinitions.h
-	$(SED) -e "s|@PPSUB_VERSION@|\"$(PPSUB_VERSION)\"|" -e "s|@PPSUB_BRANCH@|\"$(PPSUB_BRANCH)\"|" -e "s|@PPSUB_SOURCE@|\"$(PPSUB_SOURCE)\"|" ppSubVersionDefinitions.h.in > ppSubVersionDefinitions.h
+	pslib-setsvnversion.pl PPSUB ppSubVersionDefinitions.h.in ppSubVersionDefinitions.h
 FORCE: ;
 
Index: /trunk/ppTranslate/src/Makefile.am
===================================================================
--- /trunk/ppTranslate/src/Makefile.am	(revision 38033)
+++ /trunk/ppTranslate/src/Makefile.am	(revision 38034)
@@ -1,23 +1,8 @@
 bin_PROGRAMS = ppMops ppMonet
-
-if HAVE_SVNVERSION
-PPTRANSLATE_VERSION=`$(SVNVERSION) ..`
-else
-PPTRANSLATE_VERSION="UNKNOWN"
-endif
-
-if HAVE_SVN
-PPTRANSLATE_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 }'`
-PPTRANSLATE_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
-else
-PPTRANSLATE_BRANCH="UNKNOWN"
-PPTRANSLATE_SOURCE="UNKNOWN"
-endif
 
 # Force recompilation of ppMopsVersion.c, since it gets the version information
 ppTranslateVersion.c: ppTranslateVersionDefinitions.h
 ppTranslateVersionDefinitions.h: ppTranslateVersionDefinitions.h.in FORCE
-	-$(RM) ppTranslateVersionDefinitions.h
-	$(SED) -e "s|@PPTRANSLATE_VERSION@|\"$(PPTRANSLATE_VERSION)\"|" -e "s|@PPTRANSLATE_BRANCH@|\"$(PPTRANSLATE_BRANCH)\"|" -e "s|@PPTRANSLATE_SOURCE@|\"$(PPTRANSLATE_SOURCE)\"|" ppTranslateVersionDefinitions.h.in > ppTranslateVersionDefinitions.h
+	pslib-setsvnversion.pl PPTRANSLATE ppTranslateVersionDefinitions.h.in ppTranslateVersionDefinitions.h
 FORCE: ;
 
Index: /trunk/ppViz/src/ppCoord/Makefile.am
===================================================================
--- /trunk/ppViz/src/ppCoord/Makefile.am	(revision 38033)
+++ /trunk/ppViz/src/ppCoord/Makefile.am	(revision 38034)
@@ -1,23 +1,8 @@
 bin_PROGRAMS = ppCoord
-
-if HAVE_SVNVERSION
-PPCOORD_VERSION=`$(SVNVERSION) ..`
-else
-PPCOORD_VERSION="UNKNOWN"
-endif
-
-if HAVE_SVN
-PPCOORD_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 }'`
-PPCOORD_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
-else
-PPCOORD_BRANCH="UNKNOWN"
-PPCOORD_SOURCE="UNKNOWN"
-endif
 
 # Force recompilation of ppCoordVersion.c, since it gets the version information
 ppCoordVersion.c: ppCoordVersionDefinitions.h
 ppCoordVersionDefinitions.h: ppCoordVersionDefinitions.h.in FORCE
-	-$(RM) ppCoordVersionDefinitions.h
-	$(SED) -e "s|@PPCOORD_VERSION@|\"$(PPCOORD_VERSION)\"|" -e "s|@PPCOORD_BRANCH@|\"$(PPCOORD_BRANCH)\"|" -e "s|@PPCOORD_SOURCE@|\"$(PPCOORD_SOURCE)\"|" ppCoordVersionDefinitions.h.in > ppCoordVersionDefinitions.h
+	pslib-setsvnversion.pl PPCOORD ppCoordVersionDefinitions.h.in ppCoordVersionDefinitions.h
 FORCE: ;
 
Index: /trunk/ppViz/src/ppVizPSF/Makefile.am
===================================================================
--- /trunk/ppViz/src/ppVizPSF/Makefile.am	(revision 38033)
+++ /trunk/ppViz/src/ppVizPSF/Makefile.am	(revision 38034)
@@ -1,23 +1,8 @@
 bin_PROGRAMS = ppVizPSF
-
-if HAVE_SVNVERSION
-PPVIZPSF_VERSION=`$(SVNVERSION) ..`
-else
-PPVIZPSF_VERSION="UNKNOWN"
-endif
-
-if HAVE_SVN
-PPVIZPSF_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 }'`
-PPVIZPSF_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
-else
-PPVIZPSF_BRANCH="UNKNOWN"
-PPVIZPSF_SOURCE="UNKNOWN"
-endif
 
 # Force recompilation of ppVizPSFVersion.c, since it gets the version information
 ppVizPSFVersion.c: ppVizPSFVersionDefinitions.h
 ppVizPSFVersionDefinitions.h: ppVizPSFVersionDefinitions.h.in FORCE
-	-$(RM) ppVizPSFVersionDefinitions.h
-	$(SED) -e "s|@PPVIZPSF_VERSION@|\"$(PPVIZPSF_VERSION)\"|" -e "s|@PPVIZPSF_BRANCH@|\"$(PPVIZPSF_BRANCH)\"|" -e "s|@PPVIZPSF_SOURCE@|\"$(PPVIZPSF_SOURCE)\"|" ppVizPSFVersionDefinitions.h.in > ppVizPSFVersionDefinitions.h
+	pslib-setsvnversion.pl PPVIZPSF ppVizPSFVersionDefinitions.h.in ppVizPSFVersionDefinitions.h
 FORCE: ;
 
Index: /trunk/ppViz/src/ppVizPattern/Makefile.am
===================================================================
--- /trunk/ppViz/src/ppVizPattern/Makefile.am	(revision 38033)
+++ /trunk/ppViz/src/ppVizPattern/Makefile.am	(revision 38034)
@@ -1,23 +1,8 @@
 bin_PROGRAMS = ppVizPattern
-
-if HAVE_SVNVERSION
-PPVIZPATTERN_VERSION=`$(SVNVERSION) ..`
-else
-PPVIZPATTERN_VERSION="UNKNOWN"
-endif
-
-if HAVE_SVN
-PPVIZPATTERN_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 }'`
-PPVIZPATTERN_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
-else
-PPVIZPATTERN_BRANCH="UNKNOWN"
-PPVIZPATTERN_SOURCE="UNKNOWN"
-endif
 
 # Force recompilation of ppVizPatternVersion.c, since it gets the version information
 ppVizPatternVersion.c: ppVizPatternVersionDefinitions.h
 ppVizPatternVersionDefinitions.h: ppVizPatternVersionDefinitions.h.in FORCE
-	-$(RM) ppVizPatternVersionDefinitions.h
-	$(SED) -e "s|@PPVIZPATTERN_VERSION@|\"$(PPVIZPATTERN_VERSION)\"|" -e "s|@PPVIZPATTERN_BRANCH@|\"$(PPVIZPATTERN_BRANCH)\"|" -e "s|@PPVIZPATTERN_SOURCE@|\"$(PPVIZPATTERN_SOURCE)\"|" ppVizPatternVersionDefinitions.h.in > ppVizPatternVersionDefinitions.h
+	pslib-setsvnversion.pl PPVIZPATTERN ppVizPatternVersionDefinitions.h.in ppVizPatternVersionDefinitions.h
 FORCE: ;
 
Index: /trunk/ppbgrestore/src/Makefile.am
===================================================================
--- /trunk/ppbgrestore/src/Makefile.am	(revision 38033)
+++ /trunk/ppbgrestore/src/Makefile.am	(revision 38034)
@@ -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: /trunk/psvideophot/src/Makefile.am
===================================================================
--- /trunk/psvideophot/src/Makefile.am	(revision 38033)
+++ /trunk/psvideophot/src/Makefile.am	(revision 38034)
@@ -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: ;
 
Index: /trunk/pswarp/src/Makefile.am
===================================================================
--- /trunk/pswarp/src/Makefile.am	(revision 38033)
+++ /trunk/pswarp/src/Makefile.am	(revision 38034)
@@ -1,23 +1,8 @@
 bin_PROGRAMS = pswarp
-
-if HAVE_SVNVERSION
-PSWARP_VERSION=`$(SVNVERSION) ..`
-else
-PSWARP_VERSION="UNKNOWN"
-endif
-
-if HAVE_SVN
-PSWARP_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 }'`
-PSWARP_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
-else
-PSWARP_BRANCH="UNKNOWN"
-PSWARP_SOURCE="UNKNOWN"
-endif
 
 # Force recompilation of pswarpVersion.c, since it gets the version information
 pswarpVersion.c: pswarpVersionDefinitions.h
 pswarpVersionDefinitions.h: pswarpVersionDefinitions.h.in FORCE
-	-$(RM) pswarpVersionDefinitions.h
-	$(SED) -e "s|@PSWARP_VERSION@|\"$(PSWARP_VERSION)\"|" -e "s|@PSWARP_BRANCH@|\"$(PSWARP_BRANCH)\"|" -e "s|@PSWARP_SOURCE@|\"$(PSWARP_SOURCE)\"|" pswarpVersionDefinitions.h.in > pswarpVersionDefinitions.h
+	pslib-setsvnversion.pl PSWARP pswarpVersionDefinitions.h.in pswarpVersionDefinitions.h
 FORCE: ;
 
