+ fixes for pd-extended autobuild with automake-1.4 (grr)

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

12 files changed, 214 insertions, 25 deletions

diff --git a/deque/configure.in b/deque/configure.in
index 416daa0..ae69a12 100644
--- a/deque/configure.in
+++ b/deque/configure.in
@@ -73,18 +73,18 @@ AC_CHECK_HEADERS([stdlib.h errno.h],
 
 
 dnl PD externals
-AC_MSG_CHECKING([how to hack $AUTOMAKE EXEEXT conventions])
-automake_version=`$AUTOMAKE --version | head -n1 | cut -d' ' -f4`
-case "$automake_version" in
+AC_MSG_CHECKING([how to hack automake EXEEXT conventions])
+case "${am__api_version}" in
   1.[[0-4]]*)
-    AC_MSG_RESULT([automake v${automake_version}: on install])
-    PD_OBJECT_EXTERNALS="deque"
+    AC_MSG_RESULT([automake v${am__api_version}: on install])
+    buildext=""
     ;;
   *)
-    AC_MSG_RESULT([automake v${automake_version}: on build])
-    PD_OBJECT_EXTERNALS="deque\$(EXEEXT)"
+    AC_MSG_RESULT([automake v${am__api_version}: on build])
+    buildext="\$(EXEEXT)"
     ;;
 esac
+PD_OBJECT_EXTERNALS="deque${buildext}"
 AC_SUBST(PD_OBJECT_EXTERNALS)
 
 
diff --git a/extended/Makefile b/extended/Makefile
index 5c0904e..4250021 100644
--- a/extended/Makefile
+++ b/extended/Makefile
@@ -74,7 +74,7 @@ define subdir_template
 	(cd $(1); sh ./autogen.sh) || true
 
  $(1)-configure: $(1)-autogen
-	(cd $(1); sh ./configure $(CONFIGURE_ARGS) $(2)) || true
+	(cd $(1); sh ./configure $(CONFIGURE_ARGS) $(2); make clean) || true
 
  $(1)/build.stamp: $(1)-configure
 	$(MAKE) $(MOOCOW_MFLAGS) -C $(1) all install || true
diff --git a/flite/Makefile.am b/flite/Makefile.am
index 84c306c..5e8bb7b 100644
--- a/flite/Makefile.am
+++ b/flite/Makefile.am
@@ -27,7 +27,7 @@ PD_DIR = @PD_DIR@
 PD_INC = @PD_INC@
 PD_DOCDIR = @PD_DOC@
 PD_EXTDIR = @PD_EXTDIR@
-EXT    = @EXT@
+PDEXT     = @EXT@
 
 #-----------------------------------------------------------------------
 # pd externals (hacked 'libexec_*')
diff --git a/flite/README.txt b/flite/README.txt
new file mode 100644
index 0000000..bd59f25
--- /dev/null
+++ b/flite/README.txt
@@ -0,0 +1,67 @@
+    README for PD external distribution 'pd-flite'
+
+    Last updated for version 0.01
+
+DESCRIPTION
+    The 'pd-flite' distribution contains a single PD external ("flite"),
+    which provides a high-level text-to-speech interface for English based
+    on the 'libflite' library by Alan W Black and Kevin A. Lenzo.
+
+    Currently tested only under linux.
+
+REQUIREMENTS
+    * libflite >= v1.1
+        The 'libflite' library by Alan W Black and Keven A. Lenzo is
+        required to build the PD 'flite' external. It is available from
+        http://cmuflite.org.
+
+        You may want to apply the patch 'libflite-noaudio.patch' which comes
+        with this distribution to the 'libflite' sources before compiling
+        them (the '--with-audio=none' configure flag did not work for me on
+        its own).
+
+INSTALLATION
+    First, build and install the libflite distribution.
+
+    Then, issue the following commands to the shell:
+
+       cd PACKAGENAME-X.YY  (or wherever you extracted this distribution)
+       ./configure
+       make
+       make install
+
+BUILD OPTIONS
+    The 'configure' script supports the following options, among others:
+
+    * --with-flite-dir=DIR
+        Specify the base directory of the libflite distribution.
+
+    * --with-pd-dir=DIR
+        Specify PD base directory.
+
+    * --enable-debug , --disable-debug
+        Whether to enable verbose debugging messages. Default=no.
+
+    * Environment Variables
+        CPPFLAGS, CFLAGS, LDFLAGS, etc.
+
+    See the output of './configure --help' for more options.
+
+ACKNOWLEDGEMENTS
+    PD by Miller Puckette and others.
+
+    Flite run-time speech synthesis library by Alan W Black and Kevin A.
+    Lenzo.
+
+    Ideas, black magic, and other nuggets of information drawn from code by
+    Guenter Geiger, Larry Troxler, and iohannes m zmoelnig.
+
+KNOWN BUGS
+    It gobbles memory, and also processor time on synthesis operations.
+
+    No support for alternative voices or lexica, and no mid- or low-level
+    interface to the libflite functions.
+
+AUTHOR
+    Bryan Jurish <moocow@ling.uni-potsdam.de>
+
diff --git a/gfsm/README.txt b/gfsm/README.txt
new file mode 100644
index 0000000..f889241
--- /dev/null
+++ b/gfsm/README.txt
@@ -0,0 +1,39 @@
+    README for pd external package 'gfsm'
+
+    Last updated for pd-gfsm v0.04
+
+DESCRIPTION
+    pd-gfsm provides Pd bindings for the GFSM finite-state machine library.
+
+PREREQUISITES
+    Pd  Available from http://crca.ucsd.edu/~msp/software.html
+
+    libgfsm >= v0.0.8-pre6
+        Available from http://www.ling.uni-potsdam.de/~moocow/projects/gfsm
+
+INSTALLATION
+    Issue the following commands to the shell:
+
+       cd DISTNAME-X.YY  (or wherever you extracted the distribution)
+       ./configure
+       make
+       make install
+
+BUILD OPTIONS
+    The 'configure' script supports the following options, among others:
+
+    * --enable-debug , --disable-debug
+        Whether to enable verbose debugging messages. Default=no.
+
+ACKNOWLEDGEMENTS
+    PD by Miller Puckette and others.
+
+    Ideas, black magic, and other nuggets of information drawn from code by
+    Guenter Geiger, Larry Troxler, and iohannes m zmoelnig.
+
+KNOWN BUGS
+    None known.
+
+AUTHOR
+    Bryan Jurish <moocow@ling.uni-potsdam.de>
+
diff --git a/gfsm/src/Makefile.am b/gfsm/src/Makefile.am
index 05d3eda..06b741c 100644
--- a/gfsm/src/Makefile.am
+++ b/gfsm/src/Makefile.am
@@ -66,7 +66,7 @@ gfsm_SOURCES = \
 DEFS    = @DEFS@
 AFLAGS  = @AFLAGS@
 DFLAGS  = @DFLAGS@
