Adding changes that I missed when redoing my branches.

2025-10-10 08:33:36 +02:00 · 2015-04-08 10:21:17 -05:00
parent 9e0a0300f6
commit a66184f259
21 changed files with 3745 additions and 5233 deletions
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,23 +14,51 @@

@SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
    case $$MAKEFLAGS in \
      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
    esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -50,9 +77,9 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/dist-libsoxr.mk $(srcdir)/dist-libvamp.mk \
-	$(srcdir)/dist-portaudio.mk
+DIST_COMMON = $(srcdir)/dist-libsoxr.mk $(srcdir)/dist-libvamp.mk \
+	$(srcdir)/dist-portaudio.mk $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am
@USE_LOCAL_EXPAT_TRUE@am__append_1 = expat
@USE_LOCAL_LIBID3TAG_TRUE@am__append_2 = libid3tag
@USE_LOCAL_LIBMAD_TRUE@am__append_3 = libmad
@@ -121,15 +148,28 @@ CONFIG_HEADER = $(top_builddir)/src/configwin.h \
 	$(top_builddir)/src/configunix.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
  case $$AM_UPDATE_INFO_DIR in \
    n|no|NO) false;; \
@@ -137,9 +177,29 @@ am__can_run_installinfo = \
  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
  distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -170,6 +230,7 @@ am__relativize = \
  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUDACITY_NAME = @AUDACITY_NAME@
 AUTOCONF = @AUTOCONF@
@@ -939,22 +1000,25 @@ clean-libtool:
 	-rm -rf .libs _libs

 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -969,57 +1033,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"

-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags

-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -1035,12 +1054,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -1052,15 +1066,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -1069,6 +1079,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files

 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -1210,22 +1235,20 @@ ps-am:

 uninstall-am:

-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
+.MAKE: $(am__recursive_targets) install-am install-strip

-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am


 # Overwrite install* targets from automake. We do not want to install anything
--- a/lib-src/audacity-patches.txt
+++ b/lib-src/audacity-patches.txt
@@ -60,10 +60,9 @@ Upstream version: 0.15.1 (beta)
 libnyquist
 ----------
 Digital Audio scripting language, with our own library interface added to it
-kFreeBSD-nyquist.patch	Patch from Benjamin Drung to build nyquist on
-						kFreeBSD. Asked him to send it upstream 2009/08/22
-hurd-nyquist.patch      Patch from Benjamin Drung to build nyquist on HURD.
-                        Asked him to send it upstream 2009/12/05.
+Version in Audacity SVN: 3.09
+nyquist.patch  Fix for a couple of memory leaks
+xlisp.patch    Fix build in Windows

 libogg
 ------
--- a/lib-src/libnyquist/Makefile.am
+++ b/lib-src/libnyquist/Makefile.am
@@ -116,6 +116,10 @@ libnyquist_a_SOURCES = \
   nyquist/nyqsrc/multiread.h \
   nyquist/nyqsrc/multiseq.c \
   nyquist/nyqsrc/multiseq.h \
+   nyquist/nyqsrc/phasevocoder.c \
+   nyquist/nyqsrc/phasevocoder.h \
+   nyquist/nyqsrc/pvshell.c \
+   nyquist/nyqsrc/pvshell.h \
   nyquist/nyqsrc/resamp.c \
   nyquist/nyqsrc/resamp.h \
   nyquist/nyqsrc/resampv.c \
@@ -130,8 +134,8 @@ libnyquist_a_SOURCES = \
   nyquist/nyqsrc/seqfnintptrs.h \
   nyquist/nyqsrc/seqinterf.c \
   nyquist/nyqsrc/seqinterf.h \
-   nyquist/nyqsrc/sliders.c \
-   nyquist/nyqsrc/sliders.h \
+   nyquist/nyqsrc/sliderdata.c \
+   nyquist/nyqsrc/sliderdata.h \
   nyquist/nyqsrc/sndfnint.c \
   nyquist/nyqsrc/sndfnintdefs.h \
   nyquist/nyqsrc/sndfnintptrs.h \
@@ -141,6 +145,7 @@ libnyquist_a_SOURCES = \
   nyquist/nyqsrc/sndread.h \
   nyquist/nyqsrc/sndseq.c \
   nyquist/nyqsrc/sndseq.h \
+   nyquist/nyqsrc/sndsliders.c \
   nyquist/nyqsrc/sndsliders.h \
   nyquist/nyqsrc/sndwrite.h \
   nyquist/nyqsrc/sndwritepa.c \
@@ -399,6 +404,7 @@ libnyquist_a_SOURCES = \
   nyquist/xlisp/osdefs.h \
   nyquist/xlisp/osptrs.h \
   nyquist/xlisp/path.c \
+   nyquist/xlisp/security.c \
   nyquist/xlisp/xlbfun.c \
   nyquist/xlisp/xlcont.c \
   nyquist/xlisp/xldbug.c \
--- a/lib-src/libnyquist/Makefile.in
+++ b/lib-src/libnyquist/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -19,23 +18,51 @@
 # Written by Richard Ash following Gary Vaughan's Autobook

 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
    case $$MAKEFLAGS in \
      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
    esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -53,10 +80,14 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = .
-DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(top_srcdir)/configure autotools/ar-lib \
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/configure $(am__configure_deps) \
+	$(top_srcdir)/autotools/depcomp autotools/ar-lib \
 	autotools/compile autotools/depcomp autotools/install-sh \
-	autotools/missing
+	autotools/missing $(top_srcdir)/autotools/ar-lib \
+	$(top_srcdir)/autotools/compile \
+	$(top_srcdir)/autotools/install-sh \
+	$(top_srcdir)/autotools/missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps =  \
 	$(top_srcdir)/autotools/m4/ax_cflags_warn_all.m4 \
