+ eliminated build-time dependence on svn:special symlinks

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

15 files changed, 99 insertions, 109 deletions

diff --git a/Makefile.am b/Makefile.am
index d3eeb8e..835b80c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,11 +6,16 @@
 # Process this file with Automake to create Makefile.in.
 #-----------------------------------------------------------------------
 
+#-----------------------------------------------------------------------
+# Includes
+#-----------------------------------------------------------------------
+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
@@ -20,11 +25,6 @@ AUTOMAKE_OPTIONS = foreign
 SUBDIRS = config src
 
 #-----------------------------------------------------------------------
-# Includes
-#-----------------------------------------------------------------------
-include $(top_srcdir)/pdexternal.am
-
-#-----------------------------------------------------------------------
 # Additional Variables & Rules: PODS
 #-----------------------------------------------------------------------
 PODS = README.pod
diff --git a/Makefile.in b/Makefile.in
index 81d2283..37176e6 100644
--- a/Makefile.in
+++ b/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)
@@ -177,11 +177,6 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-ACLOCAL_AMFLAGS = -I m4 
-
-#AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip
-AUTOMAKE_OPTIONS = foreign
-SUBDIRS = config src
 DEXT = @PDEXT@
 SUFFIXES = .@PDEXT@ .pod .txt .html
 EXTRA_DIST = $(PODS) $(PODS:.pod=.txt) $(pddoc_DATA) $(pdext_DATA) \
@@ -221,6 +216,11 @@ MAINTAINERCLEANFILES = *~ \
 #-----------------------------------------------------------------------
 # Includes
 #-----------------------------------------------------------------------
+ACLOCAL_AMFLAGS = -I common/m4 
+
+#AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip
+AUTOMAKE_OPTIONS = foreign
+SUBDIRS = config src
 
 #-----------------------------------------------------------------------
 # Additional Variables & Rules: PODS
@@ -232,7 +232,7 @@ all: all-recursive
 .SUFFIXES: .@PDEXT@ .pod .txt .html
 am--refresh:
 	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/pdexternal.am $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/common/pdexternal.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -400,7 +400,7 @@ distclean-tags:
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/m4 $(distdir)/src
+	$(mkdir_p) $(distdir)/common $(distdir)/common/m4 $(distdir)/src
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
diff --git a/README.cvs b/README.cvs
deleted file mode 100644
index 2a0ee0c..0000000
--- a/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/README.svn b/README.svn
new file mode 100644
index 0000000..2fc9816
--- /dev/null
+++ b/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/aclocal.m4 b/aclocal.m4
index 76c661d..0dd0c47 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -860,4 +860,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/config/Makefile.am b/config/Makefile.am
index 96aac87..b7f1c06 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -7,4 +7,4 @@
 #-----------------------------------------------------------------------
 # Includes
 #-----------------------------------------------------------------------
-include $(top_srcdir)/pdexternal.am
+include $(top_srcdir)/common/pdexternal.am
diff --git a/config/Makefile.in b/config/Makefile.in
index 6e37f47..a725abc 100644
--- a/config/Makefile.in
+++ b/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)
@@ -197,7 +197,7 @@ all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .@PDEXT@ .pod .txt .html
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/pdexternal.am $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/common/pdexternal.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -235,7 +235,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/configure b/configure
index 607c632..02c1f63 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for pdstring 0.10-1.
+# Generated by GNU Autoconf 2.61 for pdstring 0.10-2.
 #
 # Report bugs to <moocow@ling.uni-potsdam.de>.
 #
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='pdstring'
 PACKAGE_TARNAME='pdstring'
-PACKAGE_VERSION='0.10-1'
-PACKAGE_STRING='pdstring 0.10-1'
+PACKAGE_VERSION='0.10-2'
+PACKAGE_STRING='pdstring 0.10-2'
 PACKAGE_BUGREPORT='moocow@ling.uni-potsdam.de'
 
 ac_default_prefix=/usr/local