-IFLAGS  = @IFLAGS@
+IFLAGS  = @IFLAGS@ -I$(srcdir)
 LFLAGS  = @LFLAGS@
 OFLAGS  = @OFLAGS@
 WFLAGS  = -Wall
@@ -90,7 +90,7 @@ gfsm_LDFLAGS = $(LFLAGS)
 #MOSTLYCLEANFILES =
 
 ## --- clean: built by 'make'
-CLEANFILES = *$(EXEEXT)
+CLEANFILES = *.$(PDEXT)
 
 ## --- distclean: built by 'configure'
 DISTCLEANFILES = \
diff --git a/readdir/README.txt b/readdir/README.txt
new file mode 100644
index 0000000..5dcf559
--- /dev/null
+++ b/readdir/README.txt
@@ -0,0 +1,33 @@
+    README for pd external 'readdir'
+
+    Last updated for readdir v0.02
+
+DESCRIPTION
+    The 'readdir' object lets you read the contents of a directory.
+
+INSTALLATION
+    Issue the following commands to the shell:
+
+       cd readdir-X.YY  (or wherever you extracted the distribution)
+       ./configure
+       make
+       make install
+
+BUILD OPTIONS
+    The 'configure' script supports the following options, among others:
+
+    * --enable-debug , --disable-debug
+        Whether to enable verbose debugging messages. Default=no.
+
+ACKNOWLEDGEMENTS
+    PD by Miller Puckette and others.
+
+    Ideas, black magic, and other nuggets of information drawn from code by
+    Guenter Geiger, Larry Troxler, and iohannes m zmoelnig.
+
+KNOWN BUGS
+    None known.
+
+AUTHOR
+    Bryan Jurish <moocow@ling.uni-potsdam.de>
+
diff --git a/readdir/configure.in b/readdir/configure.in
index 466924a..c5326e1 100644
--- a/readdir/configure.in
+++ b/readdir/configure.in
@@ -71,7 +71,19 @@ AC_CHECK_HEADERS([dirent.h fcntl.h string.h errno.h],
 
 
 dnl PD externals
-PD_OBJECT_EXTERNALS="readdir\$(EXEEXT)"
+AC_MSG_CHECKING([how to hack automake EXEEXT conventions])
+case "${am__api_version}" in
+  1.[[0-4]]*)
+    AC_MSG_RESULT([automake v${am__api_version}: on install])
+    buildext=""
+    ;;
+  *)
+    AC_MSG_RESULT([automake v${am__api_version}: on build])
+    buildext="\$(EXEEXT)"
+    ;;
+esac
+
+PD_OBJECT_EXTERNALS="readdir${buildext}"
 AC_SUBST(PD_OBJECT_EXTERNALS)
 
 