@@ -100,6 +131,10 @@ am__uninstall_files_from_dir = { \
 am__installdirs = "$(DESTDIR)$(libdir)"
 LIBRARIES = $(lib_LIBRARIES)
 ARFLAGS = cru
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 = 
 libnyquist_a_AR = $(AR) $(ARFLAGS)
 libnyquist_a_LIBADD =
 am__dirstamp = $(am__leading_dot)dirstamp
@@ -126,17 +161,20 @@ am_libnyquist_a_OBJECTS = nyquist/cmt/cext.$(OBJEXT) \
 	nyquist/nyqsrc/local.$(OBJEXT) nyquist/nyqsrc/lpanal.$(OBJEXT) \
 	nyquist/nyqsrc/multiread.$(OBJEXT) \
 	nyquist/nyqsrc/multiseq.$(OBJEXT) \
+	nyquist/nyqsrc/phasevocoder.$(OBJEXT) \
+	nyquist/nyqsrc/pvshell.$(OBJEXT) \
 	nyquist/nyqsrc/resamp.$(OBJEXT) \
 	nyquist/nyqsrc/resampv.$(OBJEXT) \
 	nyquist/nyqsrc/samples.$(OBJEXT) \
 	nyquist/nyqsrc/seqext.$(OBJEXT) \
 	nyquist/nyqsrc/seqfnint.$(OBJEXT) \
 	nyquist/nyqsrc/seqinterf.$(OBJEXT) \
-	nyquist/nyqsrc/sliders.$(OBJEXT) \
+	nyquist/nyqsrc/sliderdata.$(OBJEXT) \
 	nyquist/nyqsrc/sndfnint.$(OBJEXT) \
 	nyquist/nyqsrc/sndmax.$(OBJEXT) \
 	nyquist/nyqsrc/sndread.$(OBJEXT) \
 	nyquist/nyqsrc/sndseq.$(OBJEXT) \
+	nyquist/nyqsrc/sndsliders.$(OBJEXT) \
 	nyquist/nyqsrc/sndwritepa.$(OBJEXT) \
 	nyquist/nyqsrc/sound.$(OBJEXT) nyquist/nyqsrc/stats.$(OBJEXT) \
 	nyquist/nyqsrc/trigger.$(OBJEXT) nyquist/nyqsrc/yin.$(OBJEXT) \
@@ -232,33 +270,61 @@ am_libnyquist_a_OBJECTS = nyquist/cmt/cext.$(OBJEXT) \
 	nyquist/tran/tapv.$(OBJEXT) nyquist/tran/tone.$(OBJEXT) \
 	nyquist/tran/tonev.$(OBJEXT) nyquist/tran/upsample.$(OBJEXT) \
 	nyquist/tran/white.$(OBJEXT) nyquist/xlisp/extern.$(OBJEXT) \
-	nyquist/xlisp/path.$(OBJEXT) nyquist/xlisp/xlbfun.$(OBJEXT) \
-	nyquist/xlisp/xlcont.$(OBJEXT) nyquist/xlisp/xldbug.$(OBJEXT) \
-	nyquist/xlisp/xldmem.$(OBJEXT) nyquist/xlisp/xleval.$(OBJEXT) \
-	nyquist/xlisp/xlfio.$(OBJEXT) nyquist/xlisp/xlftab.$(OBJEXT) \
-	nyquist/xlisp/xlglob.$(OBJEXT) nyquist/xlisp/xlimage.$(OBJEXT) \
-	nyquist/xlisp/xlinit.$(OBJEXT) nyquist/xlisp/xlio.$(OBJEXT) \
-	nyquist/xlisp/xlisp.$(OBJEXT) nyquist/xlisp/xljump.$(OBJEXT) \
-	nyquist/xlisp/xllist.$(OBJEXT) nyquist/xlisp/xlmath.$(OBJEXT) \
-	nyquist/xlisp/xlobj.$(OBJEXT) nyquist/xlisp/xlpp.$(OBJEXT) \
-	nyquist/xlisp/xlprin.$(OBJEXT) nyquist/xlisp/xlread.$(OBJEXT) \
-	nyquist/xlisp/xlstr.$(OBJEXT) nyquist/xlisp/xlsubr.$(OBJEXT) \
-	nyquist/xlisp/xlsym.$(OBJEXT) nyquist/xlisp/xlsys.$(OBJEXT) \
-	nyx.$(OBJEXT)
+	nyquist/xlisp/path.$(OBJEXT) nyquist/xlisp/security.$(OBJEXT) \
+	nyquist/xlisp/xlbfun.$(OBJEXT) nyquist/xlisp/xlcont.$(OBJEXT) \
+	nyquist/xlisp/xldbug.$(OBJEXT) nyquist/xlisp/xldmem.$(OBJEXT) \
+	nyquist/xlisp/xleval.$(OBJEXT) nyquist/xlisp/xlfio.$(OBJEXT) \
+	nyquist/xlisp/xlftab.$(OBJEXT) nyquist/xlisp/xlglob.$(OBJEXT) \
+	nyquist/xlisp/xlimage.$(OBJEXT) nyquist/xlisp/xlinit.$(OBJEXT) \
+	nyquist/xlisp/xlio.$(OBJEXT) nyquist/xlisp/xlisp.$(OBJEXT) \
+	nyquist/xlisp/xljump.$(OBJEXT) nyquist/xlisp/xllist.$(OBJEXT) \
+	nyquist/xlisp/xlmath.$(OBJEXT) nyquist/xlisp/xlobj.$(OBJEXT) \
+	nyquist/xlisp/xlpp.$(OBJEXT) nyquist/xlisp/xlprin.$(OBJEXT) \
+	nyquist/xlisp/xlread.$(OBJEXT) nyquist/xlisp/xlstr.$(OBJEXT) \
+	nyquist/xlisp/xlsubr.$(OBJEXT) nyquist/xlisp/xlsym.$(OBJEXT) \
+	nyquist/xlisp/xlsys.$(OBJEXT) nyx.$(OBJEXT)
 libnyquist_a_OBJECTS = $(am_libnyquist_a_OBJECTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/autotools/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
 CXXLD = $(CXX)
 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 	-o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
 SOURCES = $(libnyquist_a_SOURCES)
 DIST_SOURCES = $(libnyquist_a_SOURCES)
 am__can_run_installinfo = \
@@ -266,8 +332,27 @@ am__can_run_installinfo = \
    n|no|NO) false;; \
    *) (install-info --version) >/dev/null 2>&1;; \
  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+CSCOPE = cscope