@@ -1186,7 +1186,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 pdstring 0.10-1 to adapt to many kinds of systems.
+\`configure' configures pdstring 0.10-2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1252,7 +1252,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of pdstring 0.10-1:";;
+     short | recursive ) echo "Configuration of pdstring 0.10-2:";;
    esac
   cat <<\_ACEOF
 
@@ -1346,7 +1346,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-pdstring configure 0.10-1
+pdstring configure 0.10-2
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,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 pdstring $as_me 0.10-1, which was
+It was created by pdstring $as_me 0.10-2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2042,7 +2042,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=pdstring
- VERSION=0.10-1
+ VERSION=0.10-2
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3460,7 +3460,7 @@ else
 fi
 
  if test -n "$pdincludedir" ; then
-  IFLAGS="$IFLAGS -I$pdincludedir"
+  PDEXT_IFLAGS="$PDEXT_IFLAGS -I$pdincludedir"
  fi
 
 
@@ -3528,7 +3528,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
@@ -4283,7 +4283,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 pdstring $as_me 0.10-1, which was
+This file was extended by pdstring $as_me 0.10-2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4340,7 +4340,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-pdstring config.status 0.10-1
+pdstring config.status 0.10-2
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index 2ae2d97..8f7ea2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,13 +4,13 @@ AC_PREREQ(2.5)
 
 ##-- Some handy macros
 define([THE_PACKAGE_NAME],    [pdstring])
-define([THE_PACKAGE_VERSION], [0.10-1])
+define([THE_PACKAGE_VERSION], [0.10-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/m4 b/m4
deleted file mode 120000
index 83ffc0c..0000000
--- a/m4
+++ /dev/null
@@ -1 +0,0 @@
-../common/m4
\ No newline at end of file
diff --git a/pdexternal.am b/pdexternal.am
deleted file mode 120000
index 914f4be..0000000
--- a/pdexternal.am
+++ /dev/null
@@ -1 +0,0 @@
-../common/pdexternal.am
\ No newline at end of file
diff --git a/src/Makefile.am b/src/Makefile.am
index a215164..46c4b1b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,7 @@
 #-----------------------------------------------------------------------
 
 ##--- common includes
-include $(top_srcdir)/pdexternal.am
+include $(top_srcdir)/common/pdexternal.am
 
 ##--- recursion subdirectories
 #SUBDIRS = 
@@ -42,13 +42,14 @@ EXTRA_PROGRAMS = \
 	printbytes \
 	printwchars
 
-any2bytes_SOURCES = any2bytes.c mooPdUtils.h pdstringUtils.h pdstringUtils.c
-bytes2any_SOURCES = bytes2any.c mooPdUtils.h pdstringUtils.h pdstringUtils.c
-bytes2wchars_SOURCES = bytes2wchars.c mooPdUtils.h pdstringUtils.h pdstringUtils.c
-wchars2bytes_SOURCES = wchars2bytes.c mooPdUtils.h pdstringUtils.h pdstringUtils.c
-printbytes_SOURCES = printbytes.c mooPdUtils.h pdstringUtils.h pdstringUtils.c
-printwchars_SOURCES = printwchars.c mooPdUtils.h pdstringUtils.h pdstringUtils.c
-pdstring_SOURCES = pdstring.c mooPdUtils.h pdstringUtils.h pdstringUtils.c
+MOOPDUTILS_H = $(top_srcdir)/common/mooPdUtils.h
+any2bytes_SOURCES = any2bytes.c $(MOOPDUTILS_H) pdstringUtils.h pdstringUtils.c
+bytes2any_SOURCES = bytes2any.c $(MOOPDUTILS_H) pdstringUtils.h pdstringUtils.c
+bytes2wchars_SOURCES = bytes2wchars.c $(MOOPDUTILS_H) pdstringUtils.h pdstringUtils.c
+wchars2bytes_SOURCES = wchars2bytes.c $(MOOPDUTILS_H) pdstringUtils.h pdstringUtils.c
+printbytes_SOURCES = printbytes.c $(MOOPDUTILS_H) pdstringUtils.h pdstringUtils.c
+printwchars_SOURCES = printwchars.c $(MOOPDUTILS_H) pdstringUtils.h pdstringUtils.c
+pdstring_SOURCES = pdstring.c $(MOOPDUTILS_H) pdstringUtils.h pdstringUtils.c
 
 #-----------------------------------------------------------------------
 # patches, etc.
@@ -95,19 +96,7 @@ uninstall-local:
 	rm -f $(pdexternsdir)/string2any.$(PDEXT)
 
 #-----------------------------------------------------------------------
-# external compilation : flags
-#  + now handled by AX_PD_EXTERNAL
+# Paths, etc.
 #-----------------------------------------------------------------------
 
-#-----------------------------------------------------------------------
-# Variables: cleanup
-#  + should be handled by pdexternal.am
-
-#-----------------------------------------------------------------------
-# Variables: distribution
-#  + should be handled by pdexternal.am
-
-#-----------------------------------------------------------------------
-# Rules: cleanup
-#  + should be handled by pdexternal.am
-
+AM_CPPFLAGS = -I$(top_srcdir)/common
diff --git a/src/Makefile.in b/src/Makefile.in
index 6c5b157..7f34bd1 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -54,7 +54,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/any2bytes-help.pd $(srcdir)/bytes2any-help.pd \
-	$(srcdir)/config.h.in $(top_srcdir)/pdexternal.am
+	$(srcdir)/config.h.in $(top_srcdir)/common/pdexternal.am
 pdexec_PROGRAMS = pdstring$(EXEEXT) $(am__EXEEXT_1)
 @WANT_OBJECT_EXTERNALS_TRUE@am__append_1 = \
 @WANT_OBJECT_EXTERNALS_TRUE@	any2bytes \
@@ -69,7 +69,7 @@ EXTRA_PROGRAMS = pdstring$(EXEEXT) any2bytes$(EXEEXT) \
 	printbytes$(EXEEXT) printwchars$(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)
@@ -86,26 +86,32 @@ am__installdirs = "$(DESTDIR)$(pdexecdir)" "$(DESTDIR)$(pddocdir)" \
 	"$(DESTDIR)$(pdexternsdir)"
 pdexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(pdexec_PROGRAMS)
-am_any2bytes_OBJECTS = any2bytes.$(OBJEXT) pdstringUtils.$(OBJEXT)
+am__objects_1 =
+am_any2bytes_OBJECTS = any2bytes.$(OBJEXT) $(am__objects_1) \
+	pdstringUtils.$(OBJEXT)
 any2bytes_OBJECTS = $(am_any2bytes_OBJECTS)
 any2bytes_LDADD = $(LDADD)
-am_bytes2any_OBJECTS = bytes2any.$(OBJEXT) pdstringUtils.$(OBJEXT)
+am_bytes2any_OBJECTS = bytes2any.$(OBJEXT) $(am__objects_1) \
+	pdstringUtils.$(OBJEXT)
 bytes2any_OBJECTS = $(am_bytes2any_OBJECTS)
 bytes2any_LDADD = $(LDADD)
-am_bytes2wchars_OBJECTS = bytes2wchars.$(OBJEXT) \
+am_bytes2wchars_OBJECTS = bytes2wchars.$(OBJEXT) $(am__objects_1) \
 	pdstringUtils.$(OBJEXT)
 bytes2wchars_OBJECTS = $(am_bytes2wchars_OBJECTS)
 bytes2wchars_LDADD = $(LDADD)
-am_pdstring_OBJECTS = pdstring.$(OBJEXT) pdstringUtils.$(OBJEXT)
+am_pdstring_OBJECTS = pdstring.$(OBJEXT) $(am__objects_1) \
+	pdstringUtils.$(OBJEXT)
 pdstring_OBJECTS = $(am_pdstring_OBJECTS)
 pdstring_LDADD = $(LDADD)
-am_printbytes_OBJECTS = printbytes.$(OBJEXT) pdstringUtils.$(OBJEXT)
+am_printbytes_OBJECTS = printbytes.$(OBJEXT) $(am__objects_1) \
+	pdstringUtils.$(OBJEXT)
 printbytes_OBJECTS = $(am_printbytes_OBJECTS)
 printbytes_LDADD = $(LDADD)
-am_printwchars_OBJECTS = printwchars.$(OBJEXT) pdstringUtils.$(OBJEXT)
+am_printwchars_OBJECTS = printwchars.$(OBJEXT) $(am__objects_1) \
+	pdstringUtils.$(OBJEXT)
 printwchars_OBJECTS = $(am_printwchars_OBJECTS)
 printwchars_LDADD = $(LDADD)
-am_wchars2bytes_OBJECTS = wchars2bytes.$(OBJEXT) \
+am_wchars2bytes_OBJECTS = wchars2bytes.$(OBJEXT) $(am__objects_1) \
 	pdstringUtils.$(OBJEXT)
 wchars2bytes_OBJECTS = $(am_wchars2bytes_OBJECTS)
 wchars2bytes_LDADD = $(LDADD)
@@ -277,13 +283,14 @@ MAINTAINERCLEANFILES = *~ \
 	texinfo.tex \
 	ylwrap
 
-any2bytes_SOURCES = any2bytes.c mooPdUtils.h pdstringUtils.h pdstringUtils.c
-bytes2any_SOURCES = bytes2any.c mooPdUtils.h pdstringUtils.h pdstringUtils.c
-bytes2wchars_SOURCES = bytes2wchars.c mooPdUtils.h pdstringUtils.h pdstringUtils.c
-wchars2bytes_SOURCES = wchars2bytes.c mooPdUtils.h pdstringUtils.h pdstringUtils.c
-printbytes_SOURCES = printbytes.c mooPdUtils.h pdstringUtils.h pdstringUtils.c
-printwchars_SOURCES = printwchars.c mooPdUtils.h pdstringUtils.h pdstringUtils.c
-pdstring_SOURCES = pdstring.c mooPdUtils.h pdstringUtils.h pdstringUtils.c
+MOOPDUTILS_H = $(top_srcdir)/common/mooPdUtils.h
+any2bytes_SOURCES = any2bytes.c $(MOOPDUTILS_H) pdstringUtils.h pdstringUtils.c
+bytes2any_SOURCES = bytes2any.c $(MOOPDUTILS_H) pdstringUtils.h pdstringUtils.c
+bytes2wchars_SOURCES = bytes2wchars.c $(MOOPDUTILS_H) pdstringUtils.h pdstringUtils.c
+wchars2bytes_SOURCES = wchars2bytes.c $(MOOPDUTILS_H) pdstringUtils.h pdstringUtils.c
+printbytes_SOURCES = printbytes.c $(MOOPDUTILS_H) pdstringUtils.h pdstringUtils.c
+printwchars_SOURCES = printwchars.c $(MOOPDUTILS_H) pdstringUtils.h pdstringUtils.c
+pdstring_SOURCES = pdstring.c $(MOOPDUTILS_H) pdstringUtils.h pdstringUtils.c
 
 #-----------------------------------------------------------------------
 # patches, etc.
@@ -307,12 +314,17 @@ pddoc_DATA = \
 	printbytes-help.pd \
 	printwchars-help.pd
 
+
+#-----------------------------------------------------------------------
+# Paths, etc.
+#-----------------------------------------------------------------------
+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:  $(srcdir)/Makefile.am $(top_srcdir)/pdexternal.am $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/common/pdexternal.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -516,7 +528,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 \
@@ -675,23 +687,6 @@ install-data-hook:
 uninstall-local:
 	rm -f $(pdexternsdir)/any2string.$(PDEXT)
 	rm -f $(pdexternsdir)/string2any.$(PDEXT)
-
-#-----------------------------------------------------------------------
-# external compilation : flags
-#  + now handled by AX_PD_EXTERNAL
-#-----------------------------------------------------------------------
-
-#-----------------------------------------------------------------------
-# Variables: cleanup
-#  + should be handled by pdexternal.am
-
-#-----------------------------------------------------------------------
-# Variables: distribution
-#  + should be handled by pdexternal.am
-
-#-----------------------------------------------------------------------
-# Rules: cleanup
-#  + should be handled by pdexternal.am
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/src/mooPdUtils.h b/src/mooPdUtils.h
deleted file mode 120000
index 0bb3280..0000000
--- a/src/mooPdUtils.h
+++ /dev/null
@@ -1 +0,0 @@
-../../common/mooPdUtils.h
\ No newline at end of file
diff --git a/svn-prepare.sh b/svn-prepare.sh
new file mode 120000
index 0000000..12a9e5b
--- /dev/null
+++ b/svn-prepare.sh
@@ -0,0 +1 @@
+../common/svn-prepare.sh
\ No newline at end of file