+ eliminated build-time dependence on svn:special symlinks

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

14 files changed, 53 insertions, 46 deletions

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