Adding changes that I missed when redoing my branches.

2025-06-14 15:20:29 +02:00 · 2015-04-08 10:21:17 -05:00 · 2015-04-08 10:21:17 -05:00 · a66184f259
commit a66184f259
parent 9e0a0300f6
21 changed files with 3745 additions and 5233 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -16,7 +16,6 @@ nobase_dist_pkgdata_DATA = \
   include/audacity/ModuleInterface.h \
   include/audacity/PluginInterface.h \
   include/audacity/Types.h \
-   nyquist/bug.lsp \
   nyquist/dspprims.lsp \
   nyquist/envelopes.lsp \
   nyquist/equalizer.lsp \
@ -27,18 +26,21 @@ nobase_dist_pkgdata_DATA = \
   nyquist/misc.lsp \
   nyquist/nyinit.lsp \
   nyquist/nyqmisc.lsp \
-   nyquist/nyquist.lsp \
   nyquist/nyquist-plot.txt \
+   nyquist/nyquist.lsp \
   nyquist/printrec.lsp \
   nyquist/profile.lsp \
-   nyquist/sal.lsp \
   nyquist/sal-parse.lsp \
-   nyquist/seqfnint.lsp \
+   nyquist/sal.lsp \
   nyquist/seq.lsp \
+   nyquist/seqfnint.lsp \
   nyquist/seqmidi.lsp \
   nyquist/sndfnint.lsp \
   nyquist/stk.lsp \
   nyquist/system.lsp \
+   nyquist/test.lsp \
+   nyquist/upic.sal \
+   nyquist/velocity.lsp \
   nyquist/xlinit.lsp \
   nyquist/xm.lsp \
   nyquist/rawwaves/mand1.raw \
--- a/Makefile.in
+++ b/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.
@ -17,23 +16,51 @@


 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,13 +80,19 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = .
-DIST_COMMON = $(am__configure_deps) $(dist_doc_DATA) \
-	$(dist_pkgdata_DATA) $(nobase_dist_pkgdata_DATA) \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/configure ABOUT-NLS autotools/ar-lib \
-	autotools/compile autotools/config.guess \
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/configure $(am__configure_deps) $(dist_doc_DATA) \
+	$(dist_pkgdata_DATA) $(nobase_dist_pkgdata_DATA) ABOUT-NLS \
+	autotools/ar-lib autotools/compile autotools/config.guess \
 	autotools/config.rpath autotools/config.sub autotools/depcomp \
-	autotools/install-sh autotools/ltmain.sh autotools/missing
+	autotools/install-sh autotools/missing autotools/ltmain.sh \
+	$(top_srcdir)/autotools/ar-lib $(top_srcdir)/autotools/compile \
+	$(top_srcdir)/autotools/config.guess \
+	$(top_srcdir)/autotools/config.rpath \
+	$(top_srcdir)/autotools/config.sub \
+	$(top_srcdir)/autotools/install-sh \
+	$(top_srcdir)/autotools/ltmain.sh \
+	$(top_srcdir)/autotools/missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c99_func_lrint.m4 \
 	$(top_srcdir)/m4/ac_c99_func_lrintf.m4 \
@ -139,15 +172,28 @@ am__uninstall_files_from_dir = { \
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(docdir)" \
 	"$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"
 SCRIPTS = $(bin_SCRIPTS)
+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;; \
@ -157,11 +203,32 @@ DATA = $(dist_doc_DATA) $(dist_pkgdata_DATA) \
 	$(nobase_dist_pkgdata_DATA)
 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 \
-	distdir dist dist-all distcheck
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	cscope distdir dist dist-all distcheck
+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
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
@ -172,6 +239,7 @@ am__remove_distdir = \
      && rm -rf "$(distdir)" \
      || { sleep 5 && rm -rf "$(distdir)"; }; \
  else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
 am__relativize = \
  dir0=`pwd`; \
  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@ -199,12 +267,14 @@ am__relativize = \
  reldir="$$dir2"
 GZIP_ENV = --best
 DIST_ARCHIVES = $(distdir).tar.xz
+DIST_TARGETS = dist-xz
 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@
 AUDACITY_NAME = @AUDACITY_NAME@
 AUTOCONF = @AUTOCONF@
@ -426,7 +496,6 @@ nobase_dist_pkgdata_DATA = \
   include/audacity/ModuleInterface.h \
   include/audacity/PluginInterface.h \
   include/audacity/Types.h \
-   nyquist/bug.lsp \
   nyquist/dspprims.lsp \
   nyquist/envelopes.lsp \
   nyquist/equalizer.lsp \
@ -437,18 +506,21 @@ nobase_dist_pkgdata_DATA = \
   nyquist/misc.lsp \
   nyquist/nyinit.lsp \
   nyquist/nyqmisc.lsp \
-   nyquist/nyquist.lsp \
   nyquist/nyquist-plot.txt \
+   nyquist/nyquist.lsp \
   nyquist/printrec.lsp \
   nyquist/profile.lsp \
-   nyquist/sal.lsp \
   nyquist/sal-parse.lsp \
-   nyquist/seqfnint.lsp \
+   nyquist/sal.lsp \
   nyquist/seq.lsp \
+   nyquist/seqfnint.lsp \
   nyquist/seqmidi.lsp \
   nyquist/sndfnint.lsp \
   nyquist/stk.lsp \
   nyquist/system.lsp \
+   nyquist/test.lsp \
+   nyquist/upic.sal \
+   nyquist/velocity.lsp \
   nyquist/xlinit.lsp \
   nyquist/xm.lsp \
   nyquist/rawwaves/mand1.raw \
@ -637,22 +709,25 @@ uninstall-nobase_dist_pkgdataDATA:
 	dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir)

 # 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; \
@ -667,57 +742,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 \
@ -733,12 +763,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; \
@ -750,15 +775,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
@ -767,9 +788,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-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
+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files

 distdir: $(DISTFILES)
 	$(am__remove_distdir)
@ -837,39 +880,41 @@ 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) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-	$(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
@ -880,8 +925,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*) \
@ -893,18 +936,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 \
@ -927,7 +971,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'
@ -1068,14 +1112,13 @@ ps-am:
 uninstall-am: uninstall-binSCRIPTS uninstall-dist_docDATA \
 	uninstall-dist_pkgdataDATA uninstall-nobase_dist_pkgdataDATA

-.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 am--refresh check check-am clean clean-generic \
-	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
-	dist-zip distcheck distclean distclean-generic \
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--refresh check check-am clean clean-cscope clean-generic \
+	clean-libtool 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-generic \
 	distclean-libtool distclean-tags distcleancheck distdir \
 	distuninstallcheck dvi dvi-am html html-am info info-am \
 	install install-am install-binSCRIPTS install-data \
@ -1087,9 +1130,9 @@ uninstall-am: uninstall-binSCRIPTS uninstall-dist_docDATA \
 	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 \
-	uninstall-binSCRIPTS uninstall-dist_docDATA \
-	uninstall-dist_pkgdataDATA uninstall-nobase_dist_pkgdataDATA
+	tags tags-am uninstall uninstall-am uninstall-binSCRIPTS \
+	uninstall-dist_docDATA uninstall-dist_pkgdataDATA \
+	uninstall-nobase_dist_pkgdataDATA


 audacity$(EXEEXT): src/audacity$(EXEEXT)
--- a/help/Makefile.in
+++ b/help/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.
@ -16,23 +15,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@
@ -52,8 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = help
-DIST_COMMON = $(dist_appdata_DATA) $(dist_man_MANS) \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(dist_man_MANS) $(dist_appdata_DATA)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c99_func_lrint.m4 \
 	$(top_srcdir)/m4/ac_c99_func_lrintf.m4 \
@ -101,6 +128,18 @@ 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 =
 am__can_run_installinfo = \