diff --git a/readdir/src/Makefile.am b/readdir/src/Makefile.am
index 53f09c0..68280f5 100644
--- a/readdir/src/Makefile.am
+++ b/readdir/src/Makefile.am
@@ -58,14 +58,11 @@ LFLAGS  = @LFLAGS@
 OFLAGS  = @OFLAGS@
 WFLAGS  = -Wall -Winline
 
-#GLIB_IFLAGS = @GLIB_IFLAGS@
-#GLIB_LFLAGS = @GLIB_LFLAGS@
-
-AM_CPPFLAGS = $(IFLAGS) $(GLIB_IFLAGS) $(DFLAGS)
+AM_CPPFLAGS = $(IFLAGS) $(DFLAGS)
 AM_CFLAGS   = $(OFLAGS) $(WFLAGS) $(AFLAGS)
 
 readdir_LDFLAGS = $(LFLAGS)
-readdir_LDADD   = $(GLIB_LFLAGS)
+#readdir_LDADD   =
 
 #-----------------------------------------------------------------------
 # Variables: cleanup
@@ -74,7 +71,7 @@ readdir_LDADD   = $(GLIB_LFLAGS)
 #MOSTLYCLEANFILES =
 
 ## --- clean: built by 'make'
-CLEANFILES = *$(EXEEXT)
+CLEANFILES = *.$(PDEXT)
 
 ## --- distclean: built by 'configure'
 DISTCLEANFILES = \
diff --git a/weightmap/README.txt b/weightmap/README.txt
new file mode 100644
index 0000000..7c5e97c
--- /dev/null
+++ b/weightmap/README.txt
@@ -0,0 +1,33 @@
+    README for weightmap
+
+    Last updated for weightmap v0.02
+
+DESCRIPTION
+    weightmap is a PD external which maps incoming probability values to
+    integers, inspired in part by Yves Degoyon's 'probalizer' object.
+
+INSTALLATION
+    Issue the following commands to the shell:
+
+       cd weightmap-X.YY  (or wherever you extracted the distribution)
+       ./configure
+       make
+       make install
+
+ACKNOWLEDGEMENTS
+    PD by Miller Puckette and others.
+
+    probalizer object by Yves Degoyon.
+
+    Ideas, black magic, and other nuggets of information drawn from code by
+    Guenter Geiger, Larry Troxler, and iohannes m zmoelnig.
+
+BUGS
+    It's a misleading name: higher input "weights" don't neccesarily
+    correspond to higer stored "weights".
+
+    Probably many more serious ones as well.
+
+AUTHOR
+    Bryan Jurish <moocow@ling.uni-potsdam.de>
+
diff --git a/weightmap/configure.in b/weightmap/configure.in
index 958750b..1f472dc 100644
--- a/weightmap/configure.in
+++ b/weightmap/configure.in
@@ -71,7 +71,18 @@ AC_CHECK_HEADERS([math.h],
 
 
 dnl PD externals
-PD_OBJECT_EXTERNALS="weightmap\$(EXEEXT)"
+AC_MSG_CHECKING([how to hack automake EXEEXT conventions])
+case "${am__api_version}" in
+  1.[[0-4]]*)
+    AC_MSG_RESULT([automake v${am__api_version}: on install])
+    buildext=""
+    ;;
+  *)
+    AC_MSG_RESULT([automake v${am__api_version}: on build])
+    buildext="\$(EXEEXT)"
+    ;;
+esac
+PD_OBJECT_EXTERNALS="weightmap${buildext}"
 AC_SUBST(PD_OBJECT_EXTERNALS)
 
 
diff --git a/weightmap/src/Makefile.am b/weightmap/src/Makefile.am
index a7feb67..5d64322 100644
--- a/weightmap/src/Makefile.am
+++ b/weightmap/src/Makefile.am
@@ -58,14 +58,11 @@ LFLAGS  = @LFLAGS@
 OFLAGS  = @OFLAGS@
 WFLAGS  = -Wall -Winline
 
-#GLIB_IFLAGS = @GLIB_IFLAGS@
-#GLIB_LFLAGS = @GLIB_LFLAGS@
-
-AM_CPPFLAGS = $(IFLAGS) $(GLIB_IFLAGS) $(DFLAGS)
+AM_CPPFLAGS = $(IFLAGS) $(DFLAGS)
 AM_CFLAGS   = $(OFLAGS) $(WFLAGS) $(AFLAGS)
 
 weightmap_LDFLAGS = $(LFLAGS)
-weightmap_LDADD   = $(GLIB_LFLAGS)
+#weightmap_LDADD   =
 
 #-----------------------------------------------------------------------
 # Variables: cleanup
@@ -74,7 +71,7 @@ weightmap_LDADD   = $(GLIB_LFLAGS)
 #MOSTLYCLEANFILES =
 
 ## --- clean: built by 'make'
-CLEANFILES = *$(EXEEXT)
+CLEANFILES = *.$(PDEXT)
 
 ## --- distclean: built by 'configure'
 DISTCLEANFILES = \