+AM_RECURSIVE_TARGETS = cscope
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -277,14 +362,17 @@ am__remove_distdir = \
      && rm -rf "$(distdir)" \
      || { sleep 5 && rm -rf "$(distdir)"; }; \
  else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
+DIST_TARGETS = dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -492,6 +580,10 @@ libnyquist_a_SOURCES = \
   nyquist/nyqsrc/multiread.h \
   nyquist/nyqsrc/multiseq.c \
   nyquist/nyqsrc/multiseq.h \
+   nyquist/nyqsrc/phasevocoder.c \
+   nyquist/nyqsrc/phasevocoder.h \
+   nyquist/nyqsrc/pvshell.c \
+   nyquist/nyqsrc/pvshell.h \
   nyquist/nyqsrc/resamp.c \
   nyquist/nyqsrc/resamp.h \
   nyquist/nyqsrc/resampv.c \
@@ -506,8 +598,8 @@ libnyquist_a_SOURCES = \
   nyquist/nyqsrc/seqfnintptrs.h \
   nyquist/nyqsrc/seqinterf.c \
   nyquist/nyqsrc/seqinterf.h \
-   nyquist/nyqsrc/sliders.c \
-   nyquist/nyqsrc/sliders.h \
+   nyquist/nyqsrc/sliderdata.c \
+   nyquist/nyqsrc/sliderdata.h \
   nyquist/nyqsrc/sndfnint.c \
   nyquist/nyqsrc/sndfnintdefs.h \
   nyquist/nyqsrc/sndfnintptrs.h \
@@ -517,6 +609,7 @@ libnyquist_a_SOURCES = \
   nyquist/nyqsrc/sndread.h \
   nyquist/nyqsrc/sndseq.c \
   nyquist/nyqsrc/sndseq.h \
+   nyquist/nyqsrc/sndsliders.c \
   nyquist/nyqsrc/sndsliders.h \
   nyquist/nyqsrc/sndwrite.h \
   nyquist/nyqsrc/sndwritepa.c \
@@ -775,6 +868,7 @@ libnyquist_a_SOURCES = \
   nyquist/xlisp/osdefs.h \
   nyquist/xlisp/osptrs.h \
   nyquist/xlisp/path.c \
+   nyquist/xlisp/security.c \
   nyquist/xlisp/xlbfun.c \
   nyquist/xlisp/xlcont.c \
   nyquist/xlisp/xldbug.c \
@@ -1126,6 +1220,10 @@ nyquist/nyqsrc/multiread.$(OBJEXT): nyquist/nyqsrc/$(am__dirstamp) \
 	nyquist/nyqsrc/$(DEPDIR)/$(am__dirstamp)
 nyquist/nyqsrc/multiseq.$(OBJEXT): nyquist/nyqsrc/$(am__dirstamp) \
 	nyquist/nyqsrc/$(DEPDIR)/$(am__dirstamp)
+nyquist/nyqsrc/phasevocoder.$(OBJEXT): nyquist/nyqsrc/$(am__dirstamp) \
+	nyquist/nyqsrc/$(DEPDIR)/$(am__dirstamp)
+nyquist/nyqsrc/pvshell.$(OBJEXT): nyquist/nyqsrc/$(am__dirstamp) \
+	nyquist/nyqsrc/$(DEPDIR)/$(am__dirstamp)
 nyquist/nyqsrc/resamp.$(OBJEXT): nyquist/nyqsrc/$(am__dirstamp) \
 	nyquist/nyqsrc/$(DEPDIR)/$(am__dirstamp)
 nyquist/nyqsrc/resampv.$(OBJEXT): nyquist/nyqsrc/$(am__dirstamp) \
@@ -1138,7 +1236,7 @@ nyquist/nyqsrc/seqfnint.$(OBJEXT): nyquist/nyqsrc/$(am__dirstamp) \
 	nyquist/nyqsrc/$(DEPDIR)/$(am__dirstamp)
 nyquist/nyqsrc/seqinterf.$(OBJEXT): nyquist/nyqsrc/$(am__dirstamp) \
 	nyquist/nyqsrc/$(DEPDIR)/$(am__dirstamp)
-nyquist/nyqsrc/sliders.$(OBJEXT): nyquist/nyqsrc/$(am__dirstamp) \
+nyquist/nyqsrc/sliderdata.$(OBJEXT): nyquist/nyqsrc/$(am__dirstamp) \
 	nyquist/nyqsrc/$(DEPDIR)/$(am__dirstamp)
 nyquist/nyqsrc/sndfnint.$(OBJEXT): nyquist/nyqsrc/$(am__dirstamp) \
 	nyquist/nyqsrc/$(DEPDIR)/$(am__dirstamp)
@@ -1148,6 +1246,8 @@ nyquist/nyqsrc/sndread.$(OBJEXT): nyquist/nyqsrc/$(am__dirstamp) \
 	nyquist/nyqsrc/$(DEPDIR)/$(am__dirstamp)
 nyquist/nyqsrc/sndseq.$(OBJEXT): nyquist/nyqsrc/$(am__dirstamp) \
 	nyquist/nyqsrc/$(DEPDIR)/$(am__dirstamp)
+nyquist/nyqsrc/sndsliders.$(OBJEXT): nyquist/nyqsrc/$(am__dirstamp) \
+	nyquist/nyqsrc/$(DEPDIR)/$(am__dirstamp)
 nyquist/nyqsrc/sndwritepa.$(OBJEXT): nyquist/nyqsrc/$(am__dirstamp) \
 	nyquist/nyqsrc/$(DEPDIR)/$(am__dirstamp)
 nyquist/nyqsrc/sound.$(OBJEXT): nyquist/nyqsrc/$(am__dirstamp) \
@@ -1463,6 +1563,8 @@ nyquist/xlisp/extern.$(OBJEXT): nyquist/xlisp/$(am__dirstamp) \
 	nyquist/xlisp/$(DEPDIR)/$(am__dirstamp)
 nyquist/xlisp/path.$(OBJEXT): nyquist/xlisp/$(am__dirstamp) \
 	nyquist/xlisp/$(DEPDIR)/$(am__dirstamp)