@ -140,9 +179,11 @@ am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(appdatadir)"
 NROFF = nroff
 MANS = $(dist_man_MANS)
 DATA = $(dist_appdata_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUDACITY_NAME = @AUDACITY_NAME@
 AUTOCONF = @AUTOCONF@
@ -456,27 +497,14 @@ uninstall-dist_appdataDATA:
 	@list='$(dist_appdata_DATA)'; test -n "$(appdatadir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(appdatadir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:

-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
+
+cscope cscopelist:


 distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@ -614,16 +642,17 @@ uninstall-man: uninstall-man1
 .MAKE: install-am install-strip

 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dist_appdataDATA \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-man install-man1 install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am uninstall uninstall-am uninstall-dist_appdataDATA \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-dist_appdataDATA install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-man1 \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am uninstall-dist_appdataDATA \
 	uninstall-man uninstall-man1


--- a/images/Makefile.in
+++ b/images/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.
@ -16,23 +15,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@
@ -52,10 +79,10 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = images
-DIST_COMMON = $(dist_icons16_DATA) $(dist_icons22_DATA) \
-	$(dist_icons24_DATA) $(dist_icons32_DATA) $(dist_icons48_DATA) \
-	$(dist_iconsscalable_DATA) $(dist_pixmap_DATA) \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(dist_icons16_DATA) $(dist_icons22_DATA) $(dist_icons24_DATA) \
+	$(dist_icons32_DATA) $(dist_icons48_DATA) \
+	$(dist_iconsscalable_DATA) $(dist_pixmap_DATA)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c99_func_lrint.m4 \
 	$(top_srcdir)/m4/ac_c99_func_lrintf.m4 \
@ -103,6 +130,18 @@ 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 =
 am__can_run_installinfo = \
@ -144,9 +183,11 @@ am__installdirs = "$(DESTDIR)$(icons16dir)" "$(DESTDIR)$(icons22dir)" \
 DATA = $(dist_icons16_DATA) $(dist_icons22_DATA) $(dist_icons24_DATA) \
 	$(dist_icons32_DATA) $(dist_icons48_DATA) \
 	$(dist_iconsscalable_DATA) $(dist_pixmap_DATA) $(pixmap_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUDACITY_NAME = @AUDACITY_NAME@
 AUTOCONF = @AUTOCONF@
@ -642,11 +683,11 @@ uninstall-pixmapDATA:
 	@list='$(pixmap_DATA)'; test -n "$(pixmapdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(pixmapdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:

-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
+
+cscope cscopelist:


 distdir: $(DISTFILES)
@ -791,23 +832,24 @@ uninstall-am: uninstall-dist_icons16DATA uninstall-dist_icons22DATA \
 .MAKE: install-am install-strip

 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dist_icons16DATA \
-	install-dist_icons22DATA install-dist_icons24DATA \
-	install-dist_icons32DATA install-dist_icons48DATA \
-	install-dist_iconsscalableDATA install-dist_pixmapDATA \
-	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-pixmapDATA \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-dist_icons16DATA uninstall-dist_icons22DATA \
-	uninstall-dist_icons24DATA uninstall-dist_icons32DATA \
-	uninstall-dist_icons48DATA uninstall-dist_iconsscalableDATA \
-	uninstall-dist_pixmapDATA uninstall-pixmapDATA
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-dist_icons16DATA install-dist_icons22DATA \
+	install-dist_icons24DATA install-dist_icons32DATA \
+	install-dist_icons48DATA install-dist_iconsscalableDATA \
+	install-dist_pixmapDATA 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-pixmapDATA install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am uninstall-dist_icons16DATA \
+	uninstall-dist_icons22DATA uninstall-dist_icons24DATA \
+	uninstall-dist_icons32DATA uninstall-dist_icons48DATA \
+	uninstall-dist_iconsscalableDATA uninstall-dist_pixmapDATA \
+	uninstall-pixmapDATA


 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- 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
 }
--- a/mac/Audacity.xcodeproj/project.pbxproj
+++ b/mac/Audacity.xcodeproj/project.pbxproj
@ -601,7 +601,6 @@
 		284A83010F3158A2001D7A67 /* seqext.c in Sources */ = {isa = PBXBuildFile; fileRef = 284A80A20F3158A1001D7A67 /* seqext.c */; };
 		284A83030F3158A2001D7A67 /* seqfnint.c in Sources */ = {isa = PBXBuildFile; fileRef = 284A80A60F3158A1001D7A67 /* seqfnint.c */; };
 		284A83060F3158A2001D7A67 /* seqinterf.c in Sources */ = {isa = PBXBuildFile; fileRef = 284A80AA0F3158A1001D7A67 /* seqinterf.c */; };
-		284A83080F3158A2001D7A67 /* sliders.c in Sources */ = {isa = PBXBuildFile; fileRef = 284A80AC0F3158A1001D7A67 /* sliders.c */; };
 		284A830C0F3158A2001D7A67 /* sndfnint.c in Sources */ = {isa = PBXBuildFile; fileRef = 284A80B20F3158A1001D7A67 /* sndfnint.c */; };
 		284A830F0F3158A2001D7A67 /* sndmax.c in Sources */ = {isa = PBXBuildFile; fileRef = 284A80B60F3158A1001D7A67 /* sndmax.c */; };
 		284A83110F3158A2001D7A67 /* sndread.c in Sources */ = {isa = PBXBuildFile; fileRef = 284A80B80F3158A1001D7A67 /* sndread.c */; };
@ -823,6 +822,9 @@
 		28624C0E181CE65700E1AD1A /* sratom_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 2862439F181CE65500E1AD1A /* sratom_config.h */; };
 		28624C0F181CE65700E1AD1A /* sratom.h in Headers */ = {isa = PBXBuildFile; fileRef = 286243A0181CE65500E1AD1A /* sratom.h */; };
 		28624C10181CE65700E1AD1A /* sratom.c in Sources */ = {isa = PBXBuildFile; fileRef = 286243A1181CE65500E1AD1A /* sratom.c */; };
+		2862CED11AD3900000A53194 /* test.lsp in Resources */ = {isa = PBXBuildFile; fileRef = 2862CECE1AD3900000A53194 /* test.lsp */; };
+		2862CED21AD3900000A53194 /* upic.sal in Resources */ = {isa = PBXBuildFile; fileRef = 2862CECF1AD3900000A53194 /* upic.sal */; };
+		2862CED31AD3900000A53194 /* velocity.lsp in Resources */ = {isa = PBXBuildFile; fileRef = 2862CED01AD3900000A53194 /* velocity.lsp */; };
 		28640874181CE74100CC4E2C /* sord_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 28640873181CE74100CC4E2C /* sord_config.h */; };
 		28640876181CE75800CC4E2C /* serd_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 28640875181CE75800CC4E2C /* serd_config.h */; };
 		28640878181CE77200CC4E2C /* lilv_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 28640877181CE77200CC4E2C /* lilv_config.h */; };
@ -945,6 +947,15 @@
 		28BD8AB3101DF4C700686679 /* ExecMenuCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28BD8AAC101DF4C600686679 /* ExecMenuCommand.cpp */; };
 		28BD8AB4101DF4C700686679 /* GetAllMenuCommands.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28BD8AAE101DF4C600686679 /* GetAllMenuCommands.cpp */; };
 		28C3946D1818356800FDDAC9 /* AudacityLogger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28C3946B1818356800FDDAC9 /* AudacityLogger.cpp */; };
+		28CC03A81AD386CF00826380 /* phasevocoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 28CC03A01AD386CF00826380 /* phasevocoder.c */; };
+		28CC03A91AD386CF00826380 /* phasevocoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 28CC03A11AD386CF00826380 /* phasevocoder.h */; };
+		28CC03AA1AD386CF00826380 /* pvshell.c in Sources */ = {isa = PBXBuildFile; fileRef = 28CC03A21AD386CF00826380 /* pvshell.c */; };
+		28CC03AB1AD386CF00826380 /* pvshell.h in Headers */ = {isa = PBXBuildFile; fileRef = 28CC03A31AD386CF00826380 /* pvshell.h */; };
+		28CC03AC1AD386CF00826380 /* sliderdata.c in Sources */ = {isa = PBXBuildFile; fileRef = 28CC03A41AD386CF00826380 /* sliderdata.c */; };
+		28CC03AD1AD386CF00826380 /* sliderdata.h in Headers */ = {isa = PBXBuildFile; fileRef = 28CC03A51AD386CF00826380 /* sliderdata.h */; };
+		28CC03AE1AD386CF00826380 /* sndsliders.c in Sources */ = {isa = PBXBuildFile; fileRef = 28CC03A61AD386CF00826380 /* sndsliders.c */; };
+		28CC03AF1AD386CF00826380 /* sndsliders.h in Headers */ = {isa = PBXBuildFile; fileRef = 28CC03A71AD386CF00826380 /* sndsliders.h */; };
+		28CC03B11AD3874500826380 /* security.c in Sources */ = {isa = PBXBuildFile; fileRef = 28CC03B01AD3874500826380 /* security.c */; };
 		28CCDD000F939FD70081F2FC /* FileHistory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28CCDCFF0F939FD70081F2FC /* FileHistory.cpp */; };
 		28D000A51A32920C00367B21 /* DeviceChange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28D000A31A32920C00367B21 /* DeviceChange.cpp */; };
 		28D540050FD1912A00FA7C75 /* AppCommandEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 28D53FFA0FD1912A00FA7C75 /* AppCommandEvent.cpp */; };
@ -1060,7 +1071,6 @@
 		28EB74F40FDC2EDF0046D78E /* seqfnintdefs.h in Headers */ = {isa = PBXBuildFile; fileRef = 28EB74D30FDC2EDE0046D78E /* seqfnintdefs.h */; };
 		28EB74F50FDC2EDF0046D78E /* seqfnintptrs.h in Headers */ = {isa = PBXBuildFile; fileRef = 28EB74D40FDC2EDE0046D78E /* seqfnintptrs.h */; };
 		28EB74F60FDC2EDF0046D78E /* seqinterf.h in Headers */ = {isa = PBXBuildFile; fileRef = 28EB74D50FDC2EDE0046D78E /* seqinterf.h */; };
-		28EB74F70FDC2EDF0046D78E /* sliders.h in Headers */ = {isa = PBXBuildFile; fileRef = 28EB74D60FDC2EDE0046D78E /* sliders.h */; };
 		28EB74F80FDC2EDF0046D78E /* sndfnintdefs.h in Headers */ = {isa = PBXBuildFile; fileRef = 28EB74D70FDC2EDE0046D78E /* sndfnintdefs.h */; };
 		28EB74F90FDC2EDF0046D78E /* sndfnintptrs.h in Headers */ = {isa = PBXBuildFile; fileRef = 28EB74D80FDC2EDE0046D78E /* sndfnintptrs.h */; };
 		28EB74FA0FDC2EDF0046D78E /* sndmax.h in Headers */ = {isa = PBXBuildFile; fileRef = 28EB74D90FDC2EDE0046D78E /* sndmax.h */; };
