+ eliminated build-time dependence on svn:special symlinks

svn path=/trunk/externals/moocow/; revision=10845

99 files changed, 411 insertions, 337 deletions

diff --git a/autoreconf.sh b/autoreconf.sh
index e008d6e..acba1c9 100755
--- a/autoreconf.sh
+++ b/autoreconf.sh
@@ -28,6 +28,9 @@ fi
 
 if test -n "$dirs"; then
   echo "$0: dirs=(${dirs[@]})"
+  for d in "${dirs[@]}"; do
+    test -x "$d/svn-prepare.sh" && (cd "$d"; sh ./svn-prepare.sh)
+  done
   exec autoreconf $ar_args "${dirs[@]}"
   #--symlink
 fi
diff --git a/common/autogen.sh b/common/autogen.sh
index 3e88258..21dcf50 100755
--- a/common/autogen.sh
+++ b/common/autogen.sh
@@ -11,7 +11,7 @@ MY_AHDIRS="."
 MY_AMDIRS="."
 MY_ACDIRS="."
 
-test -z "$ACLOCAL" && ACLOCAL="aclocal -I m4"
+test -z "$ACLOCAL" && ACLOCAL="aclocal -I common/m4"
 test -z "$AUTOHEADER" && AUTOHEADER=autoheader
 test -z "$AUTOMAKE" && AUTOMAKE=automake
 test -z "$AUTOCONF" && AUTOCONF=autoconf
diff --git a/common/m4/ax_pd_external.m4 b/common/m4/ax_pd_external.m4
index 580ba02..8afa7b0 100644
--- a/common/m4/ax_pd_external.m4
+++ b/common/m4/ax_pd_external.m4
@@ -13,7 +13,7 @@
 #
 # Pd directories
 #   AC_ARG_WITH(pd-dir)     : default: "\${prefix}/pd"
-#   AC_ARG_WITH(pd-include) : sets IFLAGS, AM_IFLAGS
+#   AC_ARG_WITH(pd-include) : sets PDEXT_IFLAGS, AM_IFLAGS
 #   AC_ARG_WITH(pd-extdir)  : default $pddir/externs
 #   AC_SUBST(pddir)
 #   AC_SUBST(pddocdir)
@@ -148,7 +148,7 @@ AC_DEFUN([AX_PD_EXTERNAL],
 	[pdincludedir="$withval"],
 	[pdincludedir=""])
  if test -n "$pdincludedir" ; then
-  IFLAGS="$IFLAGS -I$pdincludedir"
+  PDEXT_IFLAGS="$PDEXT_IFLAGS -I$pdincludedir"
  fi
  AC_SUBST(pdincludedir)
 