+nyquist/xlisp/security.$(OBJEXT): nyquist/xlisp/$(am__dirstamp) \
+	nyquist/xlisp/$(DEPDIR)/$(am__dirstamp)
 nyquist/xlisp/xlbfun.$(OBJEXT): nyquist/xlisp/$(am__dirstamp) \
 	nyquist/xlisp/$(DEPDIR)/$(am__dirstamp)
 nyquist/xlisp/xlcont.$(OBJEXT): nyquist/xlisp/$(am__dirstamp) \
@@ -1509,210 +1611,21 @@ nyquist/xlisp/xlsym.$(OBJEXT): nyquist/xlisp/$(am__dirstamp) \
 	nyquist/xlisp/$(DEPDIR)/$(am__dirstamp)
 nyquist/xlisp/xlsys.$(OBJEXT): nyquist/xlisp/$(am__dirstamp) \
 	nyquist/xlisp/$(DEPDIR)/$(am__dirstamp)
+
 libnyquist.a: $(libnyquist_a_OBJECTS) $(libnyquist_a_DEPENDENCIES) $(EXTRA_libnyquist_a_DEPENDENCIES) 
-	-rm -f libnyquist.a
-	$(libnyquist_a_AR) libnyquist.a $(libnyquist_a_OBJECTS) $(libnyquist_a_LIBADD)
-	$(RANLIB) libnyquist.a
+	$(AM_V_at)-rm -f libnyquist.a
+	$(AM_V_AR)$(libnyquist_a_AR) libnyquist.a $(libnyquist_a_OBJECTS) $(libnyquist_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libnyquist.a

 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
-	-rm -f nyquist/cmt/cext.$(OBJEXT)
-	-rm -f nyquist/cmt/cleanup.$(OBJEXT)
-	-rm -f nyquist/cmt/cmdline.$(OBJEXT)
-	-rm -f nyquist/cmt/cmtcmd.$(OBJEXT)
-	-rm -f nyquist/cmt/mem.$(OBJEXT)
-	-rm -f nyquist/cmt/midifile.$(OBJEXT)
-	-rm -f nyquist/cmt/midifns.$(OBJEXT)
-	-rm -f nyquist/cmt/moxc.$(OBJEXT)
-	-rm -f nyquist/cmt/record.$(OBJEXT)
-	-rm -f nyquist/cmt/seq.$(OBJEXT)
-	-rm -f nyquist/cmt/seqmread.$(OBJEXT)
-	-rm -f nyquist/cmt/seqmwrite.$(OBJEXT)
-	-rm -f nyquist/cmt/seqread.$(OBJEXT)
-	-rm -f nyquist/cmt/seqwrite.$(OBJEXT)
-	-rm -f nyquist/cmt/tempomap.$(OBJEXT)
-	-rm -f nyquist/cmt/timebase.$(OBJEXT)
-	-rm -f nyquist/cmt/userio.$(OBJEXT)
-	-rm -f nyquist/ffts/src/fftext.$(OBJEXT)
-	-rm -f nyquist/ffts/src/fftlib.$(OBJEXT)
-	-rm -f nyquist/ffts/src/matlib.$(OBJEXT)
-	-rm -f nyquist/nyqsrc/add.$(OBJEXT)
-	-rm -f nyquist/nyqsrc/avg.$(OBJEXT)
-	-rm -f nyquist/nyqsrc/compose.$(OBJEXT)
-	-rm -f nyquist/nyqsrc/convolve.$(OBJEXT)
-	-rm -f nyquist/nyqsrc/debug.$(OBJEXT)
-	-rm -f nyquist/nyqsrc/downsample.$(OBJEXT)
-	-rm -f nyquist/nyqsrc/falloc.$(OBJEXT)
-	-rm -f nyquist/nyqsrc/ffilterkit.$(OBJEXT)
-	-rm -f nyquist/nyqsrc/fft.$(OBJEXT)
-	-rm -f nyquist/nyqsrc/handlers.$(OBJEXT)
-	-rm -f nyquist/nyqsrc/inverse.$(OBJEXT)
-	-rm -f nyquist/nyqsrc/local.$(OBJEXT)
-	-rm -f nyquist/nyqsrc/lpanal.$(OBJEXT)
-	-rm -f nyquist/nyqsrc/multiread.$(OBJEXT)
-	-rm -f nyquist/nyqsrc/multiseq.$(OBJEXT)
-	-rm -f nyquist/nyqsrc/resamp.$(OBJEXT)
-	-rm -f nyquist/nyqsrc/resampv.$(OBJEXT)
-	-rm -f nyquist/nyqsrc/samples.$(OBJEXT)
-	-rm -f nyquist/nyqsrc/seqext.$(OBJEXT)
-	-rm -f nyquist/nyqsrc/seqfnint.$(OBJEXT)
-	-rm -f nyquist/nyqsrc/seqinterf.$(OBJEXT)
-	-rm -f nyquist/nyqsrc/sliders.$(OBJEXT)
-	-rm -f nyquist/nyqsrc/sndfnint.$(OBJEXT)
-	-rm -f nyquist/nyqsrc/sndmax.$(OBJEXT)
-	-rm -f nyquist/nyqsrc/sndread.$(OBJEXT)
-	-rm -f nyquist/nyqsrc/sndseq.$(OBJEXT)
-	-rm -f nyquist/nyqsrc/sndwritepa.$(OBJEXT)
-	-rm -f nyquist/nyqsrc/sound.$(OBJEXT)
-	-rm -f nyquist/nyqsrc/stats.$(OBJEXT)
-	-rm -f nyquist/nyqsrc/trigger.$(OBJEXT)
-	-rm -f nyquist/nyqsrc/yin.$(OBJEXT)
-	-rm -f nyquist/nyqstk/instr.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/ADSR.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/BandedWG.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/BiQuad.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/BowTable.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/Bowed.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/Chorus.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/Clarinet.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/Delay.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/DelayA.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/DelayL.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/Effect.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/Envelope.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/FileRead.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/FileWvIn.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/Filter.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/Flute.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/Function.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/Generator.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/Instrmnt.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/JCRev.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/JetTable.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/Mandolin.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/Modal.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/ModalBar.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/NRev.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/Noise.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/OnePole.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/OneZero.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/PRCRev.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/PitShift.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/PluckTwo.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/PoleZero.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/ReedTable.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/Saxofony.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/SineWave.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/Sitar.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/Stk.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/WaveLoop.$(OBJEXT)
-	-rm -f nyquist/nyqstk/src/WvIn.$(OBJEXT)
-	-rm -f nyquist/nyqstk/stkinit.$(OBJEXT)
-	-rm -f nyquist/nyqstk/stkint.$(OBJEXT)
-	-rm -f nyquist/tran/abs.$(OBJEXT)
-	-rm -f nyquist/tran/allpoles.$(OBJEXT)
-	-rm -f nyquist/tran/alpass.$(OBJEXT)
-	-rm -f nyquist/tran/alpasscv.$(OBJEXT)
-	-rm -f nyquist/tran/alpassvv.$(OBJEXT)
-	-rm -f nyquist/tran/amosc.$(OBJEXT)
-	-rm -f nyquist/tran/areson.$(OBJEXT)
-	-rm -f nyquist/tran/aresoncv.$(OBJEXT)
-	-rm -f nyquist/tran/aresonvc.$(OBJEXT)
-	-rm -f nyquist/tran/aresonvv.$(OBJEXT)
-	-rm -f nyquist/tran/atone.$(OBJEXT)
-	-rm -f nyquist/tran/atonev.$(OBJEXT)
-	-rm -f nyquist/tran/biquadfilt.$(OBJEXT)
-	-rm -f nyquist/tran/buzz.$(OBJEXT)
-	-rm -f nyquist/tran/chase.$(OBJEXT)
-	-rm -f nyquist/tran/clip.$(OBJEXT)
-	-rm -f nyquist/tran/congen.$(OBJEXT)
-	-rm -f nyquist/tran/const.$(OBJEXT)
-	-rm -f nyquist/tran/coterm.$(OBJEXT)
-	-rm -f nyquist/tran/delaycc.$(OBJEXT)
-	-rm -f nyquist/tran/delaycv.$(OBJEXT)
-	-rm -f nyquist/tran/eqbandvvv.$(OBJEXT)
-	-rm -f nyquist/tran/exp.$(OBJEXT)
-	-rm -f nyquist/tran/fmfb.$(OBJEXT)
-	-rm -f nyquist/tran/fmfbv.$(OBJEXT)
-	-rm -f nyquist/tran/fmosc.$(OBJEXT)
-	-rm -f nyquist/tran/follow.$(OBJEXT)
-	-rm -f nyquist/tran/fromarraystream.$(OBJEXT)
-	-rm -f nyquist/tran/fromobject.$(OBJEXT)
-	-rm -f nyquist/tran/gate.$(OBJEXT)
-	-rm -f nyquist/tran/ifft.$(OBJEXT)
-	-rm -f nyquist/tran/instrbanded.$(OBJEXT)
-	-rm -f nyquist/tran/instrbow.$(OBJEXT)
-	-rm -f nyquist/tran/instrbowedfreq.$(OBJEXT)
-	-rm -f nyquist/tran/instrclar.$(OBJEXT)
-	-rm -f nyquist/tran/instrclarall.$(OBJEXT)
-	-rm -f nyquist/tran/instrclarfreq.$(OBJEXT)
-	-rm -f nyquist/tran/instrflute.$(OBJEXT)
-	-rm -f nyquist/tran/instrfluteall.$(OBJEXT)
-	-rm -f nyquist/tran/instrflutefreq.$(OBJEXT)
-	-rm -f nyquist/tran/instrmandolin.$(OBJEXT)
-	-rm -f nyquist/tran/instrmodalbar.$(OBJEXT)
-	-rm -f nyquist/tran/instrsax.$(OBJEXT)
-	-rm -f nyquist/tran/instrsaxall.$(OBJEXT)
-	-rm -f nyquist/tran/instrsaxfreq.$(OBJEXT)
-	-rm -f nyquist/tran/instrsitar.$(OBJEXT)
-	-rm -f nyquist/tran/integrate.$(OBJEXT)
-	-rm -f nyquist/tran/log.$(OBJEXT)
-	-rm -f nyquist/tran/lpreson.$(OBJEXT)
-	-rm -f nyquist/tran/maxv.$(OBJEXT)
-	-rm -f nyquist/tran/offset.$(OBJEXT)
-	-rm -f nyquist/tran/oneshot.$(OBJEXT)
-	-rm -f nyquist/tran/osc.$(OBJEXT)
-	-rm -f nyquist/tran/partial.$(OBJEXT)
-	-rm -f nyquist/tran/pluck.$(OBJEXT)
-	-rm -f nyquist/tran/prod.$(OBJEXT)
-	-rm -f nyquist/tran/pwl.$(OBJEXT)
-	-rm -f nyquist/tran/quantize.$(OBJEXT)
-	-rm -f nyquist/tran/recip.$(OBJEXT)
-	-rm -f nyquist/tran/reson.$(OBJEXT)
-	-rm -f nyquist/tran/resoncv.$(OBJEXT)
-	-rm -f nyquist/tran/resonvc.$(OBJEXT)
-	-rm -f nyquist/tran/resonvv.$(OBJEXT)
-	-rm -f nyquist/tran/sampler.$(OBJEXT)
-	-rm -f nyquist/tran/scale.$(OBJEXT)
-	-rm -f nyquist/tran/shape.$(OBJEXT)
-	-rm -f nyquist/tran/sine.$(OBJEXT)
-	-rm -f nyquist/tran/siosc.$(OBJEXT)
-	-rm -f nyquist/tran/slope.$(OBJEXT)
-	-rm -f nyquist/tran/sqrt.$(OBJEXT)
-	-rm -f nyquist/tran/stkchorus.$(OBJEXT)
-	-rm -f nyquist/tran/stkpitshift.$(OBJEXT)
-	-rm -f nyquist/tran/stkrev.$(OBJEXT)
-	-rm -f nyquist/tran/tapf.$(OBJEXT)
-	-rm -f nyquist/tran/tapv.$(OBJEXT)
-	-rm -f nyquist/tran/tone.$(OBJEXT)
-	-rm -f nyquist/tran/tonev.$(OBJEXT)
-	-rm -f nyquist/tran/upsample.$(OBJEXT)
-	-rm -f nyquist/tran/white.$(OBJEXT)
-	-rm -f nyquist/xlisp/extern.$(OBJEXT)
-	-rm -f nyquist/xlisp/path.$(OBJEXT)
-	-rm -f nyquist/xlisp/xlbfun.$(OBJEXT)
-	-rm -f nyquist/xlisp/xlcont.$(OBJEXT)
-	-rm -f nyquist/xlisp/xldbug.$(OBJEXT)
-	-rm -f nyquist/xlisp/xldmem.$(OBJEXT)
-	-rm -f nyquist/xlisp/xleval.$(OBJEXT)
-	-rm -f nyquist/xlisp/xlfio.$(OBJEXT)
-	-rm -f nyquist/xlisp/xlftab.$(OBJEXT)
-	-rm -f nyquist/xlisp/xlglob.$(OBJEXT)
-	-rm -f nyquist/xlisp/xlimage.$(OBJEXT)
-	-rm -f nyquist/xlisp/xlinit.$(OBJEXT)
-	-rm -f nyquist/xlisp/xlio.$(OBJEXT)
-	-rm -f nyquist/xlisp/xlisp.$(OBJEXT)
-	-rm -f nyquist/xlisp/xljump.$(OBJEXT)
-	-rm -f nyquist/xlisp/xllist.$(OBJEXT)
-	-rm -f nyquist/xlisp/xlmath.$(OBJEXT)
-	-rm -f nyquist/xlisp/xlobj.$(OBJEXT)
-	-rm -f nyquist/xlisp/xlpp.$(OBJEXT)
-	-rm -f nyquist/xlisp/xlprin.$(OBJEXT)
-	-rm -f nyquist/xlisp/xlread.$(OBJEXT)
-	-rm -f nyquist/xlisp/xlstr.$(OBJEXT)
-	-rm -f nyquist/xlisp/xlsubr.$(OBJEXT)
-	-rm -f nyquist/xlisp/xlsym.$(OBJEXT)
-	-rm -f nyquist/xlisp/xlsys.$(OBJEXT)
+	-rm -f nyquist/cmt/*.$(OBJEXT)
+	-rm -f nyquist/ffts/src/*.$(OBJEXT)
+	-rm -f nyquist/nyqsrc/*.$(OBJEXT)
+	-rm -f nyquist/nyqstk/*.$(OBJEXT)
+	-rm -f nyquist/nyqstk/src/*.$(OBJEXT)
+	-rm -f nyquist/tran/*.$(OBJEXT)
+	-rm -f nyquist/xlisp/*.$(OBJEXT)

 distclean-compile:
 	-rm -f *.tab.c
@@ -1753,17 +1666,20 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/nyqsrc/$(DEPDIR)/lpanal.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/nyqsrc/$(DEPDIR)/multiread.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/nyqsrc/$(DEPDIR)/multiseq.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@nyquist/nyqsrc/$(DEPDIR)/phasevocoder.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@nyquist/nyqsrc/$(DEPDIR)/pvshell.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/nyqsrc/$(DEPDIR)/resamp.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/nyqsrc/$(DEPDIR)/resampv.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/nyqsrc/$(DEPDIR)/samples.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/nyqsrc/$(DEPDIR)/seqext.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/nyqsrc/$(DEPDIR)/seqfnint.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/nyqsrc/$(DEPDIR)/seqinterf.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@nyquist/nyqsrc/$(DEPDIR)/sliders.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@nyquist/nyqsrc/$(DEPDIR)/sliderdata.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/nyqsrc/$(DEPDIR)/sndfnint.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/nyqsrc/$(DEPDIR)/sndmax.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/nyqsrc/$(DEPDIR)/sndread.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/nyqsrc/$(DEPDIR)/sndseq.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@nyquist/nyqsrc/$(DEPDIR)/sndsliders.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/nyqsrc/$(DEPDIR)/sndwritepa.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/nyqsrc/$(DEPDIR)/sound.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/nyqsrc/$(DEPDIR)/stats.Po@am__quote@
@@ -1892,6 +1808,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/tran/$(DEPDIR)/white.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/xlisp/$(DEPDIR)/extern.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/xlisp/$(DEPDIR)/path.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@nyquist/xlisp/$(DEPDIR)/security.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/xlisp/$(DEPDIR)/xlbfun.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/xlisp/$(DEPDIR)/xlcont.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/xlisp/$(DEPDIR)/xldbug.Po@am__quote@
@@ -1917,57 +1834,46 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/xlisp/$(DEPDIR)/xlsys.Po@am__quote@

 .c.o:
-@am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<

 .c.obj:
-@am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`

 .cpp.o:
-@am__fastdepCXX_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<

 .cpp.obj:
-@am__fastdepCXX_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`

-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags

-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -1979,15 +1885,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -1996,9 +1898,31 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+	test ! -s cscope.files \
+	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+	-rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files

 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files

 distdir: $(DISTFILES)
 	$(am__remove_distdir)
@@ -2041,40 +1965,42 @@ distdir: $(DISTFILES)
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)

 dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)

 dist-lzip: distdir
 	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
-	$(am__remove_distdir)
-
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)

 dist-xz: distdir
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)

 dist-tarZ: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)

 dist-shar: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)

 dist-zip: distdir
 	-rm -f $(distdir).zip
 	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)

-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+dist dist-all:
+	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+	$(am__post_remove_distdir)

 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
@@ -2085,8 +2011,6 @@ distcheck: dist
 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lzma*) \
-	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.lz*) \
 	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
@@ -2098,18 +2022,19 @@ distcheck: dist
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod u+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
+	chmod -R a-w $(distdir)
+	chmod u+w $(distdir)
+	mkdir $(distdir)/_build $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	  && ../configure \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -2132,7 +2057,7 @@ distcheck: dist
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
 	  && cd "$$am__cwd" \
 	  || exit 1
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
@@ -2288,21 +2213,21 @@ uninstall-am: uninstall-libLIBRARIES

 .MAKE: install-am install-strip

-.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
-	clean-generic clean-libLIBRARIES ctags dist dist-all \
-	dist-bzip2 dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ \
-	dist-xz dist-zip distcheck distclean distclean-compile \
-	distclean-generic distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am \
-	install-libLIBRARIES install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-libLIBRARIES
+.PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am clean \
+	clean-cscope clean-generic clean-libLIBRARIES cscope \
+	cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
+	dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
+	distcheck distclean distclean-compile distclean-generic \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-libLIBRARIES install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am uninstall-libLIBRARIES


 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- a/lib-src/libnyquist/README.txt
+++ b/lib-src/libnyquist/README.txt
@@ -1,7 +1,7 @@
 libnyquist

 Library code and the "nyx" interface by Dominic Mazzoni.
-Updated to Nyquist version 3.03 by Leland Lucius.
+Updated to Nyquist version 3.09 by Leland Lucius.

 Originally based on Nyquist version 2.29 by Roger B. Dannenberg,
 which was based on xlisp 2 by David Michael Betz.
--- a/lib-src/libnyquist/nyquist/xlisp/security.c
+++ b/lib-src/libnyquist/nyquist/xlisp/security.c
@@ -4,7 +4,9 @@
 */

 #include <stdlib.h>
+#ifndef WIN32
 #include <unistd.h>
+#endif
 #include <string.h>
 #include <xlisp.h>

@@ -56,13 +58,13 @@ char *safe_write_path = NULL;
 int ok_to_open(const char *filename, const char *mode)
 {
    char fullname[STRMAX];
-    if (index(mode, 'r')) { /* asking for read permission */
+    if (strchr(mode, 'r')) { /* asking for read permission */
 	if (secure_read_path) { /* filename must be in path */
 	    find_full_path(filename, fullname);
 	    if (!in_tree(fullname, secure_read_path)) return FALSE;
 	}
    }
-    if (index(mode, 'w')) { /* asking for write permission */
+    if (strchr(mode, 'w')) { /* asking for write permission */
 	if (safe_write_path) { /* filename must be in path */
 	    find_full_path(filename, fullname);
 	    if (!in_tree(fullname, safe_write_path)) return FALSE;
@@ -98,7 +100,7 @@ void find_full_path(const char *filename, char *fullname)
    /* if windows, replace \ with / to simplify the rest */
    char *loc = fullname;
    if (os_pathchar != '/') {
-        while ((loc = index(loc, os_pathchar))) {
+        while ((loc = strchr(loc, os_pathchar))) {
 	    *loc = '/';
 	}
    }
--- a/lib-src/libnyquist/nyquist/xlisp/xlisp.h
+++ b/lib-src/libnyquist/nyquist/xlisp/xlisp.h
@@ -40,6 +40,7 @@ HISTORY
 #define OFFTYPE		long
 #define SAVERESTORE
 #define XL_LITTLE_ENDIAN 
+#define _longjmp longjmp
 #endif

 /* for the Turbo C compiler - MS-DOS, large model */
--- a/lib-src/libnyquist/nyx.c
+++ b/lib-src/libnyquist/nyx.c
@@ -538,7 +538,7 @@ void nyx_set_xlisp_path(const char *path)
   set_xlisp_path(path);
 }

-LOCAL void nyx_susp_fetch(register nyx_susp_type susp, snd_list_type snd_list)
+LOCAL void nyx_susp_fetch(nyx_susp_type susp, snd_list_type snd_list)
 {
   sample_block_type         out;
   sample_block_values_type  out_ptr;
@@ -848,7 +848,7 @@ nyx_rval nyx_eval_expression(const char *expr_string)
   xlbegin(&nyx_cntxt, CF_TOPLEVEL|CF_CLEANUP|CF_BRKLEVEL|CF_ERROR, s_true);

   // Set the context jump destination
-   if (setjmp(nyx_cntxt.c_jmpbuf)) {
+   if (_setjmp(nyx_cntxt.c_jmpbuf)) {
      // If the script is cancelled or some other condition occurs that causes
      // the script to exit and return to this level, then we don't need to
      // restore the previous context.
@@ -878,7 +878,7 @@ nyx_rval nyx_eval_expression(const char *expr_string)
   // xlisp stacks will contain pointers to invalid objects otherwise.
   //
   // Also note that execution will jump back up to the statement following the
-   // setjmp() above.
+   // _setjmp() above.
   xljump(&nyx_cntxt, CF_TOPLEVEL, NIL);
   // Never reached

@@ -928,9 +928,9 @@ int nyx_get_audio(nyx_audio_callback callback, void *userdata)
   int num_channels;
   int ch;

-   // Any variable whose value is set between the setjmp() and the "finish" label
+   // Any variable whose value is set between the _setjmp() and the "finish" label
   // and that is used after the "finish" label, must be marked volatile since
-   // any routine outside of the current one that calls longjmp() will cause values
+   // any routine outside of the current one that calls _longjmp() will cause values
   // cached in registers to be lost.
   volatile int success = FALSE;

@@ -969,7 +969,7 @@ int nyx_get_audio(nyx_audio_callback callback, void *userdata)
   xlbegin(&nyx_cntxt, CF_TOPLEVEL|CF_CLEANUP|CF_BRKLEVEL|CF_ERROR, s_true);

   // Set the context jump destination
-   if (setjmp(nyx_cntxt.c_jmpbuf)) {
+   if (_setjmp(nyx_cntxt.c_jmpbuf)) {
      // If the script is cancelled or some other condition occurs that causes
      // the script to exit and return to this level, then we don't need to
      // restore the previous context.
@@ -1038,7 +1038,7 @@ int nyx_get_audio(nyx_audio_callback callback, void *userdata)
   // xlisp stacks will contain pointers to invalid objects otherwise.
   //
   // Also note that execution will jump back up to the statement following the
-   // setjmp() above.
+   // _setjmp() above.
   xljump(&nyx_cntxt, CF_TOPLEVEL, NIL);
   // Never reached

@@ -1213,7 +1213,7 @@ int ostgetc()
 }

 /* osinit - initialize */
-void osinit(char *banner)
+void osinit(const char *banner)
 {
 }

@@ -1223,7 +1223,7 @@ void osfinish(void)
 }

 /* oserror - print an error message */
-void oserror(char *msg)
+void oserror(const char *msg)
 {
   errputstr(msg);
 }
@@ -1235,13 +1235,13 @@ long osrand(long n)

 /* cd ..
 open - open an ascii file */
-FILE *osaopen(char *name, char *mode)
+FILE *osaopen(const char *name, const char *mode)
 {
   return fopen(name, mode);
 }

 /* osbopen - open a binary file */
-FILE *osbopen(char *name, char *mode)
+FILE *osbopen(const char *name, const char *mode)
 {
   char bmode[10];
   
@@ -1341,12 +1341,25 @@ LVAL xsetdir()
   char *dir = (char *)getstring(xlgastring());
   int result;
   LVAL cwd = NULL;
+   int verbose = TRUE;
+
+   if (moreargs()) {
+      verbose = (xlgetarg() != NIL);
+   }

   xllastarg();

   result = chdir(dir);
   if (result) {
-      perror("SETDIR");
+      /* perror("SETDIR"); -- Nyquist uses SETDIR to search for directories
+       * at startup, so failures are normal, and seeing error messages
+       * could be confusing, so don't print them. The NULL return indicates
+       * an error, but doesn't tell which one it is.
+       * But now, SETDIR has a second verbose parameter that is nil when
+       * searching for directories. -RBD
+       */
+      if (verbose) perror("Directory Setting Error");
+      return NULL;
   }

   dir = getcwd(NULL, 1000);
@@ -1434,7 +1447,7 @@ int osdir_list_start(char *path)
 }

 /* osdir_list_next -- read the next entry from a directory */
-char *osdir_list_next()
+const char *osdir_list_next()
 {
   if (FindNextFile(hFind, &FindFileData) == 0) {
      osdir_list_status = OSDIR_LIST_DONE;
@@ -1462,7 +1475,7 @@ static int osdir_list_status = OSDIR_LIST_READY;
 static DIR *osdir_dir;

 /* osdir_list_start -- open a directory listing */
-int osdir_list_start(char *path)
+int osdir_list_start(const char *path)
 {
   if (osdir_list_status != OSDIR_LIST_READY) {
      osdir_list_finish(); /* close current listing */
@@ -1476,7 +1489,7 @@ int osdir_list_start(char *path)
 }

 /* osdir_list_next -- read the next entry from a directory */
-char *osdir_list_next()
+const char *osdir_list_next()
 {
   struct dirent *entry;

--- a/lib-src/libnyquist/xlisp.patch
+++ b/lib-src/libnyquist/xlisp.patch
@@ -1,6 +1,7 @@
-diff -ruN nyquist/xlisp/security.c ../audacity/lib-src/libnyquist/nyquist/xlisp/security.c
--- nyquist/xlisp/security.c	2015-03-05 03:00:46.520295100 -0600
-+++ nyquist/xlisp/security.c	2015-03-05 03:08:57.526379100 -0600
+diff --git a/lib-src/libnyquist/nyquist/xlisp/security.c b/lib-src/libnyquist/nyquist/xlisp/security.c
+index 8a5c265..d971567 100644
+--- a/lib-src/libnyquist/nyquist/xlisp/security.c
+++ b/lib-src/libnyquist/nyquist/xlisp/security.c
@@ -4,7 +4,9 @@
  */
 
@@ -11,7 +12,7 @@ diff -ruN nyquist/xlisp/security.c ../audacity/lib-src/libnyquist/nyquist/xlisp/
 #include <string.h>
 #include <xlisp.h>
 
-@@ -56,13 +58,13 @@
+@@ -56,13 +58,13 @@ char *safe_write_path = NULL;
 int ok_to_open(const char *filename, const char *mode)
 {
     char fullname[STRMAX];
@@ -27,7 +28,7 @@ diff -ruN nyquist/xlisp/security.c ../audacity/lib-src/libnyquist/nyquist/xlisp/
 	if (safe_write_path) { /* filename must be in path */
 	    find_full_path(filename, fullname);
 	    if (!in_tree(fullname, safe_write_path)) return FALSE;
-@@ -98,7 +100,7 @@
+@@ -98,7 +100,7 @@ void find_full_path(const char *filename, char *fullname)
     /* if windows, replace \ with / to simplify the rest */
     char *loc = fullname;
     if (os_pathchar != '/') {
@@ -36,14 +37,14 @@ diff -ruN nyquist/xlisp/security.c ../audacity/lib-src/libnyquist/nyquist/xlisp/
 	    *loc = '/';
 	}
     }
-diff -ruN nyquist/xlisp/xlisp.h ../audacity/lib-src/libnyquist/nyquist/xlisp/xlisp.h
--- nyquist/xlisp/xlisp.h	2015-03-05 03:00:46.507294400 -0600
-+++ nyquist/xlisp/xlisp.h	2015-03-05 03:10:39.273198700 -0600
-@@ -40,6 +40,8 @@
+diff --git a/lib-src/libnyquist/nyquist/xlisp/xlisp.h b/lib-src/libnyquist/nyquist/xlisp/xlisp.h
+index 316f982..4e67e47 100644
+--- a/lib-src/libnyquist/nyquist/xlisp/xlisp.h
+++ b/lib-src/libnyquist/nyquist/xlisp/xlisp.h
+@@ -40,6 +40,7 @@ HISTORY
 #define OFFTYPE		long
 #define SAVERESTORE
 #define XL_LITTLE_ENDIAN 
-+#define _setjmp setjmp
 +#define _longjmp longjmp
 #endif
 
--- a/lib-src/lv2/configure
+++ b/lib-src/lv2/configure
@@ -54,8 +54,8 @@ Cflags: -I\${includedir}/${pkg}${major}
 EOF

   export PKG_CONFIG_PATH="$(pwd)/${pkg}/build:${PKG_CONFIG_PATH}"
-   export CFLAGS="-I$(pwd)/${pkg} ${CFLAGS}"
-   export LDFLAGS="-L$(pwd)/${pkg} ${lib} ${LDFLAGS}"
+   export CFLAGS="-I$(pwd)/${pkg} -I$(pwd)/${pkg}/build ${CFLAGS}"
+   export LDFLAGS="-L$(pwd)/${pkg}/build ${lib} ${LDFLAGS}"

   ln -s ../${pkg}/${pkg} include
 }