@ -3117,7 +3127,6 @@
 		2803C8B519F35AA000278526 /* PluginManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginManager.h; sourceTree = "<group>"; };
 		2803C8B619F35AA000278526 /* TrackPanelListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TrackPanelListener.h; sourceTree = "<group>"; };
 		2803C8BB19F35B4900278526 /* SelectionBarListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelectionBarListener.h; sourceTree = "<group>"; };
-		2808025B0F32C11F0021001D /* bug.lsp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; name = bug.lsp; path = ../nyquist/bug.lsp; sourceTree = SOURCE_ROOT; };
 		2808025C0F32C11F0021001D /* dspprims.lsp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; name = dspprims.lsp; path = ../nyquist/dspprims.lsp; sourceTree = SOURCE_ROOT; };
 		2808025D0F32C11F0021001D /* envelopes.lsp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; name = envelopes.lsp; path = ../nyquist/envelopes.lsp; sourceTree = SOURCE_ROOT; };
 		2808025E0F32C11F0021001D /* equalizer.lsp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; name = equalizer.lsp; path = ../nyquist/equalizer.lsp; sourceTree = SOURCE_ROOT; };
@ -3319,7 +3328,6 @@
 		284A80A20F3158A1001D7A67 /* seqext.c */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = seqext.c; sourceTree = "<group>"; tabWidth = 3; };
 		284A80A60F3158A1001D7A67 /* seqfnint.c */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = seqfnint.c; sourceTree = "<group>"; tabWidth = 3; };
 		284A80AA0F3158A1001D7A67 /* seqinterf.c */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = seqinterf.c; sourceTree = "<group>"; tabWidth = 3; };
-		284A80AC0F3158A1001D7A67 /* sliders.c */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = sliders.c; sourceTree = "<group>"; tabWidth = 3; };
 		284A80B20F3158A1001D7A67 /* sndfnint.c */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = sndfnint.c; sourceTree = "<group>"; tabWidth = 3; };
 		284A80B60F3158A1001D7A67 /* sndmax.c */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = sndmax.c; sourceTree = "<group>"; tabWidth = 3; };
 		284A80B80F3158A1001D7A67 /* sndread.c */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = sndread.c; sourceTree = "<group>"; tabWidth = 3; };
@ -3559,6 +3567,9 @@
 		2862439F181CE65500E1AD1A /* sratom_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sratom_config.h; path = lv2/sratom/build/sratom_config.h; sourceTree = "<group>"; };
 		286243A0181CE65500E1AD1A /* sratom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sratom.h; path = lv2/sratom/sratom/sratom.h; sourceTree = "<group>"; };
 		286243A1181CE65500E1AD1A /* sratom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sratom.c; path = lv2/sratom/src/sratom.c; sourceTree = "<group>"; };
+		2862CECE1AD3900000A53194 /* test.lsp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = test.lsp; path = ../nyquist/test.lsp; sourceTree = SOURCE_ROOT; };
+		2862CECF1AD3900000A53194 /* upic.sal */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = upic.sal; path = ../nyquist/upic.sal; sourceTree = SOURCE_ROOT; };
+		2862CED01AD3900000A53194 /* velocity.lsp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = velocity.lsp; path = ../nyquist/velocity.lsp; sourceTree = SOURCE_ROOT; };
 		28640873181CE74100CC4E2C /* sord_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sord_config.h; path = lv2/sord/build/sord_config.h; sourceTree = "<group>"; };
 		28640875181CE75800CC4E2C /* serd_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = serd_config.h; path = lv2/serd/build/serd_config.h; sourceTree = "<group>"; };
 		28640877181CE77200CC4E2C /* lilv_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lilv_config.h; path = lv2/lilv/build/lilv_config.h; sourceTree = "<group>"; };
@ -3715,6 +3726,15 @@
 		28BD8AB0101DF4C600686679 /* Validators.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = Validators.h; sourceTree = "<group>"; tabWidth = 3; };
 		28C3946B1818356800FDDAC9 /* AudacityLogger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudacityLogger.cpp; sourceTree = "<group>"; };
 		28C3946C1818356800FDDAC9 /* AudacityLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudacityLogger.h; sourceTree = "<group>"; };
+		28CC03A01AD386CF00826380 /* phasevocoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = phasevocoder.c; sourceTree = "<group>"; };
+		28CC03A11AD386CF00826380 /* phasevocoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = phasevocoder.h; sourceTree = "<group>"; };
+		28CC03A21AD386CF00826380 /* pvshell.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pvshell.c; sourceTree = "<group>"; };
+		28CC03A31AD386CF00826380 /* pvshell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pvshell.h; sourceTree = "<group>"; };
+		28CC03A41AD386CF00826380 /* sliderdata.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sliderdata.c; sourceTree = "<group>"; };
+		28CC03A51AD386CF00826380 /* sliderdata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sliderdata.h; sourceTree = "<group>"; };
+		28CC03A61AD386CF00826380 /* sndsliders.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sndsliders.c; sourceTree = "<group>"; };
+		28CC03A71AD386CF00826380 /* sndsliders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sndsliders.h; sourceTree = "<group>"; };
+		28CC03B01AD3874500826380 /* security.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = security.c; sourceTree = "<group>"; };
 		28CCDCFF0F939FD70081F2FC /* FileHistory.cpp */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; path = FileHistory.cpp; sourceTree = "<group>"; tabWidth = 3; };
 		28CCDD040F93A0B20081F2FC /* FileHistory.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = FileHistory.h; sourceTree = "<group>"; tabWidth = 3; };
 		28D000A31A32920C00367B21 /* DeviceChange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeviceChange.cpp; sourceTree = "<group>"; };
@ -3829,7 +3849,6 @@
 		28EB74D30FDC2EDE0046D78E /* seqfnintdefs.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = seqfnintdefs.h; sourceTree = "<group>"; tabWidth = 3; };
 		28EB74D40FDC2EDE0046D78E /* seqfnintptrs.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = seqfnintptrs.h; sourceTree = "<group>"; tabWidth = 3; };
 		28EB74D50FDC2EDE0046D78E /* seqinterf.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = seqinterf.h; sourceTree = "<group>"; tabWidth = 3; };
-		28EB74D60FDC2EDE0046D78E /* sliders.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = sliders.h; sourceTree = "<group>"; tabWidth = 3; };
 		28EB74D70FDC2EDE0046D78E /* sndfnintdefs.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = sndfnintdefs.h; sourceTree = "<group>"; tabWidth = 3; };
 		28EB74D80FDC2EDE0046D78E /* sndfnintptrs.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = sndfnintptrs.h; sourceTree = "<group>"; tabWidth = 3; };
 		28EB74D90FDC2EDE0046D78E /* sndmax.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = sndmax.h; sourceTree = "<group>"; tabWidth = 3; };
@ -5874,10 +5893,12 @@
 				28EB74CC0FDC2EDE0046D78E /* multiread.h */,
 				284A80910F3158A1001D7A67 /* multiseq.c */,
 				28EB74CD0FDC2EDE0046D78E /* multiseq.h */,
+				28CC03A01AD386CF00826380 /* phasevocoder.c */,
+				28CC03A11AD386CF00826380 /* phasevocoder.h */,
+				28CC03A21AD386CF00826380 /* pvshell.c */,
+				28CC03A31AD386CF00826380 /* pvshell.h */,
 				284A80990F3158A1001D7A67 /* probe.c */,
 				28EB74CE0FDC2EDE0046D78E /* probe.h */,
-				28EB74D20FDC2EDE0046D78E /* seqext.h */,
-				28EB74D50FDC2EDE0046D78E /* seqinterf.h */,
 				284A809B0F3158A1001D7A67 /* resamp.c */,
 				28EB74CF0FDC2EDE0046D78E /* resamp.h */,
 				284A809D0F3158A1001D7A67 /* resampv.c */,
@ -5885,13 +5906,15 @@
 				284A80A00F3158A1001D7A67 /* samples.c */,
 				28EB74D10FDC2EDE0046D78E /* samples.h */,
 				284A80A20F3158A1001D7A67 /* seqext.c */,
-				284A80A60F3158A1001D7A67 /* seqfnint.c */,
+				28EB74D20FDC2EDE0046D78E /* seqext.h */,
+				28EB74D50FDC2EDE0046D78E /* seqinterf.h */,
 				28EB74D30FDC2EDE0046D78E /* seqfnintdefs.h */,
 				28EB74D40FDC2EDE0046D78E /* seqfnintptrs.h */,
 				284A80AA0F3158A1001D7A67 /* seqinterf.c */,
-				284A80AC0F3158A1001D7A67 /* sliders.c */,
-				28EB74D60FDC2EDE0046D78E /* sliders.h */,
 				284A80B20F3158A1001D7A67 /* sndfnint.c */,
+				284A80A60F3158A1001D7A67 /* seqfnint.c */,
+				28CC03A41AD386CF00826380 /* sliderdata.c */,
+				28CC03A51AD386CF00826380 /* sliderdata.h */,
 				28EB74D70FDC2EDE0046D78E /* sndfnintdefs.h */,
 				28EB74D80FDC2EDE0046D78E /* sndfnintptrs.h */,
 				284A80B60F3158A1001D7A67 /* sndmax.c */,
@ -5900,6 +5923,8 @@
 				28EB74DA0FDC2EDE0046D78E /* sndread.h */,
 				284A80BA0F3158A1001D7A67 /* sndseq.c */,
 				28EB74DB0FDC2EDE0046D78E /* sndseq.h */,
+				28CC03A61AD386CF00826380 /* sndsliders.c */,
+				28CC03A71AD386CF00826380 /* sndsliders.h */,
 				284A80BF0F3158A1001D7A67 /* sndwritepa.c */,
 				284A80C00F3158A1001D7A67 /* sound.c */,
 				28EB74DC0FDC2EDE0046D78E /* sound.h */,