@@ -194,7 +194,7 @@ AC_DEFUN([AX_PD_EXTERNAL],
 
  ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
  ## check: m_pd.h
- CPPFLAGS="$CPPFLAGS $IFLAGS"
+ CPPFLAGS="$CPPFLAGS $PDEXT_IFLAGS"
  AC_CHECK_HEADER(m_pd.h,[],
 	AC_MSG_ERROR([could not find Pd header file 'm_pd.h' - bailing out]),
 	[/* nonempty includes: compile only */])
diff --git a/hello/prepare-svn.sh b/common/svn-prepare.sh
index 58830ae..6edae1a 100755
--- a/hello/prepare-svn.sh
+++ b/common/svn-prepare.sh
@@ -32,5 +32,10 @@ else
 fi
 
 ##-- copy or link in common dir
-rm -rf "$COMMON_DST";
-$CP "$COMMON_SRC" "$COMMON_DST";
+runcmd() {
+  echo "$0[`basename \`pwd\``]:" "$@"
+  $@
+}
+
+runcmd rm -rf "$COMMON_DST";
+runcmd $CP "$COMMON_SRC" "$COMMON_DST";
diff --git a/deque/Makefile.am b/deque/Makefile.am
index e7ff53b..9d8c918 100644
--- a/deque/Makefile.am
+++ b/deque/Makefile.am
@@ -9,14 +9,14 @@
 #-----------------------------------------------------------------------
 # Includes
 #-----------------------------------------------------------------------
-include $(top_srcdir)/pdexternal.am
+include $(top_srcdir)/common/pdexternal.am
 
 #-----------------------------------------------------------------------
 # Options & Subdirectories
 #-----------------------------------------------------------------------
 
 ##-- aclocal options (top level only)
-ACLOCAL_AMFLAGS = -I m4 
+ACLOCAL_AMFLAGS = -I common/m4
 
 ## --- automake options
 #AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip
diff --git a/deque/Makefile.in b/deque/Makefile.in
index 2ec6d32..eb50c31 100644
--- a/deque/Makefile.in
+++ b/deque/Makefile.in
@@ -47,11 +47,11 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(top_srcdir)/configure \
-	$(top_srcdir)/pdexternal.am COPYING
+	$(srcdir)/Makefile.in $(top_srcdir)/common/pdexternal.am \
+	$(top_srcdir)/configure COPYING
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -234,7 +234,7 @@ MAINTAINERCLEANFILES = *~ \
 #-----------------------------------------------------------------------
 # Options & Subdirectories
 #-----------------------------------------------------------------------
-ACLOCAL_AMFLAGS = -I m4 
+ACLOCAL_AMFLAGS = -I common/m4
 
 #AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip
 AUTOMAKE_OPTIONS = foreign
@@ -250,7 +250,7 @@ all: all-recursive
 .SUFFIXES: .@PDEXT@ .pod .txt .html
 am--refresh:
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/pdexternal.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/common/pdexternal.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -418,7 +418,7 @@ distclean-tags:
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/m4
+	$(mkdir_p) $(distdir)/common $(distdir)/common/m4
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
diff --git a/deque/README.cvs b/deque/README.cvs
deleted file mode 100644
index 96b1253..0000000
--- a/deque/README.cvs
+++ /dev/null
@@ -1,16 +0,0 @@
-To build from cvs, do the following:
-
- ./autogen.sh
- ./configure
- make
- make install
-
-You will need recent versions of GNU automake and
-autoconf in order to build from the CVS tree.
-
-NOTE:  The README.txt file in the distribution
-is auto-generated from perl ".pod" format by
-the "pod2text" included in most perl distributions.
-
-marmosets,
-	Bryan
diff --git a/deque/README.svn b/deque/README.svn
new file mode 100644
index 0000000..2fc9816
--- /dev/null
+++ b/deque/README.svn
@@ -0,0 +1,21 @@
+To build from subversion sources, do the following:
+
+ ./svn-prepare.sh
+ ./autogen.sh
+ ./configure
+ make
+ make install
+
+You will need recent versions of GNU automake and
+autoconf in order to build from the SVN tree.
+
+The './svn-prepare.sh' script requires some shared code
+in the directory ../common (relative to the package root
+directory).
+
+The README.txt file in the distribution is auto-generated
+from perl ".pod" format by the "pod2text" included in most
+Perl distributions.
+
+marmosets,
+	Bryan
diff --git a/deque/aclocal.m4 b/deque/aclocal.m4
index 4ab8160..0cdbeac 100644
--- a/deque/aclocal.m4
+++ b/deque/aclocal.m4
@@ -889,4 +889,4 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-m4_include([m4/ax_pd_external.m4])
+m4_include([common/m4/ax_pd_external.m4])
diff --git a/deque/config/Makefile.am b/deque/config/Makefile.am
index 81998be..0a340c0 100644
--- a/deque/config/Makefile.am
+++ b/deque/config/Makefile.am
@@ -9,4 +9,4 @@
 #-----------------------------------------------------------------------
 # Includes
 #-----------------------------------------------------------------------
-include $(top_srcdir)/pdexternal.am
+include $(top_srcdir)/common/pdexternal.am
diff --git a/deque/config/Makefile.in b/deque/config/Makefile.in
index efab88f..049c594 100644
--- a/deque/config/Makefile.in
+++ b/deque/config/Makefile.in
@@ -39,10 +39,10 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/pdexternal.am depcomp install-sh missing
+	$(top_srcdir)/common/pdexternal.am depcomp install-sh missing
 subdir = config
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -200,7 +200,7 @@ all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .@PDEXT@ .pod .txt .html
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/pdexternal.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/common/pdexternal.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -238,7 +238,7 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/..
+	$(mkdir_p) $(distdir)/../common
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
diff --git a/deque/configure b/deque/configure
index eb8e3d8..c86d98b 100755
--- a/deque/configure
+++ b/deque/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for pd-deque 0.03-1.
+# Generated by GNU Autoconf 2.61 for pd-deque 0.03-2.
 #
 # Report bugs to <moocow@ling.uni-potsdam.de>.
 #
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='pd-deque'
 PACKAGE_TARNAME='pd-deque'
-PACKAGE_VERSION='0.03-1'
-PACKAGE_STRING='pd-deque 0.03-1'
+PACKAGE_VERSION='0.03-2'
+PACKAGE_STRING='pd-deque 0.03-2'
 PACKAGE_BUGREPORT='moocow@ling.uni-potsdam.de'
 
 ac_default_prefix=/usr/local
@@ -1189,7 +1189,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures pd-deque 0.03-1 to adapt to many kinds of systems.
+\`configure' configures pd-deque 0.03-2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1255,7 +1255,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of pd-deque 0.03-1:";;
+     short | recursive ) echo "Configuration of pd-deque 0.03-2:";;
    esac
   cat <<\_ACEOF
 
@@ -1351,7 +1351,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-pd-deque configure 0.03-1
+pd-deque configure 0.03-2
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1365,7 +1365,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by pd-deque $as_me 0.03-1, which was
+It was created by pd-deque $as_me 0.03-2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2047,7 +2047,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=pd-deque
- VERSION=0.03-1
+ VERSION=0.03-2
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3487,7 +3487,7 @@ else
 fi
 
  if test -n "$pdincludedir" ; then
-  IFLAGS="$IFLAGS -I$pdincludedir"
+  PDEXT_IFLAGS="$PDEXT_IFLAGS -I$pdincludedir"
  fi
 
 
@@ -3555,7 +3555,7 @@ fi
 
  ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
  ## check: m_pd.h
- CPPFLAGS="$CPPFLAGS $IFLAGS"
+ CPPFLAGS="$CPPFLAGS $PDEXT_IFLAGS"
  { echo "$as_me:$LINENO: checking for m_pd.h" >&5
 echo $ECHO_N "checking for m_pd.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_m_pd_h+set}" = set; then
@@ -4317,7 +4317,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by pd-deque $as_me 0.03-1, which was
+This file was extended by pd-deque $as_me 0.03-2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4370,7 +4370,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-pd-deque config.status 0.03-1
+pd-deque config.status 0.03-2
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/deque/configure.ac b/deque/configure.ac
index c65813e..03b6f4e 100644
--- a/deque/configure.ac
+++ b/deque/configure.ac
@@ -4,13 +4,13 @@ AC_PREREQ(2.5)
 
 dnl Some handy macros
 define([THE_PACKAGE_NAME],    [pd-deque])
-define([THE_PACKAGE_VERSION], [0.03-1])
+define([THE_PACKAGE_VERSION], [0.03-2])
 define([THE_PACKAGE_AUTHOR],  [moocow@ling.uni-potsdam.de])
 
 AC_INIT(THE_PACKAGE_NAME, THE_PACKAGE_VERSION, THE_PACKAGE_AUTHOR)
 
 ##-- Additional m4 macros
-AC_CONFIG_MACRO_DIR(m4)
+AC_CONFIG_MACRO_DIR(common/m4)
 
 ##-- source & aux
 dnl AC_CONFIG_AUX_DIR(.)
diff --git a/deque/m4 b/deque/m4
deleted file mode 120000
index 83ffc0c..0000000
--- a/deque/m4
+++ /dev/null
@@ -1 +0,0 @@
-../common/m4
\ No newline at end of file
diff --git a/deque/pdexternal.am b/deque/pdexternal.am
deleted file mode 120000
index 914f4be..0000000
--- a/deque/pdexternal.am
+++ /dev/null
@@ -1 +0,0 @@
-../common/pdexternal.am
\ No newline at end of file
diff --git a/deque/src/Makefile.am b/deque/src/Makefile.am
index 89477af..effa4d3 100644
--- a/deque/src/Makefile.am
+++ b/deque/src/Makefile.am
@@ -9,7 +9,7 @@
 #-----------------------------------------------------------------------
 # Includes
 #-----------------------------------------------------------------------
-include $(top_srcdir)/pdexternal.am
+include $(top_srcdir)/common/pdexternal.am
 
 #-----------------------------------------------------------------------
 # pd externals (hacked _PROGRAMS target)
@@ -32,7 +32,12 @@ pddoc_DATA = deque-help.pd
 #-----------------------------------------------------------------------
 
 deque_SOURCES = \
-	mooPdUtils.h \
+	$(top_srcdir)/common/mooPdUtils.h \
 	squeue.c squeue.h \
 	dsqueue.c dsqueue.h \
 	deque.c
+
+#-----------------------------------------------------------------------
+# flags
+#-----------------------------------------------------------------------
+AM_CPPFLAGS = -I$(top_srcdir)/common
diff --git a/deque/src/Makefile.in b/deque/src/Makefile.in
index c91b67c..f14a461 100644
--- a/deque/src/Makefile.in
+++ b/deque/src/Makefile.in
@@ -49,12 +49,12 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/config.h.in $(top_srcdir)/pdexternal.am
+	$(srcdir)/config.h.in $(top_srcdir)/common/pdexternal.am
 pdexterns_PROGRAMS = deque$(EXEEXT)
 EXTRA_PROGRAMS = deque$(EXEEXT)
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -240,17 +240,22 @@ pddoc_DATA = deque-help.pd
 # sources
 #-----------------------------------------------------------------------
 deque_SOURCES = \
-	mooPdUtils.h \
+	$(top_srcdir)/common/mooPdUtils.h \
 	squeue.c squeue.h \
 	dsqueue.c dsqueue.h \
 	deque.c
 
+
+#-----------------------------------------------------------------------
+# flags
+#-----------------------------------------------------------------------
+AM_CPPFLAGS = -I$(top_srcdir)/common
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
 .SUFFIXES: .@PDEXT@ .pod .txt .html .c .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/pdexternal.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/common/pdexternal.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -431,7 +436,7 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/..
+	$(mkdir_p) $(distdir)/../common
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
diff --git a/deque/src/mooPdUtils.h b/deque/src/mooPdUtils.h
deleted file mode 120000
index 0bb3280..0000000
--- a/deque/src/mooPdUtils.h
+++ /dev/null
@@ -1 +0,0 @@
-../../common/mooPdUtils.h
\ No newline at end of file
diff --git a/deque/svn-prepare.sh b/deque/svn-prepare.sh
new file mode 120000
index 0000000..12a9e5b
--- /dev/null
+++ b/deque/svn-prepare.sh
@@ -0,0 +1 @@
+../common/svn-prepare.sh
\ No newline at end of file
diff --git a/extended/Makefile b/extended/Makefile
index 8631348..20ae9e3 100644
--- a/extended/Makefile
+++ b/extended/Makefile
@@ -25,7 +25,7 @@ SUBDIRS = \
 MOOCOW_DIR    ?=$(shell pwd)
 MOOCOW_BUILD  ?=$(MOOCOW_DIR)/build.moo
 MOOCOW_MFLAGS ?=DESTDIR=""
-MOOCOW_BUILD_VERSION ?=2009-02-15.000
+MOOCOW_BUILD_VERSION ?=2009-03-07.000
 
 CONFIGURE_ARGS=\
 	CFLAGS="$(CFLAGS)" \
@@ -56,6 +56,7 @@ all: build.stamp
 DUMMY_DIR            ?=../dummy
 DUMMY_CONFIGURE_ARGS ?=--disable-shared
 dummy.autogen_stamp: 
+	(cd $(DUMMY_DIR); sh ./prepare-svn.sh) || $(ONFAIL)
 #	(cd $(DUMMY_DIR); sh ./autogen.sh) || $(ONFAIL)
 	touch $@
 
@@ -87,6 +88,7 @@ FLITE_DIR            ?=../flite
 #FLITE_CONFIGURE_ARGS ?=
 
 flite.autogen_stamp: 
+	(cd $(FLITE_DIR); sh ./svn-prepare.sh) || $(ONFAIL)
 #	(cd $(FLITE_DIR); sh ./autogen.sh) || $(ONFAIL)
 	touch $@
 
@@ -118,6 +120,7 @@ GFSM_DIR            ?=../gfsm
 #GFSM_CONFIGURE_ARGS ?=
 
 gfsm.autogen_stamp: 
+	(cd $(GFSM_DIR); sh ./svn-prepare.sh) || $(ONFAIL)
 #	(cd $(GFSM_DIR); sh ./autogen.sh) || $(ONFAIL)
 	touch $@
 
@@ -147,6 +150,7 @@ gfsm.cvsclean: gfsm.extclean
 DEQUE_DIR            ?=../deque
 DEQUE_CONFIGURE_ARGS ?=
 deque.autogen_stamp: 
+	(cd $(DEQUE_DIR); sh ./svn-prepare.sh) || $(ONFAIL)
 #	(cd $(DEQUE_DIR); sh ./autogen.sh) || $(ONFAIL)
 	touch $@
 
@@ -178,6 +182,7 @@ LOCALE_DIR            ?=../locale
 #LOCALE_CONFIGURE_ARGS ?=
 
 locale.autogen_stamp: 
+	(cd $(LOCALE_DIR); sh ./svn-prepare.sh) || $(ONFAIL)
 #	(cd $(LOCALE_DIR); sh ./autogen.sh) || $(ONFAIL)
 	touch $@
 
@@ -207,6 +212,7 @@ locale.cvsclean: locale.extclean
 PDSTRING_DIR            ?=../pdstring
 PDSTRING_CONFIGURE_ARGS ?=--enable-object-externals
 pdstring.autogen_stamp: 
+	(cd $(PDSTRING_DIR); sh ./svn-prepare.sh) || $(ONFAIL)
 #	(cd $(PDSTRING_DIR); sh ./autogen.sh) || $(ONFAIL)
 	touch $@
 
@@ -236,6 +242,7 @@ pdstring.cvsclean: pdstring.extclean
 READDIR_DIR            ?=../readdir
 READDIR_CONFIGURE_ARGS ?=
 readdir.autogen_stamp: 
+	(cd $(READDIR_DIR); sh ./svn-prepare.sh) || $(ONFAIL)
 #	(cd $(READDIR_DIR); sh ./autogen.sh) || $(ONFAIL)
 	touch $@
 
@@ -266,6 +273,7 @@ readdir.cvsclean: readdir.extclean
 SPRINKLER_DIR            ?=../sprinkler
 SPRINKLER_CONFIGURE_ARGS ?=
 sprinkler.autogen_stamp: 
+	(cd $(SPRINKLER_DIR); sh ./svn-prepare.sh) || $(ONFAIL)
 #	(cd $(SPRINKLER_DIR); sh ./autogen.sh) || $(ONFAIL)
 	touch $@
 
@@ -295,6 +303,7 @@ sprinkler.cvsclean: sprinkler.extclean
 WEIGHTMAP_DIR            ?=../weightmap
 WEIGHTMAP_CONFIGURE_ARGS ?=
 weightmap.autogen_stamp: 
+	(cd $(WEIGHTMAP_DIR); sh ./svn-prepare.sh) || $(ONFAIL)
 #	(cd $(WEIGHTMAP_DIR); sh ./autogen.sh) || $(ONFAIL)
 	touch $@
 
diff --git a/flite/Makefile.am b/flite/Makefile.am
index 7ec0528..9c4c3c2 100644
--- a/flite/Makefile.am
+++ b/flite/Makefile.am
@@ -9,14 +9,14 @@
 #-----------------------------------------------------------------------
 # Includes
 #-----------------------------------------------------------------------
-include $(top_srcdir)/pdexternal.am
+include $(top_srcdir)/common/pdexternal.am
 
 #-----------------------------------------------------------------------
 # Options & Subdirectories
 #-----------------------------------------------------------------------
 
 ##-- aclocal options (top level only)
-ACLOCAL_AMFLAGS = -I m4 
+ACLOCAL_AMFLAGS = -I common/m4 
 
 ## --- automake options
 #AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip
@@ -38,7 +38,7 @@ pddoc_DATA = flite-help.pd
 #-----------------------------------------------------------------------
 # sources
 #-----------------------------------------------------------------------
-flite_SOURCES = flite.c mooPdUtils.h
+flite_SOURCES = flite.c common/mooPdUtils.h
 
 #-----------------------------------------------------------------------
 # external compilation : flags
diff --git a/flite/Makefile.in b/flite/Makefile.in
index 83e503d..3ed423c 100644
--- a/flite/Makefile.in
+++ b/flite/Makefile.in
@@ -50,11 +50,12 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure $(top_srcdir)/pdexternal.am COPYING
+	$(top_srcdir)/common/pdexternal.am $(top_srcdir)/configure \
+	COPYING
 pdext_PROGRAMS = flite$(EXEEXT)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -258,7 +259,7 @@ MAINTAINERCLEANFILES = *~ \
 #-----------------------------------------------------------------------
 # Options & Subdirectories
 #-----------------------------------------------------------------------
-ACLOCAL_AMFLAGS = -I m4 
+ACLOCAL_AMFLAGS = -I common/m4 
 
 #AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip
 AUTOMAKE_OPTIONS = foreign
@@ -268,7 +269,7 @@ pddoc_DATA = flite-help.pd
 #-----------------------------------------------------------------------
 # sources
 #-----------------------------------------------------------------------
-flite_SOURCES = flite.c mooPdUtils.h
+flite_SOURCES = flite.c common/mooPdUtils.h
 
 #-----------------------------------------------------------------------
 # external compilation : flags
@@ -287,7 +288,7 @@ all: config.h
 .SUFFIXES: .@PDEXT@ .pod .txt .html .c .o .obj
 am--refresh:
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/pdexternal.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/common/pdexternal.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -537,7 +538,7 @@ distclean-tags:
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/m4
+	$(mkdir_p) $(distdir)/common $(distdir)/common/m4
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
diff --git a/flite/README.cvs b/flite/README.cvs
deleted file mode 100644
index 2a0ee0c..0000000
--- a/flite/README.cvs
+++ /dev/null
@@ -1,13 +0,0 @@
-To build from cvs, do the following:
-
- ./autogen.sh
- ./configure
- make
- make install
-
-NOTE:  The README.txt file in the distribution
-is auto-generated from perl ".pod" format by
-the "pod2text" included in most perl distributions.
-
-marmosets,
-	Bryan
diff --git a/flite/README.svn b/flite/README.svn
new file mode 100644
index 0000000..2fc9816
--- /dev/null
+++ b/flite/README.svn
@@ -0,0 +1,21 @@
+To build from subversion sources, do the following:
+
+ ./svn-prepare.sh
+ ./autogen.sh
+ ./configure
+ make
+ make install
+
+You will need recent versions of GNU automake and
+autoconf in order to build from the SVN tree.
+
+The './svn-prepare.sh' script requires some shared code
+in the directory ../common (relative to the package root
+directory).
+
+The README.txt file in the distribution is auto-generated
+from perl ".pod" format by the "pod2text" included in most
+Perl distributions.
+
+marmosets,
+	Bryan
diff --git a/flite/aclocal.m4 b/flite/aclocal.m4
index 4ab8160..0cdbeac 100644
--- a/flite/aclocal.m4
+++ b/flite/aclocal.m4
@@ -889,4 +889,4 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-m4_include([m4/ax_pd_external.m4])
+m4_include([common/m4/ax_pd_external.m4])
diff --git a/flite/config/Makefile.am b/flite/config/Makefile.am
index 81998be..0a340c0 100644
--- a/flite/config/Makefile.am
+++ b/flite/config/Makefile.am
@@ -9,4 +9,4 @@
 #-----------------------------------------------------------------------
 # Includes
 #-----------------------------------------------------------------------
-include $(top_srcdir)/pdexternal.am
+include $(top_srcdir)/common/pdexternal.am
diff --git a/flite/config/Makefile.in b/flite/config/Makefile.in
index 67b4c65..3ce43b3 100644
--- a/flite/config/Makefile.in
+++ b/flite/config/Makefile.in
@@ -39,10 +39,10 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/pdexternal.am depcomp install-sh missing
+	$(top_srcdir)/common/pdexternal.am depcomp install-sh missing
 subdir = config
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -205,7 +205,7 @@ all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .@PDEXT@ .pod .txt .html
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/pdexternal.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/common/pdexternal.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -243,7 +243,7 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/..
+	$(mkdir_p) $(distdir)/../common
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
diff --git a/flite/configure b/flite/configure
index 7ce92e6..fc97465 100755
--- a/flite/configure
+++ b/flite/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for pdflite 0.02-1.
+# Generated by GNU Autoconf 2.61 for pdflite 0.02-2.
 #
 # Report bugs to <moocow@ling.uni-potsdam.de>.
 #
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='pdflite'
 PACKAGE_TARNAME='pdflite'
-PACKAGE_VERSION='0.02-1'
-PACKAGE_STRING='pdflite 0.02-1'
+PACKAGE_VERSION='0.02-2'
+PACKAGE_STRING='pdflite 0.02-2'
 PACKAGE_BUGREPORT='moocow@ling.uni-potsdam.de'
 
 ac_default_prefix=/usr/local
@@ -1194,7 +1194,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures pdflite 0.02-1 to adapt to many kinds of systems.
+\`configure' configures pdflite 0.02-2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1260,7 +1260,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of pdflite 0.02-1:";;
+     short | recursive ) echo "Configuration of pdflite 0.02-2:";;
    esac
   cat <<\_ACEOF
 
@@ -1357,7 +1357,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-pdflite configure 0.02-1
+pdflite configure 0.02-2
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1371,7 +1371,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by pdflite $as_me 0.02-1, which was
+It was created by pdflite $as_me 0.02-2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2054,7 +2054,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=pdflite
- VERSION=0.02-1
+ VERSION=0.02-2
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3494,7 +3494,7 @@ else
 fi
 
  if test -n "$pdincludedir" ; then
-  IFLAGS="$IFLAGS -I$pdincludedir"
+  PDEXT_IFLAGS="$PDEXT_IFLAGS -I$pdincludedir"
  fi
 
 
@@ -3562,7 +3562,7 @@ fi
 
  ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
  ## check: m_pd.h
- CPPFLAGS="$CPPFLAGS $IFLAGS"
+ CPPFLAGS="$CPPFLAGS $PDEXT_IFLAGS"
  { echo "$as_me:$LINENO: checking for m_pd.h" >&5
 echo $ECHO_N "checking for m_pd.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_m_pd_h+set}" = set; then
@@ -4737,7 +4737,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by pdflite $as_me 0.02-1, which was
+This file was extended by pdflite $as_me 0.02-2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4790,7 +4790,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-pdflite config.status 0.02-1
+pdflite config.status 0.02-2
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/flite/configure.ac b/flite/configure.ac
index 4e6ddaf..153813c 100644
--- a/flite/configure.ac
+++ b/flite/configure.ac
@@ -4,13 +4,13 @@ AC_PREREQ(2.5)
 
 dnl Some handy macros
 define([THE_PACKAGE_NAME],    [pdflite])
-define([THE_PACKAGE_VERSION], [0.02-1])
+define([THE_PACKAGE_VERSION], [0.02-2])
 define([THE_PACKAGE_AUTHOR],  [moocow@ling.uni-potsdam.de])
 
 AC_INIT(THE_PACKAGE_NAME, THE_PACKAGE_VERSION, THE_PACKAGE_AUTHOR)
 
 ##-- Additional m4 macros
-AC_CONFIG_MACRO_DIR(m4)
+AC_CONFIG_MACRO_DIR(common/m4)
 
 ##-- source & aux
 AC_CONFIG_AUX_DIR(config)
diff --git a/flite/flite.c b/flite/flite.c
index 3ed798b..119cc36 100644
--- a/flite/flite.c
+++ b/flite/flite.c
@@ -10,7 +10,7 @@
 
 
 #include <m_pd.h>
-#include "mooPdUtils.h"
+#include "common/mooPdUtils.h"
 
 /* black magic */
 #ifdef NT
diff --git a/flite/m4 b/flite/m4
deleted file mode 120000
index 83ffc0c..0000000
--- a/flite/m4
+++ /dev/null
@@ -1 +0,0 @@
-../common/m4
\ No newline at end of file
diff --git a/flite/mooPdUtils.h b/flite/mooPdUtils.h
deleted file mode 120000
index 677b39d..0000000
--- a/flite/mooPdUtils.h
+++ /dev/null
@@ -1 +0,0 @@
-../common/mooPdUtils.h
\ No newline at end of file
diff --git a/flite/pdexternal.am b/flite/pdexternal.am
deleted file mode 120000
index 914f4be..0000000
--- a/flite/pdexternal.am
+++ /dev/null
@@ -1 +0,0 @@
-../common/pdexternal.am
\ No newline at end of file
diff --git a/flite/svn-prepare.sh b/flite/svn-prepare.sh
new file mode 120000
index 0000000..12a9e5b
--- /dev/null
+++ b/flite/svn-prepare.sh
@@ -0,0 +1 @@
+../common/svn-prepare.sh
\ No newline at end of file
diff --git a/gfsm/Makefile.am b/gfsm/Makefile.am
index 8f590b3..0a62ea4 100644
--- a/gfsm/Makefile.am
+++ b/gfsm/Makefile.am
@@ -9,14 +9,14 @@
 #-----------------------------------------------------------------------
 # Includes
 #-----------------------------------------------------------------------
-include $(top_srcdir)/pdexternal.am
+include $(top_srcdir)/common/pdexternal.am
 
 #-----------------------------------------------------------------------
 # Options & Subdirectories
 #-----------------------------------------------------------------------
 
 ##-- aclocal options (top level only)
-ACLOCAL_AMFLAGS = -I m4 
+ACLOCAL_AMFLAGS = -I common/m4
 
 ## --- automake options
 #AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip
diff --git a/gfsm/Makefile.in b/gfsm/Makefile.in
index 739188f..39cd028 100644
--- a/gfsm/Makefile.in
+++ b/gfsm/Makefile.in
@@ -49,11 +49,11 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(top_srcdir)/configure \
-	$(top_srcdir)/pdexternal.am COPYING
+	$(srcdir)/Makefile.in $(top_srcdir)/common/pdexternal.am \
+	$(top_srcdir)/configure COPYING
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -268,7 +268,7 @@ MAINTAINERCLEANFILES = *~ \
 #-----------------------------------------------------------------------
 # Options & Subdirectories
 #-----------------------------------------------------------------------
-ACLOCAL_AMFLAGS = -I m4 
+ACLOCAL_AMFLAGS = -I common/m4
 
 #AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip
 AUTOMAKE_OPTIONS = foreign
@@ -286,7 +286,7 @@ all: all-recursive
 .SUFFIXES: .@PDEXT@ .pod .txt .html
 am--refresh:
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/pdexternal.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/common/pdexternal.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -463,7 +463,7 @@ distclean-tags:
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/m4
+	$(mkdir_p) $(distdir)/common $(distdir)/common/m4
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
diff --git a/gfsm/README.cvs b/gfsm/README.cvs
deleted file mode 100644
index 2a0ee0c..0000000
--- a/gfsm/README.cvs
+++ /dev/null
@@ -1,13 +0,0 @@
-To build from cvs, do the following:
-
- ./autogen.sh
- ./configure
- make
- make install
-
-NOTE:  The README.txt file in the distribution
-is auto-generated from perl ".pod" format by
-the "pod2text" included in most perl distributions.
-
-marmosets,
-	Bryan
diff --git a/gfsm/README.svn b/gfsm/README.svn
new file mode 100644
index 0000000..2fc9816
--- /dev/null
+++ b/gfsm/README.svn
@@ -0,0 +1,21 @@
+To build from subversion sources, do the following:
+
+ ./svn-prepare.sh
+ ./autogen.sh
+ ./configure
+ make
+ make install
+
+You will need recent versions of GNU automake and
+autoconf in order to build from the SVN tree.
+
+The './svn-prepare.sh' script requires some shared code
+in the directory ../common (relative to the package root
+directory).
+
+The README.txt file in the distribution is auto-generated
+from perl ".pod" format by the "pod2text" included in most
+Perl distributions.
+
+marmosets,
+	Bryan
diff --git a/gfsm/aclocal.m4 b/gfsm/aclocal.m4
index a5516e1..0273319 100644
--- a/gfsm/aclocal.m4
+++ b/gfsm/aclocal.m4
@@ -7416,4 +7416,4 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-m4_include([m4/ax_pd_external.m4])
+m4_include([common/m4/ax_pd_external.m4])
diff --git a/gfsm/config/Makefile.am b/gfsm/config/Makefile.am
index cd4d337..0fd8484 100644
--- a/gfsm/config/Makefile.am
+++ b/gfsm/config/Makefile.am
@@ -9,4 +9,4 @@
 #-----------------------------------------------------------------------
 # Includes
 #-----------------------------------------------------------------------
-include $(top_srcdir)/pdexternal.am
+include $(top_srcdir)/common/pdexternal.am
diff --git a/gfsm/config/Makefile.in b/gfsm/config/Makefile.in
index f45de05..a2f2e1d 100644
--- a/gfsm/config/Makefile.in
+++ b/gfsm/config/Makefile.in
@@ -41,11 +41,11 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/pdexternal.am config.guess config.sub depcomp \
-	install-sh ltmain.sh missing
+	$(top_srcdir)/common/pdexternal.am config.guess config.sub \
+	depcomp install-sh ltmain.sh missing
 subdir = config
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -235,7 +235,7 @@ all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .@PDEXT@ .pod .txt .html
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/pdexternal.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/common/pdexternal.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -282,7 +282,7 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/..
+	$(mkdir_p) $(distdir)/../common
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
diff --git a/gfsm/configure b/gfsm/configure
index f6922d3..ef88f9f 100755
--- a/gfsm/configure
+++ b/gfsm/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for pd-gfsm 0.05-1.
+# Generated by GNU Autoconf 2.61 for pd-gfsm 0.05-2.
 #
 # Report bugs to <moocow@ling.uni-potsdam.de>.
 #
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='pd-gfsm'
 PACKAGE_TARNAME='pd-gfsm'
-PACKAGE_VERSION='0.05-1'
-PACKAGE_STRING='pd-gfsm 0.05-1'
+PACKAGE_VERSION='0.05-2'
+PACKAGE_STRING='pd-gfsm 0.05-2'
 PACKAGE_BUGREPORT='moocow@ling.uni-potsdam.de'
 
 ac_default_prefix=/usr/local
@@ -1422,7 +1422,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures pd-gfsm 0.05-1 to adapt to many kinds of systems.
+\`configure' configures pd-gfsm 0.05-2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1492,7 +1492,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of pd-gfsm 0.05-1:";;
+     short | recursive ) echo "Configuration of pd-gfsm 0.05-2:";;
    esac
   cat <<\_ACEOF
 
@@ -1614,7 +1614,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-pd-gfsm configure 0.05-1
+pd-gfsm configure 0.05-2
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1628,7 +1628,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by pd-gfsm $as_me 0.05-1, which was
+It was created by pd-gfsm $as_me 0.05-2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2310,7 +2310,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=pd-gfsm
- VERSION=0.05-1
+ VERSION=0.05-2
 
 
 cat >>confdefs.h <<_ACEOF
@@ -20149,7 +20149,7 @@ else
 fi
 
  if test -n "$pdincludedir" ; then
-  IFLAGS="$IFLAGS -I$pdincludedir"
+  PDEXT_IFLAGS="$PDEXT_IFLAGS -I$pdincludedir"
  fi
 
 
@@ -20217,7 +20217,7 @@ fi
 
  ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
  ## check: m_pd.h
- CPPFLAGS="$CPPFLAGS $IFLAGS"
+ CPPFLAGS="$CPPFLAGS $PDEXT_IFLAGS"
  { echo "$as_me:$LINENO: checking for m_pd.h" >&5
 echo $ECHO_N "checking for m_pd.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_m_pd_h+set}" = set; then
@@ -21249,7 +21249,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by pd-gfsm $as_me 0.05-1, which was
+This file was extended by pd-gfsm $as_me 0.05-2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21302,7 +21302,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-pd-gfsm config.status 0.05-1
+pd-gfsm config.status 0.05-2
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/gfsm/configure.ac b/gfsm/configure.ac
index dfd380e..fc48396 100644
--- a/gfsm/configure.ac
+++ b/gfsm/configure.ac
@@ -4,13 +4,13 @@ AC_PREREQ(2.5)
 
 dnl Some handy macros
 define([THE_PACKAGE_NAME],    [pd-gfsm])
-define([THE_PACKAGE_VERSION], [0.05-1])
+define([THE_PACKAGE_VERSION], [0.05-2])
 define([THE_PACKAGE_AUTHOR],  [moocow@ling.uni-potsdam.de])
 
 AC_INIT(THE_PACKAGE_NAME, THE_PACKAGE_VERSION, THE_PACKAGE_AUTHOR)
 
 ##-- Additional m4 macros
-AC_CONFIG_MACRO_DIR(m4)
+AC_CONFIG_MACRO_DIR(common/m4)
 
 ##-- source & aux
 AC_CONFIG_AUX_DIR(config)
diff --git a/gfsm/m4 b/gfsm/m4
deleted file mode 120000
index 83ffc0c..0000000
--- a/gfsm/m4
+++ /dev/null
@@ -1 +0,0 @@
-../common/m4
\ No newline at end of file
diff --git a/gfsm/pdexternal.am b/gfsm/pdexternal.am
deleted file mode 120000
index 914f4be..0000000
--- a/gfsm/pdexternal.am
+++ /dev/null
@@ -1 +0,0 @@
-../common/pdexternal.am
\ No newline at end of file
diff --git a/gfsm/src/Makefile.am b/gfsm/src/Makefile.am
index 3b18b75..5d0ef26 100644
--- a/gfsm/src/Makefile.am
+++ b/gfsm/src/Makefile.am
@@ -9,7 +9,7 @@
 #-----------------------------------------------------------------------
 # Includes
 #-----------------------------------------------------------------------
-include $(top_srcdir)/pdexternal.am
+include $(top_srcdir)/common/pdexternal.am
 
 #-----------------------------------------------------------------------
 # Options & Subdirectories
diff --git a/gfsm/src/Makefile.in b/gfsm/src/Makefile.in
index a4194a6..c03ed6c 100644
--- a/gfsm/src/Makefile.in
+++ b/gfsm/src/Makefile.in
@@ -51,11 +51,11 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/config.h.in $(top_srcdir)/pdexternal.am
+	$(srcdir)/config.h.in $(top_srcdir)/common/pdexternal.am
 pdexterns_PROGRAMS = gfsm$(EXEEXT)
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -306,7 +306,7 @@ all: config.h
 
 .SUFFIXES:
 .SUFFIXES: .@PDEXT@ .pod .txt .html .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/pdexternal.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/common/pdexternal.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -512,7 +512,7 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/..
+	$(mkdir_p) $(distdir)/../common
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
diff --git a/gfsm/svn-prepare.sh b/gfsm/svn-prepare.sh
new file mode 120000
index 0000000..12a9e5b
--- /dev/null
+++ b/gfsm/svn-prepare.sh
@@ -0,0 +1 @@
+../common/svn-prepare.sh
\ No newline at end of file
diff --git a/hello/configure.ac b/hello/configure.ac
index 427e3a7..da37a34 100644
--- a/hello/configure.ac
+++ b/hello/configure.ac
@@ -10,7 +10,7 @@ define([THE_PACKAGE_AUTHOR],  [moocow@ling.uni-potsdam.de])
 AC_INIT(THE_PACKAGE_NAME, THE_PACKAGE_VERSION, THE_PACKAGE_AUTHOR)
 
 ##-- Additional m4 macros
-AC_CONFIG_MACRO_DIR(m4)
+AC_CONFIG_MACRO_DIR(common/m4)
 
 ##-- source & aux
 AC_CONFIG_AUX_DIR(.)
diff --git a/locale/Makefile.am b/locale/Makefile.am
index 78455e1..edc05ad 100644
--- a/locale/Makefile.am
+++ b/locale/Makefile.am
@@ -9,14 +9,14 @@
 #-----------------------------------------------------------------------
 # Includes
 #-----------------------------------------------------------------------
-include $(top_srcdir)/pdexternal.am
+include $(top_srcdir)/common/pdexternal.am
 
 #-----------------------------------------------------------------------
 # Options & Subdirectories
 #-----------------------------------------------------------------------
 
 ##-- aclocal options (top level only)
-ACLOCAL_AMFLAGS = -I m4 
+ACLOCAL_AMFLAGS = -I common/m4 
 
 ## --- automake options
 #AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip
diff --git a/locale/Makefile.in b/locale/Makefile.in
index 57233b0..7302019 100644
--- a/locale/Makefile.in
+++ b/locale/Makefile.in
@@ -47,11 +47,11 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(top_srcdir)/configure \
-	$(top_srcdir)/pdexternal.am COPYING
+	$(srcdir)/Makefile.in $(top_srcdir)/common/pdexternal.am \
+	$(top_srcdir)/configure COPYING
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -234,7 +234,7 @@ MAINTAINERCLEANFILES = *~ \
 #-----------------------------------------------------------------------
 # Options & Subdirectories
 #-----------------------------------------------------------------------
-ACLOCAL_AMFLAGS = -I m4 
+ACLOCAL_AMFLAGS = -I common/m4 
 
 #AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip
 AUTOMAKE_OPTIONS = foreign
@@ -250,7 +250,7 @@ all: all-recursive
 .SUFFIXES: .@PDEXT@ .pod .txt .html
 am--refresh:
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/pdexternal.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/common/pdexternal.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -418,7 +418,7 @@ distclean-tags:
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/m4
+	$(mkdir_p) $(distdir)/common $(distdir)/common/m4
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
diff --git a/locale/README.cvs b/locale/README.cvs
deleted file mode 100644
index 2a0ee0c..0000000
--- a/locale/README.cvs
+++ /dev/null
@@ -1,13 +0,0 @@
-To build from cvs, do the following:
-
- ./autogen.sh
- ./configure
- make
- make install
-
-NOTE:  The README.txt file in the distribution
-is auto-generated from perl ".pod" format by
-the "pod2text" included in most perl distributions.
-
-marmosets,
-	Bryan
diff --git a/locale/README.svn b/locale/README.svn
new file mode 100644
index 0000000..2fc9816
--- /dev/null
+++ b/locale/README.svn
@@ -0,0 +1,21 @@
+To build from subversion sources, do the following:
+
+ ./svn-prepare.sh
+ ./autogen.sh
+ ./configure
+ make
+ make install
+
+You will need recent versions of GNU automake and
+autoconf in order to build from the SVN tree.
+
+The './svn-prepare.sh' script requires some shared code
+in the directory ../common (relative to the package root
+directory).
+
+The README.txt file in the distribution is auto-generated
+from perl ".pod" format by the "pod2text" included in most
+Perl distributions.
+
+marmosets,
+	Bryan
diff --git a/locale/aclocal.m4 b/locale/aclocal.m4
index 4ab8160..0cdbeac 100644
--- a/locale/aclocal.m4
+++ b/locale/aclocal.m4
@@ -889,4 +889,4 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-m4_include([m4/ax_pd_external.m4])
+m4_include([common/m4/ax_pd_external.m4])
diff --git a/locale/config/Makefile.am b/locale/config/Makefile.am
index cfe9dde..b50e3f2 100644
--- a/locale/config/Makefile.am
+++ b/locale/config/Makefile.am
@@ -4,4 +4,4 @@
 ##   + automake file for 'config' package-subdir
 ##-----------------------------------------------------------------------
 
-include $(top_srcdir)/pdexternal.am
+include $(top_srcdir)/common/pdexternal.am
diff --git a/locale/config/Makefile.in b/locale/config/Makefile.in
index 6e134f2..f9f72f8 100644
--- a/locale/config/Makefile.in
+++ b/locale/config/Makefile.in
@@ -39,10 +39,10 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/pdexternal.am depcomp install-sh missing
+	$(top_srcdir)/common/pdexternal.am depcomp install-sh missing
 subdir = config
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -200,7 +200,7 @@ all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .@PDEXT@ .pod .txt .html
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/pdexternal.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/common/pdexternal.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -238,7 +238,7 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/..
+	$(mkdir_p) $(distdir)/../common
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
diff --git a/locale/configure b/locale/configure
index 7a2b32e..157487a 100755
--- a/locale/configure
+++ b/locale/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for locale 0.02.
+# Generated by GNU Autoconf 2.61 for locale 0.02-1.
 #
 # Report bugs to <moocow@ling.uni-potsdam.de>.
 #
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='locale'
 PACKAGE_TARNAME='locale'
-PACKAGE_VERSION='0.02'
-PACKAGE_STRING='locale 0.02'
+PACKAGE_VERSION='0.02-1'
+PACKAGE_STRING='locale 0.02-1'
 PACKAGE_BUGREPORT='moocow@ling.uni-potsdam.de'
 
 ac_default_prefix=/usr/local
@@ -1189,7 +1189,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures locale 0.02 to adapt to many kinds of systems.
+\`configure' configures locale 0.02-1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1255,7 +1255,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of locale 0.02:";;
+     short | recursive ) echo "Configuration of locale 0.02-1:";;
    esac
   cat <<\_ACEOF
 
@@ -1351,7 +1351,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-locale configure 0.02
+locale configure 0.02-1
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1365,7 +1365,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by locale $as_me 0.02, which was
+It was created by locale $as_me 0.02-1, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2047,7 +2047,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=locale
- VERSION=0.02
+ VERSION=0.02-1
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3489,7 +3489,7 @@ else
 fi
 
  if test -n "$pdincludedir" ; then
-  IFLAGS="$IFLAGS -I$pdincludedir"
+  PDEXT_IFLAGS="$PDEXT_IFLAGS -I$pdincludedir"
  fi
 
 
@@ -3557,7 +3557,7 @@ fi
 
  ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
  ## check: m_pd.h
- CPPFLAGS="$CPPFLAGS $IFLAGS"
+ CPPFLAGS="$CPPFLAGS $PDEXT_IFLAGS"
  { echo "$as_me:$LINENO: checking for m_pd.h" >&5
 echo $ECHO_N "checking for m_pd.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_m_pd_h+set}" = set; then
@@ -5199,7 +5199,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by locale $as_me 0.02, which was
+This file was extended by locale $as_me 0.02-1, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5252,7 +5252,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-locale config.status 0.02
+locale config.status 0.02-1
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/locale/configure.ac b/locale/configure.ac
index 1cf1beb..a112a46 100644
--- a/locale/configure.ac
+++ b/locale/configure.ac
@@ -4,7 +4,7 @@ AC_PREREQ(2.5)
 
 dnl Some handy macros
 define([THE_PACKAGE_NAME],    [locale])
-define([THE_PACKAGE_VERSION], [0.02])
+define([THE_PACKAGE_VERSION], [0.02-1])
 define([THE_PACKAGE_AUTHOR],  [moocow@ling.uni-potsdam.de])
 
 AC_INIT(THE_PACKAGE_NAME, THE_PACKAGE_VERSION, THE_PACKAGE_AUTHOR)
diff --git a/locale/m4 b/locale/m4
deleted file mode 120000
index 83ffc0c..0000000
--- a/locale/m4
+++ /dev/null
@@ -1 +0,0 @@
-../common/m4
\ No newline at end of file
diff --git a/locale/pdexternal.am b/locale/pdexternal.am
deleted file mode 120000
index 914f4be..0000000
--- a/locale/pdexternal.am
+++ /dev/null
@@ -1 +0,0 @@
-../common/pdexternal.am
\ No newline at end of file
diff --git a/locale/src/Makefile.am b/locale/src/Makefile.am
index 3c5829e..57161b4 100644
--- a/locale/src/Makefile.am
+++ b/locale/src/Makefile.am
@@ -7,7 +7,7 @@
 #-----------------------------------------------------------------------
 # Includes
 #-----------------------------------------------------------------------
-include $(top_srcdir)/pdexternal.am
+include $(top_srcdir)/common/pdexternal.am
 
 #-----------------------------------------------------------------------
 # pd externals (hacked _PROGRAMS target)
diff --git a/locale/src/Makefile.in b/locale/src/Makefile.in
index ed878f8..42eea8e 100644
--- a/locale/src/Makefile.in
+++ b/locale/src/Makefile.in
@@ -47,12 +47,12 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/config.h.in $(top_srcdir)/pdexternal.am
+	$(srcdir)/config.h.in $(top_srcdir)/common/pdexternal.am
 pdexterns_PROGRAMS = locale$(EXEEXT) uselocale$(EXEEXT)
 EXTRA_PROGRAMS = locale$(EXEEXT) uselocale$(EXEEXT)
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -247,7 +247,7 @@ all: config.h
 
 .SUFFIXES:
 .SUFFIXES: .@PDEXT@ .pod .txt .html .c .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/pdexternal.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/common/pdexternal.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -430,7 +430,7 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/..
+	$(mkdir_p) $(distdir)/../common
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
diff --git a/locale/svn-prepare.sh b/locale/svn-prepare.sh
new file mode 120000
index 0000000..12a9e5b
--- /dev/null
+++ b/locale/svn-prepare.sh
@@ -0,0 +1 @@
+../common/svn-prepare.sh
\ No newline at end of file
diff --git a/readdir/Makefile.am b/readdir/Makefile.am
index cdf1a87..be7a3f3 100644
--- a/readdir/Makefile.am
+++ b/readdir/Makefile.am
@@ -9,14 +9,14 @@
 #-----------------------------------------------------------------------
 # Includes
 #-----------------------------------------------------------------------
-include $(top_srcdir)/pdexternal.am
+include $(top_srcdir)/common/pdexternal.am
 
 ##-----------------------------------------------------------------------
 ## Options & Subdirectories
 #-----------------------------------------------------------------------
 
 ##-- aclocal options (top level only)
-ACLOCAL_AMFLAGS = -I m4 
+ACLOCAL_AMFLAGS = -I common/m4
 
 ## --- automake options (top level only)
 #AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip
diff --git a/readdir/Makefile.in b/readdir/Makefile.in
index 0376c0e..0257032 100644
--- a/readdir/Makefile.in
+++ b/readdir/Makefile.in
@@ -47,11 +47,11 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(top_srcdir)/configure \
-	$(top_srcdir)/pdexternal.am COPYING depcomp install-sh missing
+	$(srcdir)/Makefile.in $(top_srcdir)/common/pdexternal.am \
+	$(top_srcdir)/configure COPYING depcomp install-sh missing
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -232,7 +232,7 @@ MAINTAINERCLEANFILES = *~ \
 #-----------------------------------------------------------------------
 
 #-----------------------------------------------------------------------
-ACLOCAL_AMFLAGS = -I m4 
+ACLOCAL_AMFLAGS = -I common/m4
 
 #AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip
 AUTOMAKE_OPTIONS = foreign
@@ -248,7 +248,7 @@ all: all-recursive
 .SUFFIXES: .@PDEXT@ .pod .txt .html
 am--refresh:
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/pdexternal.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/common/pdexternal.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -416,7 +416,7 @@ distclean-tags:
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/m4
+	$(mkdir_p) $(distdir)/common $(distdir)/common/m4
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
diff --git a/readdir/README.cvs b/readdir/README.cvs
deleted file mode 100644
index 2a0ee0c..0000000
--- a/readdir/README.cvs
+++ /dev/null
@@ -1,13 +0,0 @@
-To build from cvs, do the following:
-
- ./autogen.sh
- ./configure
- make
- make install
-
-NOTE:  The README.txt file in the distribution
-is auto-generated from perl ".pod" format by
-the "pod2text" included in most perl distributions.
-
-marmosets,
-	Bryan
diff --git a/readdir/README.svn b/readdir/README.svn
new file mode 100644
index 0000000..2fc9816
--- /dev/null
+++ b/readdir/README.svn
@@ -0,0 +1,21 @@
+To build from subversion sources, do the following:
+
+ ./svn-prepare.sh
+ ./autogen.sh
+ ./configure
+ make
+ make install
+
+You will need recent versions of GNU automake and
+autoconf in order to build from the SVN tree.
+
+The './svn-prepare.sh' script requires some shared code
+in the directory ../common (relative to the package root
+directory).
+
+The README.txt file in the distribution is auto-generated
+from perl ".pod" format by the "pod2text" included in most
+Perl distributions.
+
+marmosets,
+	Bryan
diff --git a/readdir/aclocal.m4 b/readdir/aclocal.m4
index 4ab8160..0cdbeac 100644
--- a/readdir/aclocal.m4
+++ b/readdir/aclocal.m4
@@ -889,4 +889,4 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-m4_include([m4/ax_pd_external.m4])
+m4_include([common/m4/ax_pd_external.m4])
diff --git a/readdir/configure b/readdir/configure
index 4f94c65..5a14294 100755
--- a/readdir/configure
+++ b/readdir/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for readdir 0.02-1.
+# Generated by GNU Autoconf 2.61 for readdir 0.02-2.
 #
 # Report bugs to <moocow@ling.uni-potsdam.de>.
 #
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='readdir'
 PACKAGE_TARNAME='readdir'
-PACKAGE_VERSION='0.02-1'
-PACKAGE_STRING='readdir 0.02-1'
+PACKAGE_VERSION='0.02-2'
+PACKAGE_STRING='readdir 0.02-2'
 PACKAGE_BUGREPORT='moocow@ling.uni-potsdam.de'
 
 ac_default_prefix=/usr/local
@@ -1189,7 +1189,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures readdir 0.02-1 to adapt to many kinds of systems.
+\`configure' configures readdir 0.02-2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1255,7 +1255,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of readdir 0.02-1:";;
+     short | recursive ) echo "Configuration of readdir 0.02-2:";;
    esac
   cat <<\_ACEOF
 
@@ -1351,7 +1351,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-readdir configure 0.02-1
+readdir configure 0.02-2
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1365,7 +1365,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by readdir $as_me 0.02-1, which was
+It was created by readdir $as_me 0.02-2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2047,7 +2047,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=readdir
- VERSION=0.02-1
+ VERSION=0.02-2
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3489,7 +3489,7 @@ else
 fi
 
  if test -n "$pdincludedir" ; then
-  IFLAGS="$IFLAGS -I$pdincludedir"
+  PDEXT_IFLAGS="$PDEXT_IFLAGS -I$pdincludedir"
  fi
 
 
@@ -3557,7 +3557,7 @@ fi
 
  ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
  ## check: m_pd.h
- CPPFLAGS="$CPPFLAGS $IFLAGS"
+ CPPFLAGS="$CPPFLAGS $PDEXT_IFLAGS"
  { echo "$as_me:$LINENO: checking for m_pd.h" >&5
 echo $ECHO_N "checking for m_pd.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_m_pd_h+set}" = set; then
@@ -4317,7 +4317,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by readdir $as_me 0.02-1, which was
+This file was extended by readdir $as_me 0.02-2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4370,7 +4370,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-readdir config.status 0.02-1
+readdir config.status 0.02-2
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/readdir/configure.ac b/readdir/configure.ac
index 3e6b0ab..d8f2b5b 100644
--- a/readdir/configure.ac
+++ b/readdir/configure.ac
@@ -4,13 +4,13 @@ AC_PREREQ(2.5)
 
 dnl Some handy macros
 define([THE_PACKAGE_NAME],    [readdir])
-define([THE_PACKAGE_VERSION], [0.02-1])
+define([THE_PACKAGE_VERSION], [0.02-2])
 define([THE_PACKAGE_AUTHOR],  [moocow@ling.uni-potsdam.de])
 
 AC_INIT(THE_PACKAGE_NAME, THE_PACKAGE_VERSION, THE_PACKAGE_AUTHOR)
 
 ##-- Additional m4 macros
-AC_CONFIG_MACRO_DIR(m4)
+AC_CONFIG_MACRO_DIR(common/m4)
 
 ##-- source & aux
 dnl AC_CONFIG_AUX_DIR(config)
diff --git a/readdir/m4 b/readdir/m4
deleted file mode 120000
index 83ffc0c..0000000
--- a/readdir/m4
+++ /dev/null
@@ -1 +0,0 @@
-../common/m4
\ No newline at end of file
diff --git a/readdir/pdexternal.am b/readdir/pdexternal.am
deleted file mode 120000
index 914f4be..0000000
--- a/readdir/pdexternal.am
+++ /dev/null
@@ -1 +0,0 @@
-../common/pdexternal.am
\ No newline at end of file
diff --git a/readdir/src/Makefile.am b/readdir/src/Makefile.am
index e4d0bb2..32297ea 100644
--- a/readdir/src/Makefile.am
+++ b/readdir/src/Makefile.am
@@ -7,7 +7,7 @@
 #-----------------------------------------------------------------------
 # Includes
 #-----------------------------------------------------------------------
-include $(top_srcdir)/pdexternal.am
+include $(top_srcdir)/common/pdexternal.am
 
 #-----------------------------------------------------------------------
 # pd externals (hacked _PROGRAMS target)
diff --git a/readdir/src/Makefile.in b/readdir/src/Makefile.in
index b44496d..3d27751 100644
--- a/readdir/src/Makefile.in
+++ b/readdir/src/Makefile.in
@@ -47,12 +47,12 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/config.h.in $(top_srcdir)/pdexternal.am
+	$(srcdir)/config.h.in $(top_srcdir)/common/pdexternal.am
 pdexterns_PROGRAMS = readdir$(EXEEXT)
 EXTRA_PROGRAMS = readdir$(EXEEXT)
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -243,7 +243,7 @@ all: config.h
 
 .SUFFIXES:
 .SUFFIXES: .@PDEXT@ .pod .txt .html .c .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/pdexternal.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/common/pdexternal.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -422,7 +422,7 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/..
+	$(mkdir_p) $(distdir)/../common
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
diff --git a/readdir/svn-prepare.sh b/readdir/svn-prepare.sh
new file mode 120000
index 0000000..12a9e5b
--- /dev/null
+++ b/readdir/svn-prepare.sh
@@ -0,0 +1 @@
+../common/svn-prepare.sh
\ No newline at end of file
diff --git a/sprinkler/Makefile.am b/sprinkler/Makefile.am
index 73dce37..cb492e9 100644
--- a/sprinkler/Makefile.am
+++ b/sprinkler/Makefile.am
@@ -9,14 +9,14 @@
 #-----------------------------------------------------------------------
 # Includes
 #-----------------------------------------------------------------------
-include $(top_srcdir)/pdexternal.am
+include $(top_srcdir)/common/pdexternal.am
 
 #-----------------------------------------------------------------------
 # Options & Subdirectories
 #-----------------------------------------------------------------------
 
 ##-- aclocal options (top level only)
-ACLOCAL_AMFLAGS = -I m4 
+ACLOCAL_AMFLAGS = -I common/m4
 
 ## --- automake options
 #AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip
@@ -53,4 +53,6 @@ pddoc_DATA = sprinkler-help.pd
 # sources
 #-----------------------------------------------------------------------
 
-sprinkler_SOURCES = sprinkler.c mooPdUtils.h
+sprinkler_SOURCES = sprinkler.c common/mooPdUtils.h
+
+AM_CPPFLAGS = -I$(top_srcdir)/common
diff --git a/sprinkler/Makefile.in b/sprinkler/Makefile.in
index 8593979..21b860d 100644
--- a/sprinkler/Makefile.in
+++ b/sprinkler/Makefile.in
@@ -50,13 +50,14 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(srcdir)/sprinkler-help.pd.in $(top_srcdir)/configure \
-	$(top_srcdir)/pdexternal.am COPYING depcomp install-sh missing
+	$(srcdir)/sprinkler-help.pd.in \
+	$(top_srcdir)/common/pdexternal.am $(top_srcdir)/configure \
+	COPYING depcomp install-sh missing
 pdexterns_PROGRAMS = sprinkler$(EXEEXT)
 EXTRA_PROGRAMS = sprinkler$(EXEEXT)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -259,7 +260,7 @@ MAINTAINERCLEANFILES = *~ \
 #-----------------------------------------------------------------------
 # Options & Subdirectories
 #-----------------------------------------------------------------------
-ACLOCAL_AMFLAGS = -I m4 
+ACLOCAL_AMFLAGS = -I common/m4
 
 #AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip
 AUTOMAKE_OPTIONS = foreign
@@ -276,7 +277,8 @@ pddoc_DATA = sprinkler-help.pd
 #-----------------------------------------------------------------------
 # sources
 #-----------------------------------------------------------------------
-sprinkler_SOURCES = sprinkler.c mooPdUtils.h
+sprinkler_SOURCES = sprinkler.c common/mooPdUtils.h
+AM_CPPFLAGS = -I$(top_srcdir)/common
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -284,7 +286,7 @@ all: config.h
 .SUFFIXES: .@PDEXT@ .pod .txt .html .c .o .obj
 am--refresh:
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/pdexternal.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/common/pdexternal.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -469,7 +471,7 @@ distclean-tags:
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/. $(distdir)/m4
+	$(mkdir_p) $(distdir)/. $(distdir)/common $(distdir)/common/m4
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
diff --git a/sprinkler/README.cvs b/sprinkler/README.cvs
deleted file mode 100644
index 2a0ee0c..0000000
--- a/sprinkler/README.cvs
+++ /dev/null
@@ -1,13 +0,0 @@
-To build from cvs, do the following:
-
- ./autogen.sh
- ./configure
- make
- make install
-
-NOTE:  The README.txt file in the distribution
-is auto-generated from perl ".pod" format by
-the "pod2text" included in most perl distributions.
-
-marmosets,
-	Bryan
diff --git a/sprinkler/README.svn b/sprinkler/README.svn
new file mode 100644
index 0000000..2fc9816
--- /dev/null
+++ b/sprinkler/README.svn
@@ -0,0 +1,21 @@
+To build from subversion sources, do the following:
+
+ ./svn-prepare.sh
+ ./autogen.sh
+ ./configure
+ make
+ make install
+
+You will need recent versions of GNU automake and
+autoconf in order to build from the SVN tree.
+
+The './svn-prepare.sh' script requires some shared code
+in the directory ../common (relative to the package root
+directory).
+
+The README.txt file in the distribution is auto-generated
+from perl ".pod" format by the "pod2text" included in most
+Perl distributions.
+
+marmosets,
+	Bryan
diff --git a/sprinkler/aclocal.m4 b/sprinkler/aclocal.m4
index 4ab8160..0cdbeac 100644
--- a/sprinkler/aclocal.m4
+++ b/sprinkler/aclocal.m4
@@ -889,4 +889,4 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-m4_include([m4/ax_pd_external.m4])
+m4_include([common/m4/ax_pd_external.m4])
diff --git a/sprinkler/configure b/sprinkler/configure
index c6941f4..aeda9f0 100755
--- a/sprinkler/configure
+++ b/sprinkler/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for sprinkler 0.06-1.
+# Generated by GNU Autoconf 2.61 for sprinkler 0.06-2.
 #
 # Report bugs to <moocow@ling.uni-potsdam.de>.
 #
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='sprinkler'
 PACKAGE_TARNAME='sprinkler'
-PACKAGE_VERSION='0.06-1'
-PACKAGE_STRING='sprinkler 0.06-1'
+PACKAGE_VERSION='0.06-2'
+PACKAGE_STRING='sprinkler 0.06-2'
 PACKAGE_BUGREPORT='moocow@ling.uni-potsdam.de'
 
 ac_default_prefix=/usr/local
@@ -1193,7 +1193,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures sprinkler 0.06-1 to adapt to many kinds of systems.
+\`configure' configures sprinkler 0.06-2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1259,7 +1259,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sprinkler 0.06-1:";;
+     short | recursive ) echo "Configuration of sprinkler 0.06-2:";;
    esac
   cat <<\_ACEOF
 
@@ -1359,7 +1359,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-sprinkler configure 0.06-1
+sprinkler configure 0.06-2
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1373,7 +1373,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by sprinkler $as_me 0.06-1, which was
+It was created by sprinkler $as_me 0.06-2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2055,7 +2055,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=sprinkler
- VERSION=0.06-1
+ VERSION=0.06-2
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3497,7 +3497,7 @@ else
 fi
 
  if test -n "$pdincludedir" ; then
-  IFLAGS="$IFLAGS -I$pdincludedir"
+  PDEXT_IFLAGS="$PDEXT_IFLAGS -I$pdincludedir"
  fi
 
 
@@ -3565,7 +3565,7 @@ fi
 
  ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
  ## check: m_pd.h
- CPPFLAGS="$CPPFLAGS $IFLAGS"
+ CPPFLAGS="$CPPFLAGS $PDEXT_IFLAGS"
  { echo "$as_me:$LINENO: checking for m_pd.h" >&5
 echo $ECHO_N "checking for m_pd.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_m_pd_h+set}" = set; then
@@ -4314,7 +4314,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by sprinkler $as_me 0.06-1, which was
+This file was extended by sprinkler $as_me 0.06-2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4367,7 +4367,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-sprinkler config.status 0.06-1
+sprinkler config.status 0.06-2
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/sprinkler/configure.ac b/sprinkler/configure.ac
index ef41fa7..c26abc3 100644
--- a/sprinkler/configure.ac
+++ b/sprinkler/configure.ac
@@ -4,13 +4,13 @@ AC_PREREQ(2.5)
 
 dnl Some handy macros
 define([THE_PACKAGE_NAME],    [sprinkler])
-define([THE_PACKAGE_VERSION], [0.06-1])
+define([THE_PACKAGE_VERSION], [0.06-2])
 define([THE_PACKAGE_AUTHOR],  [moocow@ling.uni-potsdam.de])
 
 AC_INIT(THE_PACKAGE_NAME, THE_PACKAGE_VERSION, THE_PACKAGE_AUTHOR)
 
 ##-- Additional m4 macros
-AC_CONFIG_MACRO_DIR(m4)
+AC_CONFIG_MACRO_DIR(common/m4)
 
 ##-- source & aux
 dnl AC_CONFIG_AUX_DIR(config)
diff --git a/sprinkler/m4 b/sprinkler/m4
deleted file mode 120000
index 83ffc0c..0000000
--- a/sprinkler/m4
+++ /dev/null
@@ -1 +0,0 @@
-../common/m4
\ No newline at end of file
diff --git a/sprinkler/mooPdUtils.h b/sprinkler/mooPdUtils.h
deleted file mode 120000
index 677b39d..0000000
--- a/sprinkler/mooPdUtils.h
+++ /dev/null
@@ -1 +0,0 @@
-../common/mooPdUtils.h
\ No newline at end of file
diff --git a/sprinkler/pdexternal.am b/sprinkler/pdexternal.am
deleted file mode 120000
index 914f4be..0000000
--- a/sprinkler/pdexternal.am
+++ /dev/null
@@ -1 +0,0 @@
-../common/pdexternal.am
\ No newline at end of file
diff --git a/sprinkler/svn-prepare.sh b/sprinkler/svn-prepare.sh
new file mode 120000
index 0000000..12a9e5b
--- /dev/null
+++ b/sprinkler/svn-prepare.sh
@@ -0,0 +1 @@
+../common/svn-prepare.sh
\ No newline at end of file
diff --git a/weightmap/Makefile.am b/weightmap/Makefile.am
index cdf1a87..be7a3f3 100644
--- a/weightmap/Makefile.am
+++ b/weightmap/Makefile.am
@@ -9,14 +9,14 @@
 #-----------------------------------------------------------------------
 # Includes
 #-----------------------------------------------------------------------
-include $(top_srcdir)/pdexternal.am
+include $(top_srcdir)/common/pdexternal.am
 
 ##-----------------------------------------------------------------------
 ## Options & Subdirectories
 #-----------------------------------------------------------------------
 
 ##-- aclocal options (top level only)
-ACLOCAL_AMFLAGS = -I m4 
+ACLOCAL_AMFLAGS = -I common/m4
 
 ## --- automake options (top level only)
 #AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip
diff --git a/weightmap/Makefile.in b/weightmap/Makefile.in
index 0376c0e..0257032 100644
--- a/weightmap/Makefile.in
+++ b/weightmap/Makefile.in
@@ -47,11 +47,11 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(top_srcdir)/configure \
-	$(top_srcdir)/pdexternal.am COPYING depcomp install-sh missing
+	$(srcdir)/Makefile.in $(top_srcdir)/common/pdexternal.am \
+	$(top_srcdir)/configure COPYING depcomp install-sh missing
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -232,7 +232,7 @@ MAINTAINERCLEANFILES = *~ \
 #-----------------------------------------------------------------------
 
 #-----------------------------------------------------------------------
-ACLOCAL_AMFLAGS = -I m4 
+ACLOCAL_AMFLAGS = -I common/m4
 
 #AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip
 AUTOMAKE_OPTIONS = foreign
@@ -248,7 +248,7 @@ all: all-recursive
 .SUFFIXES: .@PDEXT@ .pod .txt .html
 am--refresh:
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/pdexternal.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/common/pdexternal.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -416,7 +416,7 @@ distclean-tags:
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/m4
+	$(mkdir_p) $(distdir)/common $(distdir)/common/m4
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
diff --git a/weightmap/README.cvs b/weightmap/README.cvs
deleted file mode 100644
index 96b1253..0000000
--- a/weightmap/README.cvs
+++ /dev/null
@@ -1,16 +0,0 @@
-To build from cvs, do the following:
-
- ./autogen.sh
- ./configure
- make
- make install
-
-You will need recent versions of GNU automake and
-autoconf in order to build from the CVS tree.
-
-NOTE:  The README.txt file in the distribution
-is auto-generated from perl ".pod" format by
-the "pod2text" included in most perl distributions.
-
-marmosets,
-	Bryan
diff --git a/weightmap/README.svn b/weightmap/README.svn
new file mode 100644
index 0000000..2fc9816
--- /dev/null
+++ b/weightmap/README.svn
@@ -0,0 +1,21 @@
+To build from subversion sources, do the following:
+
+ ./svn-prepare.sh
+ ./autogen.sh
+ ./configure
+ make
+ make install
+
+You will need recent versions of GNU automake and
+autoconf in order to build from the SVN tree.
+
+The './svn-prepare.sh' script requires some shared code
+in the directory ../common (relative to the package root
+directory).
+
+The README.txt file in the distribution is auto-generated
+from perl ".pod" format by the "pod2text" included in most
+Perl distributions.
+
+marmosets,
+	Bryan
diff --git a/weightmap/aclocal.m4 b/weightmap/aclocal.m4
index 4ab8160..0cdbeac 100644
--- a/weightmap/aclocal.m4
+++ b/weightmap/aclocal.m4
@@ -889,4 +889,4 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-m4_include([m4/ax_pd_external.m4])
+m4_include([common/m4/ax_pd_external.m4])
diff --git a/weightmap/configure b/weightmap/configure
index c471c93..0b521c2 100755
--- a/weightmap/configure
+++ b/weightmap/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for weightmap 0.01-1.
+# Generated by GNU Autoconf 2.61 for weightmap 0.01-2.
 #
 # Report bugs to <moocow@ling.uni-potsdam.de>.
 #
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='weightmap'
 PACKAGE_TARNAME='weightmap'
-PACKAGE_VERSION='0.01-1'
-PACKAGE_STRING='weightmap 0.01-1'
+PACKAGE_VERSION='0.01-2'
+PACKAGE_STRING='weightmap 0.01-2'
 PACKAGE_BUGREPORT='moocow@ling.uni-potsdam.de'
 
 ac_default_prefix=/usr/local
@@ -1189,7 +1189,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures weightmap 0.01-1 to adapt to many kinds of systems.
+\`configure' configures weightmap 0.01-2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1255,7 +1255,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of weightmap 0.01-1:";;
+     short | recursive ) echo "Configuration of weightmap 0.01-2:";;
    esac
   cat <<\_ACEOF
 
@@ -1351,7 +1351,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-weightmap configure 0.01-1
+weightmap configure 0.01-2
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1365,7 +1365,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by weightmap $as_me 0.01-1, which was
+It was created by weightmap $as_me 0.01-2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2047,7 +2047,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=weightmap
- VERSION=0.01-1
+ VERSION=0.01-2
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3489,7 +3489,7 @@ else
 fi
 
  if test -n "$pdincludedir" ; then
-  IFLAGS="$IFLAGS -I$pdincludedir"
+  PDEXT_IFLAGS="$PDEXT_IFLAGS -I$pdincludedir"
  fi
 
 
@@ -3557,7 +3557,7 @@ fi
 
  ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
  ## check: m_pd.h
- CPPFLAGS="$CPPFLAGS $IFLAGS"
+ CPPFLAGS="$CPPFLAGS $PDEXT_IFLAGS"
  { echo "$as_me:$LINENO: checking for m_pd.h" >&5
 echo $ECHO_N "checking for m_pd.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_m_pd_h+set}" = set; then
@@ -4315,7 +4315,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by weightmap $as_me 0.01-1, which was
+This file was extended by weightmap $as_me 0.01-2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4368,7 +4368,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-weightmap config.status 0.01-1
+weightmap config.status 0.01-2
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/weightmap/configure.ac b/weightmap/configure.ac
index 6f2103d..9ef521e 100644
--- a/weightmap/configure.ac
+++ b/weightmap/configure.ac
@@ -4,13 +4,13 @@ AC_PREREQ(2.5)
 
 dnl Some handy macros
 define([THE_PACKAGE_NAME],    [weightmap])
-define([THE_PACKAGE_VERSION], [0.01-1])
+define([THE_PACKAGE_VERSION], [0.01-2])
 define([THE_PACKAGE_AUTHOR],  [moocow@ling.uni-potsdam.de])
 
 AC_INIT(THE_PACKAGE_NAME, THE_PACKAGE_VERSION, THE_PACKAGE_AUTHOR)
 
 ##-- Additional m4 macros
-AC_CONFIG_MACRO_DIR(m4)
+AC_CONFIG_MACRO_DIR(common/m4)
 
 ##-- source & aux
 AC_CONFIG_AUX_DIR(.)
diff --git a/weightmap/m4 b/weightmap/m4
deleted file mode 120000
index 83ffc0c..0000000
--- a/weightmap/m4
+++ /dev/null
@@ -1 +0,0 @@
-../common/m4
\ No newline at end of file
diff --git a/weightmap/pdexternal.am b/weightmap/pdexternal.am
deleted file mode 120000
index 914f4be..0000000
--- a/weightmap/pdexternal.am
+++ /dev/null
@@ -1 +0,0 @@
-../common/pdexternal.am
\ No newline at end of file
diff --git a/weightmap/src/Makefile.am b/weightmap/src/Makefile.am
index 44a8fda..235e9bb 100644
--- a/weightmap/src/Makefile.am
+++ b/weightmap/src/Makefile.am
@@ -7,7 +7,7 @@
 #-----------------------------------------------------------------------
 # Includes
 #-----------------------------------------------------------------------
-include $(top_srcdir)/pdexternal.am
+include $(top_srcdir)/common/pdexternal.am
 
 ## --- recursion subdirectories
 #SUBDIRS = 
@@ -34,4 +34,6 @@ pddoc_DATA = weightmap-help.pd
 # sources
 #-----------------------------------------------------------------------
 
-weightmap_SOURCES = weightmap.c mooPdUtils.h
+weightmap_SOURCES = weightmap.c $(top_srcdir)/common/mooPdUtils.h
+
+AM_CPPFLAGS = -I$(top_srcdir)/common
diff --git a/weightmap/src/Makefile.in b/weightmap/src/Makefile.in
index ce53fb0..d1f52e9 100644
--- a/weightmap/src/Makefile.in
+++ b/weightmap/src/Makefile.in
@@ -47,12 +47,12 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/config.h.in $(top_srcdir)/pdexternal.am
+	$(srcdir)/config.h.in $(top_srcdir)/common/pdexternal.am
 pdexterns_PROGRAMS = weightmap$(EXEEXT)
 EXTRA_PROGRAMS = weightmap$(EXEEXT)
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -237,13 +237,14 @@ pddoc_DATA = weightmap-help.pd
 #-----------------------------------------------------------------------
 # sources
 #-----------------------------------------------------------------------
-weightmap_SOURCES = weightmap.c mooPdUtils.h
+weightmap_SOURCES = weightmap.c $(top_srcdir)/common/mooPdUtils.h
+AM_CPPFLAGS = -I$(top_srcdir)/common
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
 .SUFFIXES: .@PDEXT@ .pod .txt .html .c .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/pdexternal.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/common/pdexternal.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -422,7 +423,7 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/..
+	$(mkdir_p) $(distdir)/../common
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
diff --git a/weightmap/src/mooPdUtils.h b/weightmap/src/mooPdUtils.h
deleted file mode 120000
index 0bb3280..0000000
--- a/weightmap/src/mooPdUtils.h
+++ /dev/null
@@ -1 +0,0 @@
-../../common/mooPdUtils.h
\ No newline at end of file
diff --git a/weightmap/svn-prepare.sh b/weightmap/svn-prepare.sh
new file mode 120000
index 0000000..12a9e5b
--- /dev/null
+++ b/weightmap/svn-prepare.sh
@@ -0,0 +1 @@
+../common/svn-prepare.sh
\ No newline at end of file