@ -6143,6 +6168,7 @@
 			children = (
 				284A827B0F3158A2001D7A67 /* extern.c */,
 				284A827F0F3158A2001D7A67 /* path.c */,
+				28CC03B01AD3874500826380 /* security.c */,
 				284A82800F3158A2001D7A67 /* xlbfun.c */,
 				284A82810F3158A2001D7A67 /* xlcont.c */,
 				284A82820F3158A2001D7A67 /* xldbug.c */,
@ -6451,7 +6477,6 @@
 			isa = PBXGroup;
 			children = (
 				2808026A0F32C11F0021001D /* rawwaves */,
-				2808025B0F32C11F0021001D /* bug.lsp */,
 				2808025C0F32C11F0021001D /* dspprims.lsp */,
 				2808025D0F32C11F0021001D /* envelopes.lsp */,
 				2808025E0F32C11F0021001D /* equalizer.lsp */,
@ -6474,6 +6499,9 @@
 				2808027F0F32C11F0021001D /* sndfnint.lsp */,
 				280802800F32C11F0021001D /* stk.lsp */,
 				280802810F32C11F0021001D /* system.lsp */,
+				2862CECE1AD3900000A53194 /* test.lsp */,
+				2862CECF1AD3900000A53194 /* upic.sal */,
+				2862CED01AD3900000A53194 /* velocity.lsp */,
 				280802820F32C11F0021001D /* xlinit.lsp */,
 				280802830F32C11F0021001D /* xm.lsp */,
 			);
@ -7081,7 +7109,6 @@
 				28EB74F40FDC2EDF0046D78E /* seqfnintdefs.h in Headers */,
 				28EB74F50FDC2EDF0046D78E /* seqfnintptrs.h in Headers */,
 				28EB74F60FDC2EDF0046D78E /* seqinterf.h in Headers */,
-				28EB74F70FDC2EDF0046D78E /* sliders.h in Headers */,
 				28EB74F80FDC2EDF0046D78E /* sndfnintdefs.h in Headers */,
 				28EB74F90FDC2EDF0046D78E /* sndfnintptrs.h in Headers */,
 				28EB74FA0FDC2EDF0046D78E /* sndmax.h in Headers */,
@ -7213,6 +7240,10 @@
 				28EB75F60FDC30C70046D78E /* white.h in Headers */,
 				28EB75F90FDC322A0046D78E /* xldmem.h in Headers */,
 				28EB75FA0FDC322A0046D78E /* xlisp.h in Headers */,
+				28CC03A91AD386CF00826380 /* phasevocoder.h in Headers */,
+				28CC03AB1AD386CF00826380 /* pvshell.h in Headers */,
+				28CC03AD1AD386CF00826380 /* sliderdata.h in Headers */,
+				28CC03AF1AD386CF00826380 /* sndsliders.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -8088,6 +8119,9 @@
 				28ED7B7E1A1C77BF008A01D9 /* SpectralEditShelves.ny in Resources */,
 				28ED7B7F1A1C77BF008A01D9 /* StudioFadeOut.ny in Resources */,
 				28ECC1921A66CC5000EECC53 /* hy.po in Resources */,
+				2862CED11AD3900000A53194 /* test.lsp in Resources */,
+				2862CED21AD3900000A53194 /* upic.sal in Resources */,
+				2862CED31AD3900000A53194 /* velocity.lsp in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -8166,7 +8200,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "#\n# Make building on Lion or higher easier\n#\nexport CPP=cpp-4.0\nexport CC=gcc-4.0\nexport CXX=g++-4.0\nexport CPPFLAGS=\"-isysroot ${SDKROOT}\"\nexport CFLAGS=\"-isysroot ${SDKROOT}\"\nexport CXXFLAGS=\"-isysroot ${SDKROOT}\"\n\nif [ -z \"$WX_CONFIG\" ]\nthen\n   echo \"WX_CONFIG environment variable not set...aborting\"\n   exit 1\nfi\n\nif [ ! -z \"${DYLD_LIBRARY_PATH}\" ]\nthen\n\techo \"warning: -----\"\n\techo \"warning: Warning:\"\n\techo \"warning: -----\"\n\techo \"warning: You have DYLD_LIBRARY_PATH set to '${DYLD_LIBRARY_PATH}'\"\n\techo \"warning: When you run or debug Audacity it will be unset so that libraries loaded by Audacity (like Lame or FFmpeg) will be searched for in a similar manner as in released versions.\"\n\techo \"warning: If this is a problem, copy the DYLD_LIBRARY_PATH value to DYLD_FALLBACK_LIBRARY_PATH before starting Xcode.\"\n\techo \"warning: -----\"\nfi\n\n#\n# Here we create empty xcconfig files if they do not exist.  Otherwise,\n# the build will fail.\n#\nconfigs='Debug_Shared Debug_Static Release_Shared Release_Static'\nfor config in $configs\ndo\n\t[ ! -f $TOPLEVEL/mac/$config.xcconfig ] && touch $TOPLEVEL/mac/$config.xcconfig\ndone\n\n#\n# Get to a known location\n#\ncd $TOPLEVEL\n\n#\n# Libsndfile seems to have some date/time issues, so placate him.\n#\n# Run aclocal to make libsndfile happy\n#\n#touch lib-src/libsndfile/configure.ac\n\n#\n# Configure the world\n#\nsh configure --enable-static=$CONFIG_STATIC \\\n             --enable-unicode=$CONFIG_UNICODE \\\n             --enable-debug=$CONFIG_DEBUG \\\n             --with-lib-preference=local,system \\\n             --with-wx-version=$WX_VER \\\n             $CONFIG_FLAGS || exit 1\n\n#\n# Libsndfile's endianness detection is a bit unfriendly to universal binary\n# builds, so we coerce it into working our way.\n#\nFILE=lib-src/libsndfile/src/config.h\ngrep -q '__BIG_ENDIAN__' $FILE || cat <<EOF >>$FILE\n#undef CPU_IS_BIG_ENDIAN\n#undef CPU_IS_LITTLE_ENDIAN\n#if defined(__BIG_ENDIAN__)\n#define CPU_IS_BIG_ENDIAN 1\n#define CPU_IS_LITTLE_ENDIAN 0\n#else\n#define CPU_IS_BIG_ENDIAN 0\n#define CPU_IS_LITTLE_ENDIAN 1\n#endif\nEOF\n\n#\n# Ditto for libflac.\n#\nFILE=lib-src/libflac/config.h\ngrep -q '__BIG_ENDIAN__' $FILE || cat <<EOF >>$FILE\n#ifdef WORDS_BIGENDIAN\n#undef WORDS_BIGENDIAN\n#endif\n#if defined(__BIG_ENDIAN__)\n#define WORDS_BIGENDIAN 1\n#endif\nEOF\n\n#\n# And libmad.\n#\nFILE=lib-src/libmad/config.h\ngrep -q '__BIG_ENDIAN__' $FILE || cat <<EOF >>$FILE\n#ifdef WORDS_BIGENDIAN\n#undef WORDS_BIGENDIAN\n#endif\n#if defined(__BIG_ENDIAN__)\n#define WORDS_BIGENDIAN 1\n#endif\nEOF\n\n#\n# And expat.\n#\nFILE=lib-src/expat/expat_config.h\ngrep -q '__BIG_ENDIAN__' $FILE || cat <<EOF >>$FILE\n#ifdef BYTEORDER\n#undef BYTEORDER\n#endif\n#if defined(__BIG_ENDIAN__)\n#define BYTEORDER 4321\n#else\n#define BYTEORDER 1234\n#endif\nEOF\n\n#\n# Libsoxr's endianness detection is a bit unfriendly to universal binary\n# builds. We need to disable SIMD since we can't build UBs with it enabled.\n#\nFILE=lib-src/libsoxr/soxr-config.h\ngrep -q '__BIG_ENDIAN__' $FILE || cat <<EOF >>$FILE\n#if defined(__BIG_ENDIAN__)\n#undef WORDS_BIGENDIAN\n#define WORDS_BIGENDIAN 1\n#endif\n#undef HAVE_SIMD\n#define HAVE_SIMD 0\nEOF\n\n#\n# Generate the header file for preprocessing the Info.plist\n#\ngcc -E -dM src/Audacity.h | grep AUDACITY >mac/Info.plist.h\necho >>mac/Info.plist.h '#define AUDACITY_EXECUTABLE Audacity'\n\nexit 0\n";
+			shellScript = "#\n# Make building on Lion or higher easier\n#\nexport CPP=cpp-4.0\nexport CC=gcc-4.0\nexport CXX=g++-4.0\nexport CPPFLAGS=\"-isysroot ${SDKROOT}\"\nexport CFLAGS=\"-isysroot ${SDKROOT}\"\nexport CXXFLAGS=\"-isysroot ${SDKROOT}\"\n\nif [ -z \"$WX_CONFIG\" ]\nthen\n   echo \"WX_CONFIG environment variable not set...aborting\"\n   exit 1\nfi\n\nif [ ! -z \"${DYLD_LIBRARY_PATH}\" ]\nthen\n\techo \"warning: -----\"\n\techo \"warning: Warning:\"\n\techo \"warning: -----\"\n\techo \"warning: You have DYLD_LIBRARY_PATH set to '${DYLD_LIBRARY_PATH}'\"\n\techo \"warning: When you run or debug Audacity it will be unset so that libraries loaded by Audacity (like Lame or FFmpeg) will be searched for in a similar manner as in released versions.\"\n\techo \"warning: If this is a problem, copy the DYLD_LIBRARY_PATH value to DYLD_FALLBACK_LIBRARY_PATH before starting Xcode.\"\n\techo \"warning: -----\"\nfi\n\n#\n# Here we create empty xcconfig files if they do not exist.  Otherwise,\n# the build will fail.\n#\nconfigs='Debug_Shared Debug_Static Release_Shared Release_Static'\nfor config in $configs\ndo\n\t[ ! -f $TOPLEVEL/mac/$config.xcconfig ] && touch $TOPLEVEL/mac/$config.xcconfig\ndone\n\n#\n# Get to a known location\n#\ncd $TOPLEVEL\n\n#\n# Libsndfile seems to have some date/time issues, so placate him.\n#\n# Run aclocal to make libsndfile happy\n#\n#touch lib-src/libsndfile/configure.ac\n\n#\n# Configure the world\nsh configure --enable-static=$CONFIG_STATIC \\\n             --enable-unicode=$CONFIG_UNICODE \\\n             --enable-debug=$CONFIG_DEBUG \\\n             --with-lib-preference=local,system \\\n             --with-wx-version=$WX_VER \\\n             $CONFIG_FLAGS || exit 1\n\n#\n# Libsndfile's endianness detection is a bit unfriendly to universal binary\n# builds, so we coerce it into working our way.\n#\nFILE=lib-src/libsndfile/src/config.h\ngrep -q '__BIG_ENDIAN__' $FILE || cat <<EOF >>$FILE\n#undef CPU_IS_BIG_ENDIAN\n#undef CPU_IS_LITTLE_ENDIAN\n#if defined(__BIG_ENDIAN__)\n#define CPU_IS_BIG_ENDIAN 1\n#define CPU_IS_LITTLE_ENDIAN 0\n#else\n#define CPU_IS_BIG_ENDIAN 0\n#define CPU_IS_LITTLE_ENDIAN 1\n#endif\nEOF\n\n#\n# Ditto for libflac.\n#\nFILE=lib-src/libflac/config.h\ngrep -q '__BIG_ENDIAN__' $FILE || cat <<EOF >>$FILE\n#ifdef WORDS_BIGENDIAN\n#undef WORDS_BIGENDIAN\n#endif\n#if defined(__BIG_ENDIAN__)\n#define WORDS_BIGENDIAN 1\n#endif\nEOF\n\n#\n# And libmad.\n#\nFILE=lib-src/libmad/config.h\ngrep -q '__BIG_ENDIAN__' $FILE || cat <<EOF >>$FILE\n#ifdef WORDS_BIGENDIAN\n#undef WORDS_BIGENDIAN\n#endif\n#if defined(__BIG_ENDIAN__)\n#define WORDS_BIGENDIAN 1\n#endif\nEOF\n\n#\n# And expat.\n#\nFILE=lib-src/expat/expat_config.h\ngrep -q '__BIG_ENDIAN__' $FILE || cat <<EOF >>$FILE\n#ifdef BYTEORDER\n#undef BYTEORDER\n#endif\n#if defined(__BIG_ENDIAN__)\n#define BYTEORDER 4321\n#else\n#define BYTEORDER 1234\n#endif\nEOF\n\n#\n# Libsoxr's endianness detection is a bit unfriendly to universal binary\n# builds. We need to disable SIMD since we can't build UBs with it enabled.\n#\nFILE=lib-src/libsoxr/soxr-config.h\ngrep -q '__BIG_ENDIAN__' $FILE || cat <<EOF >>$FILE\n#if defined(__BIG_ENDIAN__)\n#undef WORDS_BIGENDIAN\n#define WORDS_BIGENDIAN 1\n#endif\n#undef HAVE_SIMD\n#define HAVE_SIMD 0\nEOF\n\n#\n# Generate the header file for preprocessing the Info.plist\n#\ngcc -E -dM src/Audacity.h | grep AUDACITY >mac/Info.plist.h\necho >>mac/Info.plist.h '#define AUDACITY_EXECUTABLE Audacity'\n\nexit 0\n";
 		};
 		17073FEB0988E6C9008541CC /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
@ -8692,7 +8726,6 @@
 				284A83010F3158A2001D7A67 /* seqext.c in Sources */,
 				284A83030F3158A2001D7A67 /* seqfnint.c in Sources */,
 				284A83060F3158A2001D7A67 /* seqinterf.c in Sources */,
-				284A83080F3158A2001D7A67 /* sliders.c in Sources */,
 				284A830C0F3158A2001D7A67 /* sndfnint.c in Sources */,
 				284A830F0F3158A2001D7A67 /* sndmax.c in Sources */,
 				284A83110F3158A2001D7A67 /* sndread.c in Sources */,
@ -8851,6 +8884,11 @@
 				28A4E2AC0F60319300E9E7F2 /* fftext.c in Sources */,
 				28A4E2AE0F60319300E9E7F2 /* fftlib.c in Sources */,
 				28A4E2B00F60319300E9E7F2 /* matlib.c in Sources */,
+				28CC03A81AD386CF00826380 /* phasevocoder.c in Sources */,
+				28CC03AA1AD386CF00826380 /* pvshell.c in Sources */,
+				28CC03AC1AD386CF00826380 /* sliderdata.c in Sources */,
+				28CC03AE1AD386CF00826380 /* sndsliders.c in Sources */,
+				28CC03B11AD3874500826380 /* security.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -10413,6 +10451,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 2812A5B90DF63FF000576305 /* Debug_Static.xcconfig */;
 			buildSettings = {
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					CMTSTUFF,
 					EXT,
@ -10688,7 +10727,8 @@
 					"$(TOPLEVEL)/lib-src/lv2/lilv/src/**",
 					"$(TOPLEVEL)/lib-src/lv2/serd/src/**",
 					"$(TOPLEVEL)/lib-src/lv2/sratom/src/**",
-					"$(TOPLEVEL)/lib-src/lv2/suil/**",
+					"$(TOPLEVEL)/lib-src/lv2/suil/build/**",
+					"$(TOPLEVEL)/lib-src/lv2/suil/src/**",
 				);
 				PRODUCT_NAME = lv2;
 			};
@ -10706,7 +10746,8 @@
 					"$(TOPLEVEL)/lib-src/lv2/lilv/src/**",
 					"$(TOPLEVEL)/lib-src/lv2/serd/src/**",
 					"$(TOPLEVEL)/lib-src/lv2/sratom/src/**",
-					"$(TOPLEVEL)/lib-src/lv2/suil/**",
+					"$(TOPLEVEL)/lib-src/lv2/suil/build/**",
+					"$(TOPLEVEL)/lib-src/lv2/suil/src/**",
 				);
 				PRODUCT_NAME = lv2;
 			};
@ -10724,7 +10765,8 @@
 					"$(TOPLEVEL)/lib-src/lv2/lilv/src/**",
 					"$(TOPLEVEL)/lib-src/lv2/serd/src/**",
 					"$(TOPLEVEL)/lib-src/lv2/sratom/src/**",
-					"$(TOPLEVEL)/lib-src/lv2/suil/**",
+					"$(TOPLEVEL)/lib-src/lv2/suil/build/**",
+					"$(TOPLEVEL)/lib-src/lv2/suil/src/**",
 				);
 				PRODUCT_NAME = lv2;
 			};
@ -10742,7 +10784,8 @@
 					"$(TOPLEVEL)/lib-src/lv2/lilv/src/**",
 					"$(TOPLEVEL)/lib-src/lv2/serd/src/**",
 					"$(TOPLEVEL)/lib-src/lv2/sratom/src/**",
-					"$(TOPLEVEL)/lib-src/lv2/suil/**",
+					"$(TOPLEVEL)/lib-src/lv2/suil/build/**",
+					"$(TOPLEVEL)/lib-src/lv2/suil/src/**",
 				);
 				PRODUCT_NAME = lv2;
 			};
@ -10976,6 +11019,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 2812A5B70DF63FE500576305 /* Debug_Shared.xcconfig */;
 			buildSettings = {
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					CMTSTUFF,
 					EXT,
@ -11295,6 +11339,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 2812A5BB0DF63FFD00576305 /* Release_Shared.xcconfig */;
 			buildSettings = {
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					CMTSTUFF,
 					EXT,
@ -11572,6 +11617,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 2812A5BD0DF6400E00576305 /* Release_Static.xcconfig */;
 			buildSettings = {
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					CMTSTUFF,
 					EXT,
--- a/src/Makefile.in
+++ b/src/Makefile.in
--- a/tests/Makefile.in
+++ b/tests/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@
@ -52,7 +79,9 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = SequenceTest$(EXEEXT) SimpleBlockFileTest$(EXEEXT)
 subdir = tests
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/autotools/depcomp \
+	$(top_srcdir)/autotools/test-driver
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c99_func_lrint.m4 \
 	$(top_srcdir)/m4/ac_c99_func_lrintf.m4 \
@ -105,24 +134,49 @@ SequenceTest_OBJECTS = $(am_SequenceTest_OBJECTS)
 am__DEPENDENCIES_1 =
 SequenceTest_DEPENDENCIES = $(top_srcdir)/src/libaudacity.la \
 	$(am__DEPENDENCIES_1)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
 am_SimpleBlockFileTest_OBJECTS =  \
 	SimpleBlockFileTest-SimpleBlockFileTest.$(OBJEXT)
 SimpleBlockFileTest_OBJECTS = $(am_SimpleBlockFileTest_OBJECTS)
 SimpleBlockFileTest_DEPENDENCIES = $(top_srcdir)/src/libaudacity.la \
 	$(am__DEPENDENCIES_1)
+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@ -I$(top_builddir)/src
 depcomp = $(SHELL) $(top_srcdir)/autotools/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(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 = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(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 = $(SequenceTest_SOURCES) $(SimpleBlockFileTest_SOURCES)
 DIST_SOURCES = $(SequenceTest_SOURCES) $(SimpleBlockFileTest_SOURCES)
 am__can_run_installinfo = \
@ -130,13 +184,233 @@ 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
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red='[0;31m'; \
+    grn='[0;32m'; \
+    lgn='[1;32m'; \
+    blu='[1;34m'; \
+    mgn='[0;35m'; \
+    brg='[1m'; \
+    std='[m'; \
+  fi; \
+}
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__recheck_rx = ^[ 	]*:recheck:[ 	]*
+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[ 	]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);					\
+$(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
+srcdir=$(srcdir); export srcdir;			\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
+if test -f "./$$f"; then dir=./;			\
+elif test -f "$$f"; then dir=;				\
+else dir="$(srcdir)/"; fi;				\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
+case " $(XFAIL_TESTS) " in				\
+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+AM_RECURSIVE_TARGETS = check recheck
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_DRIVER = $(SHELL) $(top_srcdir)/autotools/test-driver
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/autotools/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+	$(TEST_LOG_FLAGS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUDACITY_NAME = @AUDACITY_NAME@
 AUTOCONF = @AUTOCONF@
@ -366,7 +640,7 @@ EXTRA_DIST = \
 all: all-am

 .SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
+.SUFFIXES: .cpp .lo .log .o .obj .test .test$(EXEEXT) .trs
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@ -406,12 +680,14 @@ clean-checkPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
+
 SequenceTest$(EXEEXT): $(SequenceTest_OBJECTS) $(SequenceTest_DEPENDENCIES) $(EXTRA_SequenceTest_DEPENDENCIES) 
 	@rm -f SequenceTest$(EXEEXT)
-	$(CXXLINK) $(SequenceTest_OBJECTS) $(SequenceTest_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(CXXLINK) $(SequenceTest_OBJECTS) $(SequenceTest_LDADD) $(LIBS)
+
 SimpleBlockFileTest$(EXEEXT): $(SimpleBlockFileTest_OBJECTS) $(SimpleBlockFileTest_DEPENDENCIES) $(EXTRA_SimpleBlockFileTest_DEPENDENCIES) 
 	@rm -f SimpleBlockFileTest$(EXEEXT)
-	$(CXXLINK) $(SimpleBlockFileTest_OBJECTS) $(SimpleBlockFileTest_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(CXXLINK) $(SimpleBlockFileTest_OBJECTS) $(SimpleBlockFileTest_LDADD) $(LIBS)

 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@ -423,56 +699,56 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SimpleBlockFileTest-SimpleBlockFileTest.Po@am__quote@

 .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) '$<'`

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

 SequenceTest-SequenceTest.o: SequenceTest.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SequenceTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SequenceTest-SequenceTest.o -MD -MP -MF $(DEPDIR)/SequenceTest-SequenceTest.Tpo -c -o SequenceTest-SequenceTest.o `test -f 'SequenceTest.cpp' || echo '$(srcdir)/'`SequenceTest.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/SequenceTest-SequenceTest.Tpo $(DEPDIR)/SequenceTest-SequenceTest.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SequenceTest.cpp' object='SequenceTest-SequenceTest.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SequenceTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SequenceTest-SequenceTest.o -MD -MP -MF $(DEPDIR)/SequenceTest-SequenceTest.Tpo -c -o SequenceTest-SequenceTest.o `test -f 'SequenceTest.cpp' || echo '$(srcdir)/'`SequenceTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/SequenceTest-SequenceTest.Tpo $(DEPDIR)/SequenceTest-SequenceTest.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='SequenceTest.cpp' object='SequenceTest-SequenceTest.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SequenceTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SequenceTest-SequenceTest.o `test -f 'SequenceTest.cpp' || echo '$(srcdir)/'`SequenceTest.cpp
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SequenceTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SequenceTest-SequenceTest.o `test -f 'SequenceTest.cpp' || echo '$(srcdir)/'`SequenceTest.cpp

 SequenceTest-SequenceTest.obj: SequenceTest.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SequenceTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SequenceTest-SequenceTest.obj -MD -MP -MF $(DEPDIR)/SequenceTest-SequenceTest.Tpo -c -o SequenceTest-SequenceTest.obj `if test -f 'SequenceTest.cpp'; then $(CYGPATH_W) 'SequenceTest.cpp'; else $(CYGPATH_W) '$(srcdir)/SequenceTest.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/SequenceTest-SequenceTest.Tpo $(DEPDIR)/SequenceTest-SequenceTest.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SequenceTest.cpp' object='SequenceTest-SequenceTest.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SequenceTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SequenceTest-SequenceTest.obj -MD -MP -MF $(DEPDIR)/SequenceTest-SequenceTest.Tpo -c -o SequenceTest-SequenceTest.obj `if test -f 'SequenceTest.cpp'; then $(CYGPATH_W) 'SequenceTest.cpp'; else $(CYGPATH_W) '$(srcdir)/SequenceTest.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/SequenceTest-SequenceTest.Tpo $(DEPDIR)/SequenceTest-SequenceTest.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='SequenceTest.cpp' object='SequenceTest-SequenceTest.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SequenceTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SequenceTest-SequenceTest.obj `if test -f 'SequenceTest.cpp'; then $(CYGPATH_W) 'SequenceTest.cpp'; else $(CYGPATH_W) '$(srcdir)/SequenceTest.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SequenceTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SequenceTest-SequenceTest.obj `if test -f 'SequenceTest.cpp'; then $(CYGPATH_W) 'SequenceTest.cpp'; else $(CYGPATH_W) '$(srcdir)/SequenceTest.cpp'; fi`

 SimpleBlockFileTest-SimpleBlockFileTest.o: SimpleBlockFileTest.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SimpleBlockFileTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SimpleBlockFileTest-SimpleBlockFileTest.o -MD -MP -MF $(DEPDIR)/SimpleBlockFileTest-SimpleBlockFileTest.Tpo -c -o SimpleBlockFileTest-SimpleBlockFileTest.o `test -f 'SimpleBlockFileTest.cpp' || echo '$(srcdir)/'`SimpleBlockFileTest.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/SimpleBlockFileTest-SimpleBlockFileTest.Tpo $(DEPDIR)/SimpleBlockFileTest-SimpleBlockFileTest.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SimpleBlockFileTest.cpp' object='SimpleBlockFileTest-SimpleBlockFileTest.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SimpleBlockFileTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SimpleBlockFileTest-SimpleBlockFileTest.o -MD -MP -MF $(DEPDIR)/SimpleBlockFileTest-SimpleBlockFileTest.Tpo -c -o SimpleBlockFileTest-SimpleBlockFileTest.o `test -f 'SimpleBlockFileTest.cpp' || echo '$(srcdir)/'`SimpleBlockFileTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/SimpleBlockFileTest-SimpleBlockFileTest.Tpo $(DEPDIR)/SimpleBlockFileTest-SimpleBlockFileTest.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='SimpleBlockFileTest.cpp' object='SimpleBlockFileTest-SimpleBlockFileTest.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SimpleBlockFileTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SimpleBlockFileTest-SimpleBlockFileTest.o `test -f 'SimpleBlockFileTest.cpp' || echo '$(srcdir)/'`SimpleBlockFileTest.cpp
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SimpleBlockFileTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SimpleBlockFileTest-SimpleBlockFileTest.o `test -f 'SimpleBlockFileTest.cpp' || echo '$(srcdir)/'`SimpleBlockFileTest.cpp

 SimpleBlockFileTest-SimpleBlockFileTest.obj: SimpleBlockFileTest.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SimpleBlockFileTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SimpleBlockFileTest-SimpleBlockFileTest.obj -MD -MP -MF $(DEPDIR)/SimpleBlockFileTest-SimpleBlockFileTest.Tpo -c -o SimpleBlockFileTest-SimpleBlockFileTest.obj `if test -f 'SimpleBlockFileTest.cpp'; then $(CYGPATH_W) 'SimpleBlockFileTest.cpp'; else $(CYGPATH_W) '$(srcdir)/SimpleBlockFileTest.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/SimpleBlockFileTest-SimpleBlockFileTest.Tpo $(DEPDIR)/SimpleBlockFileTest-SimpleBlockFileTest.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SimpleBlockFileTest.cpp' object='SimpleBlockFileTest-SimpleBlockFileTest.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SimpleBlockFileTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SimpleBlockFileTest-SimpleBlockFileTest.obj -MD -MP -MF $(DEPDIR)/SimpleBlockFileTest-SimpleBlockFileTest.Tpo -c -o SimpleBlockFileTest-SimpleBlockFileTest.obj `if test -f 'SimpleBlockFileTest.cpp'; then $(CYGPATH_W) 'SimpleBlockFileTest.cpp'; else $(CYGPATH_W) '$(srcdir)/SimpleBlockFileTest.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/SimpleBlockFileTest-SimpleBlockFileTest.Tpo $(DEPDIR)/SimpleBlockFileTest-SimpleBlockFileTest.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='SimpleBlockFileTest.cpp' object='SimpleBlockFileTest-SimpleBlockFileTest.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SimpleBlockFileTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SimpleBlockFileTest-SimpleBlockFileTest.obj `if test -f 'SimpleBlockFileTest.cpp'; then $(CYGPATH_W) 'SimpleBlockFileTest.cpp'; else $(CYGPATH_W) '$(srcdir)/SimpleBlockFileTest.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SimpleBlockFileTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SimpleBlockFileTest-SimpleBlockFileTest.obj `if test -f 'SimpleBlockFileTest.cpp'; then $(CYGPATH_W) 'SimpleBlockFileTest.cpp'; else $(CYGPATH_W) '$(srcdir)/SimpleBlockFileTest.cpp'; fi`

 mostlyclean-libtool:
 	-rm -f *.lo
@ -480,26 +756,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs

-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; \
@ -511,15 +776,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
@ -528,102 +789,194 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+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

-check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
-	srcdir=$(srcdir); export srcdir; \
-	list=' $(TESTS) '; \
-	$(am__tty_colors); \
-	if test -n "$$list"; then \
-	  for tst in $$list; do \
-	    if test -f ./$$tst; then dir=./; \
-	    elif test -f $$tst; then dir=; \
-	    else dir="$(srcdir)/"; fi; \
-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xpass=`expr $$xpass + 1`; \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=XPASS; \
-	      ;; \
-	      *) \
-		col=$$grn; res=PASS; \
-	      ;; \
-	      esac; \
-	    elif test $$? -ne 77; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xfail=`expr $$xfail + 1`; \
-		col=$$lgn; res=XFAIL; \
-	      ;; \
-	      *) \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=FAIL; \
-	      ;; \
-	      esac; \
-	    else \
-	      skip=`expr $$skip + 1`; \
-	      col=$$blu; res=SKIP; \
-	    fi; \
-	    echo "$${col}$$res$${std}: $$tst"; \
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+	rm -f $< $@
+	$(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+	@:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+	@$(am__set_TESTS_bases); \
+	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+	redo_bases=`for i in $$bases; do \
+	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+	            done`; \
+	if test -n "$$redo_bases"; then \
+	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+	  if $(am__make_dryrun); then :; else \
+	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
+	  fi; \
+	fi; \
+	if test -n "$$am__remaking_logs"; then \
+	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+	       "recursion detected" >&2; \
+	else \
+	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	fi; \
+	if $(am__make_dryrun); then :; else \
+	  st=0;  \
+	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+	  for i in $$redo_bases; do \
+	    test -f $$i.trs && test -r $$i.trs \
+	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+	    test -f $$i.log && test -r $$i.log \
+	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
 	  done; \
-	  if test "$$all" -eq 1; then \
-	    tests="test"; \
-	    All=""; \
-	  else \
-	    tests="tests"; \
-	    All="All "; \
-	  fi; \
-	  if test "$$failed" -eq 0; then \
-	    if test "$$xfail" -eq 0; then \
-	      banner="$$All$$all $$tests passed"; \
+	  test $$st -eq 0 || exit 1; \
+	fi
+	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+	ws='[ 	]'; \
+	results=`for b in $$bases; do echo $$b.trs; done`; \
+	test -n "$$results" || results=/dev/null; \
+	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+	  success=true; \
+	else \
+	  success=false; \
+	fi; \
+	br='==================='; br=$$br$$br$$br$$br; \
+	result_count () \
+	{ \
+	    if test x"$$1" = x"--maybe-color"; then \
+	      maybe_colorize=yes; \
+	    elif test x"$$1" = x"--no-color"; then \
+	      maybe_colorize=no; \
 	    else \
-	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
 	    fi; \
-	  else \
-	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all $$tests failed"; \
+	    shift; \
+	    desc=$$1 count=$$2; \
+	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
+	      color_start=$$3 color_end=$$std; \
 	    else \
-	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+	      color_start= color_end=; \
 	    fi; \
-	  fi; \
-	  dashes="$$banner"; \
-	  skipped=""; \
-	  if test "$$skip" -ne 0; then \
-	    if test "$$skip" -eq 1; then \
-	      skipped="($$skip test was not run)"; \
-	    else \
-	      skipped="($$skip tests were not run)"; \
-	    fi; \
-	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$skipped"; \
-	  fi; \
-	  report=""; \
-	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
-	    report="Please report to $(PACKAGE_BUGREPORT)"; \
-	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$report"; \
-	  fi; \
-	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-	  if test "$$failed" -eq 0; then \
-	    col="$$grn"; \
-	  else \
-	    col="$$red"; \
-	  fi; \
-	  echo "$${col}$$dashes$${std}"; \
-	  echo "$${col}$$banner$${std}"; \
-	  test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
-	  test -z "$$report" || echo "$${col}$$report$${std}"; \
-	  echo "$${col}$$dashes$${std}"; \
-	  test "$$failed" -eq 0; \
-	else :; fi
+	    echo "$${color_start}# $$desc $$count$${color_end}"; \
+	}; \
+	create_testsuite_report () \
+	{ \
+	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
+	  result_count $$1 "PASS: " $$pass  "$$grn"; \
+	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
+	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+	  result_count $$1 "FAIL: " $$fail  "$$red"; \
+	  result_count $$1 "XPASS:" $$xpass "$$red"; \
+	  result_count $$1 "ERROR:" $$error "$$mgn"; \
+	}; \
+	{								\
+	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
+	    $(am__rst_title);						\
+	  create_testsuite_report --no-color;				\
+	  echo;								\
+	  echo ".. contents:: :depth: 2";				\
+	  echo;								\
+	  for b in $$bases; do echo $$b; done				\
+	    | $(am__create_global_log);					\
+	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
+	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
+	if $$success; then						\
+	  col="$$grn";							\
+	 else								\
+	  col="$$red";							\
+	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
+	fi;								\
+	echo "$${col}$$br$${std}"; 					\
+	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}$$br$${std}"; 					\
+	create_testsuite_report --maybe-color;				\
+	echo "$$col$$br$$std";						\
+	if $$success; then :; else					\
+	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
+	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
+	  fi;								\
+	  echo "$$col$$br$$std";					\
+	fi;								\
+	$$success || exit 1
+
+check-TESTS:
+	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+	exit $$?;
+recheck: all $(check_PROGRAMS)
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	bases=`for i in $$bases; do echo $$i; done \
+	         | $(am__list_recheck_tests)` || exit 1; \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	log_list=`echo $$log_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+	        am__force_recheck=am--force-recheck \
+	        TEST_LOGS="$$log_list"; \
+	exit $$?
+SequenceTest.log: SequenceTest$(EXEEXT)
+	@p='SequenceTest$(EXEEXT)'; \
+	b='SequenceTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+SimpleBlockFileTest.log: SimpleBlockFileTest$(EXEEXT)
+	@p='SimpleBlockFileTest$(EXEEXT)'; \
+	b='SimpleBlockFileTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+.test.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)

 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@ -681,6 +1034,9 @@ install-strip:
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
+	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)

 clean-generic:

@ -764,9 +1120,9 @@ uninstall-am:

 .MAKE: check-am install-am install-strip

-.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
-	clean-checkPROGRAMS clean-generic clean-libtool ctags \
-	distclean distclean-compile distclean-generic \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
+	clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \
+	ctags ctags-am distclean distclean-compile 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 \
@ -776,7 +1132,7 @@ uninstall-am:
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am
+	recheck tags tags-am uninstall uninstall-am


 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- a/win/Projects/libnyquist/libnyquist.vcxproj
+++ b/win/Projects/libnyquist/libnyquist.vcxproj
@ -194,17 +194,20 @@
    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\lpanal.c" />
    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\multiread.c" />
    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\multiseq.c" />
+    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\phasevocoder.c" />
+    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\pvshell.c" />
    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\resamp.c" />
    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\resampv.c" />
    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\samples.c" />
    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\seqext.c" />
    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\seqfnint.c" />
    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\seqinterf.c" />
-    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\sliders.c" />
+    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\sliderdata.c" />
    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\sndfnint.c" />
    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\sndmax.c" />
    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\sndread.c" />
    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\sndseq.c" />
+    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\sndsliders.c" />
    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\sndwritepa.c" />
    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\sound.c" />
    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\stats.c" />
@ -298,6 +301,7 @@
    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\tran\white.c" />
    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\xlisp\extern.c" />
    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\xlisp\path.c" />
+    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\xlisp\security.c" />
    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\xlisp\xlbfun.c" />
    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\xlisp\xlcont.c" />
    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\xlisp\xldbug.c" />
@ -370,6 +374,10 @@
    <ClInclude Include="..\..\..\lib-src\libnyquist\nyquist\ffts\src\fftext.h" />
    <ClInclude Include="..\..\..\lib-src\libnyquist\nyquist\ffts\src\fftlib.h" />
    <ClInclude Include="..\..\..\lib-src\libnyquist\nyquist\ffts\src\matlib.h" />
+    <ClInclude Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\phasevocoder.h" />
+    <ClInclude Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\pvshell.h" />
+    <ClInclude Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\sliderdata.h" />
+    <ClInclude Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\sndsliders.h" />
    <ClInclude Include="..\..\..\lib-src\libnyquist\nyx.h" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
--- a/win/Projects/libnyquist/libnyquist.vcxproj.filters
+++ b/win/Projects/libnyquist/libnyquist.vcxproj.filters
@ -159,9 +159,6 @@
    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\seqinterf.c">
      <Filter>nyquist\nyqsrc</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\sliders.c">
-      <Filter>nyquist\nyqsrc</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\sndfnint.c">
      <Filter>nyquist\nyqsrc</Filter>
    </ClCompile>
@ -635,6 +632,21 @@
    </ClCompile>
    <ClCompile Include="..\..\..\lib-src\libnyquist\nyx.c" />
    <ClCompile Include="..\..\..\lib-src\libnyquist\xlextstart.c" />
+    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\xlisp\security.c">
+      <Filter>nyquist\xlisp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\sndsliders.c">
+      <Filter>nyquist\nyqsrc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\sliderdata.c">
+      <Filter>nyquist\nyqsrc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\phasevocoder.c">
+      <Filter>nyquist\nyqsrc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\pvshell.c">
+      <Filter>nyquist\nyqsrc</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\..\..\lib-src\libnyquist\nyquist\ffts\src\fftext.h">
@ -647,5 +659,17 @@
      <Filter>nyquist\ffts</Filter>
    </ClInclude>
    <ClInclude Include="..\..\..\lib-src\libnyquist\nyx.h" />
+    <ClInclude Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\sndsliders.h">
+      <Filter>nyquist\nyqsrc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\sliderdata.h">
+      <Filter>nyquist\nyqsrc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\phasevocoder.h">
+      <Filter>nyquist\nyqsrc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\lib-src\libnyquist\nyquist\nyqsrc\pvshell.h">
+      <Filter>nyquist\nyqsrc</Filter>
+    </ClInclude>
  </ItemGroup>
 </Project>
--- a/win/Projects/libnyquist/seqfnint.c
+++ b/win/Projects/libnyquist/seqfnint.c
@ -1,249 +0,0 @@
-/* c:\documents and settings\administrator\my documents\audacity\win\projects\libnyquist\/seqfnint.c -- interface to  
- * cmt/seqdecls.h, nyqsrc/seqext.h, cmt/seq.h, 
- * nyqsrc/seqinterf.h, cmt/seqread.h, cmt/seqmread.h, 
- * cmt/seqwrite.h, cmt/seqmwrite.h */
-
-#ifndef mips
-#include "stdlib.h"
-#endif
-#include "xlisp.h"
-
-extern LVAL s_true;
-#define cvboolean(i) ((i) ? s_true : NIL)
-#define testarg2(e) (moreargs() ? (e) : (getflonum(xltoofew())))
-#define xlgaanynum() (floatp(*xlargv) ? getflonum(nextarg()) : \
-    (fixp(*xlargv) ? (double) getfixnum(nextarg()) : \
-        getflonum(xlbadtype(*xlargv))))
-#define getboolean(lval) ((lval) != NIL)
-
-extern LVAL RSLT_sym;
-
-
-#include "cmt/seqdecls.h"
-
-#include "nyqsrc/seqext.h"
-
-#include "cmt/seq.h"
-
-/* xlc_seq_reset -- interface to C routine seq_reset */
-/**/
-LVAL xlc_seq_reset(void)
-{
-    seq_type arg1 = getseq(xlgaseq());
-
-    xllastarg();
-    seq_reset(arg1);
-    return NIL;
-}
-
-
-/* xlc_seq_insert_ctrl -- interface to C routine insert_ctrl */
-/**/
-LVAL xlc_seq_insert_ctrl(void)
-{
-    seq_type arg1 = getseq(xlgaseq());
-    long arg2 = getfixnum(xlgafixnum());
-    long arg3 = getfixnum(xlgafixnum());
-    long arg4 = getfixnum(xlgafixnum());
-    long arg5 = getfixnum(xlgafixnum());
-    long arg6 = getfixnum(xlgafixnum());
-
-    xllastarg();
-    insert_ctrl(arg1, arg2, arg3, arg4, arg5, arg6);
-    return NIL;
-}
-
-
-/* xlc_seq_insert_ramp -- interface to C routine insert_ctrlramp */
-/**/
-LVAL xlc_seq_insert_ramp(void)
-{
-    seq_type arg1 = getseq(xlgaseq());
-    long arg2 = getfixnum(xlgafixnum());
-    long arg3 = getfixnum(xlgafixnum());
-    long arg4 = getfixnum(xlgafixnum());
-    long arg5 = getfixnum(xlgafixnum());
-    long arg6 = getfixnum(xlgafixnum());
-    long arg7 = getfixnum(xlgafixnum());
-    long arg8 = getfixnum(xlgafixnum());
-    long arg9 = getfixnum(xlgafixnum());
-
-    xllastarg();
-    insert_ctrlramp(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
-    return NIL;
-}
-
-
-/* xlc_seq_insert_macctrl -- interface to C routine insert_macctrl */
-/**/
-LVAL xlc_seq_insert_macctrl(void)
-{
-    seq_type arg1 = getseq(xlgaseq());
-    long arg2 = getfixnum(xlgafixnum());
-    long arg3 = getfixnum(xlgafixnum());
-    long arg4 = getfixnum(xlgafixnum());
-    long arg5 = getfixnum(xlgafixnum());
-    long arg6 = getfixnum(xlgafixnum());
-
-    xllastarg();
-    insert_macctrl(arg1, arg2, arg3, arg4, arg5, arg6);
-    return NIL;
-}
-
-
-/* xlc_seq_insert_note -- interface to C routine insert_note */
-/**/
-LVAL xlc_seq_insert_note(void)
-{
-    seq_type arg1 = getseq(xlgaseq());
-    long arg2 = getfixnum(xlgafixnum());
-    long arg3 = getfixnum(xlgafixnum());
-    long arg4 = getfixnum(xlgafixnum());
-    long arg5 = getfixnum(xlgafixnum());
-    long arg6 = getfixnum(xlgafixnum());
-    long arg7 = getfixnum(xlgafixnum());
-
-    xllastarg();
-    insert_note(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-    return NIL;
-}
-
-
-/* xlc_seq_copy -- interface to C routine seq_copy */
-/**/
-LVAL xlc_seq_copy(void)
-{
-    seq_type arg1 = getseq(xlgaseq());
-    seq_type result;
-
-    xllastarg();
-    result = seq_copy(arg1);
-    return cvseq(result);
-}
-
-
-/* xlc_seq_create -- interface to C routine seq_create */
-/**/
-LVAL xlc_seq_create(void)
-{
-    seq_type result;
-
-    xllastarg();
-    result = seq_create();
-    return cvseq(result);
-}
-
-
-#include "nyqsrc/seqinterf.h"
-
-/* xlc_seq_next -- interface to C routine seq_next */
-/**/
-LVAL xlc_seq_next(void)
-{
-    seq_type arg1 = getseq(xlgaseq());
-    boolean result;
-
-    xllastarg();
-    result = seq_next(arg1);
-    return cvboolean(result);
-}
-
-
-/* xlc_seq_get -- interface to C routine seq_get */
-/**/
-LVAL xlc_seq_get(void)
-{
-    seq_type arg1 = getseq(xlgaseq());
-    long arg2 = 0;
-    long arg3 = 0;
-    long arg4 = 0;
-    long arg5 = 0;
-    long arg6 = 0;
-    long arg7 = 0;
-    long arg8 = 0;
-    LVAL result;
-
-    xllastarg();
-    seq_get(arg1, &arg2, &arg3, &arg4, &arg5, &arg6, &arg7, &arg8);
-    {	LVAL *next = &getvalue(RSLT_sym);
-	*next = cons(NIL, NIL);
-	car(*next) = cvfixnum(arg2);	next = &cdr(*next);
-	*next = cons(NIL, NIL);
-	car(*next) = cvfixnum(arg3);	next = &cdr(*next);
-	*next = cons(NIL, NIL);
-	car(*next) = cvfixnum(arg4);	next = &cdr(*next);
-	*next = cons(NIL, NIL);
-	car(*next) = cvfixnum(arg5);	next = &cdr(*next);
-	*next = cons(NIL, NIL);
-	car(*next) = cvfixnum(arg6);	next = &cdr(*next);
-	*next = cons(NIL, NIL);
-	car(*next) = cvfixnum(arg7);	next = &cdr(*next);
-	*next = cons(NIL, NIL);
-	car(*next) = cvfixnum(arg8);
-    }
-    result = getvalue(RSLT_sym);
-    return result;
-}
-
-
-#include "cmt/seqread.h"
-
-/* xlc_seq_read -- interface to C routine seq_read */
-/**/
-LVAL xlc_seq_read(void)
-{
-    seq_type arg1 = getseq(xlgaseq());
-    FILE * arg2 = getfile(xlgastream());
-
-    xllastarg();
-    seq_read(arg1, arg2);
-    return NIL;
-}
-
-
-#include "cmt/seqmread.h"
-
-/* xlc_seq_read_smf -- interface to C routine seq_read_smf */
-/**/
-LVAL xlc_seq_read_smf(void)
-{
-    seq_type arg1 = getseq(xlgaseq());
-    FILE * arg2 = getfile(xlgastream());
-
-    xllastarg();
-    seq_read_smf(arg1, arg2);
-    return NIL;
-}
-
-
-#include "cmt/seqwrite.h"
-
-/* xlc_seq_write -- interface to C routine seq_write */
-/**/
-LVAL xlc_seq_write(void)
-{
-    seq_type arg1 = getseq(xlgaseq());
-    FILE * arg2 = getfile(xlgastream());
-    int arg3 = getboolean(xlgetarg());
-
-    xllastarg();
-    seq_write(arg1, arg2, arg3);
-    return NIL;
-}
-
-
-#include "cmt/seqmwrite.h"
-
-/* xlc_seq_write_smf -- interface to C routine seq_write_smf */
-/**/
-LVAL xlc_seq_write_smf(void)
-{
-    seq_type arg1 = getseq(xlgaseq());
-    FILE * arg2 = getfile(xlgastream());
-
-    xllastarg();
-    seq_write_smf(arg1, arg2);
-    return NIL;
-}
-
-
--- a/win/Projects/libnyquist/sndfnint.c
+++ b/win/Projects/libnyquist/sndfnint.c