Adjust build system for new Nyquist version

2025-11-24 06:10:09 +01:00 · 2019-12-16 01:00:43 -06:00
parent bd6ec9c0ed
commit 45c6a70d17
6 changed files with 211 additions and 41 deletions
--- a/lib-src/libnyquist/Makefile.am
+++ b/lib-src/libnyquist/Makefile.am
@@ -18,7 +18,8 @@ INC = \
   -I${srcdir}/nyquist/cmt \
   -I${srcdir}/nyquist/ffts/src \
   -I${srcdir}/nyquist/nyqstk/include \
-   -I${srcdir}/nyquist/nyqstk
+   -I${srcdir}/nyquist/nyqstk \
+   -I${srcdir}/nyquist/cmupv/src 

 AM_CFLAGS = $(INC) $(PORTAUDIO_CFLAGS) $(SNDFILE_CFLAGS) \
   -DCMTSTUFF -DEXT
@@ -75,6 +76,12 @@ libnyquist_a_SOURCES = \
   nyquist/cmt/timebase.h \
   nyquist/cmt/userio.c \
   nyquist/cmt/userio.h \
+   nyquist/cmupv/src/cmupv.c \
+   nyquist/cmupv/src/cmupv.h \
+   nyquist/cmupv/src/cmupvdbg.c \
+   nyquist/cmupv/src/cmupvdbg.h \
+   nyquist/cmupv/src/internal.c \
+   nyquist/cmupv/src/internal.h \
   nyquist/ffts/src/fftext.c \
   nyquist/ffts/src/fftext.h \
   nyquist/ffts/src/fftlib.c \
@@ -152,6 +159,8 @@ libnyquist_a_SOURCES = \
   nyquist/nyqsrc/sound.c \
   nyquist/nyqsrc/sound.h \
   nyquist/nyqsrc/stats.c \
+   nyquist/nyqsrc/stoponzero.c \
+   nyquist/nyqsrc/stoponzero.h \
   nyquist/nyqsrc/stdefs.h \
   nyquist/nyqsrc/trigger.c \
   nyquist/nyqsrc/trigger.h \
@@ -249,6 +258,8 @@ libnyquist_a_SOURCES = \
   nyquist/tran/alpasscv.c \
   nyquist/tran/alpasscv.h \
   nyquist/tran/alpass.h \
+   nyquist/tran/alpassvc.c \
+   nyquist/tran/alpassvc.h \
   nyquist/tran/alpassvv.c \
   nyquist/tran/alpassvv.h \
   nyquist/tran/amosc.c \
--- a/lib-src/libnyquist/Makefile.in
+++ b/lib-src/libnyquist/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -18,7 +18,17 @@
 # Written by Richard Ash following Gary Vaughan's Autobook

 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
  case $${target_option-} in \
      ?) ;; \
@@ -80,14 +90,6 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = .
-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 $(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 \
@@ -96,6 +98,8 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
@@ -147,6 +151,9 @@ am_libnyquist_a_OBJECTS = nyquist/cmt/cext.$(OBJEXT) \
 	nyquist/cmt/seqmwrite.$(OBJEXT) nyquist/cmt/seqread.$(OBJEXT) \
 	nyquist/cmt/seqwrite.$(OBJEXT) nyquist/cmt/tempomap.$(OBJEXT) \
 	nyquist/cmt/timebase.$(OBJEXT) nyquist/cmt/userio.$(OBJEXT) \
+	nyquist/cmupv/src/cmupv.$(OBJEXT) \
+	nyquist/cmupv/src/cmupvdbg.$(OBJEXT) \
+	nyquist/cmupv/src/internal.$(OBJEXT) \
 	nyquist/ffts/src/fftext.$(OBJEXT) \
 	nyquist/ffts/src/fftlib.$(OBJEXT) \
 	nyquist/ffts/src/matlib.$(OBJEXT) nyquist/nyqsrc/add.$(OBJEXT) \
@@ -177,6 +184,7 @@ am_libnyquist_a_OBJECTS = nyquist/cmt/cext.$(OBJEXT) \
 	nyquist/nyqsrc/sndsliders.$(OBJEXT) \
 	nyquist/nyqsrc/sndwritepa.$(OBJEXT) \
 	nyquist/nyqsrc/sound.$(OBJEXT) nyquist/nyqsrc/stats.$(OBJEXT) \
+	nyquist/nyqsrc/stoponzero.$(OBJEXT) \
 	nyquist/nyqsrc/trigger.$(OBJEXT) nyquist/nyqsrc/yin.$(OBJEXT) \
 	nyquist/nyqstk/instr.$(OBJEXT) \
 	nyquist/nyqstk/stkinit.$(OBJEXT) \
@@ -222,6 +230,7 @@ am_libnyquist_a_OBJECTS = nyquist/cmt/cext.$(OBJEXT) \
 	nyquist/nyqstk/src/WvIn.$(OBJEXT) nyquist/tran/abs.$(OBJEXT) \
 	nyquist/tran/allpoles.$(OBJEXT) nyquist/tran/alpass.$(OBJEXT) \
 	nyquist/tran/alpasscv.$(OBJEXT) \
+	nyquist/tran/alpassvc.$(OBJEXT) \
 	nyquist/tran/alpassvv.$(OBJEXT) nyquist/tran/amosc.$(OBJEXT) \
 	nyquist/tran/areson.$(OBJEXT) nyquist/tran/aresoncv.$(OBJEXT) \
 	nyquist/tran/aresonvc.$(OBJEXT) \
@@ -353,6 +362,13 @@ ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
 AM_RECURSIVE_TARGETS = cscope
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/autotools/ar-lib \
+	$(top_srcdir)/autotools/compile \
+	$(top_srcdir)/autotools/depcomp \
+	$(top_srcdir)/autotools/install-sh \
+	$(top_srcdir)/autotools/missing autotools/ar-lib \
+	autotools/compile autotools/depcomp autotools/install-sh \
+	autotools/missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -458,6 +474,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -481,7 +498,8 @@ INC = \
   -I${srcdir}/nyquist/cmt \
   -I${srcdir}/nyquist/ffts/src \
   -I${srcdir}/nyquist/nyqstk/include \
-   -I${srcdir}/nyquist/nyqstk
+   -I${srcdir}/nyquist/nyqstk \
+   -I${srcdir}/nyquist/cmupv/src 

 AM_CFLAGS = $(INC) $(PORTAUDIO_CFLAGS) $(SNDFILE_CFLAGS) \
   -DCMTSTUFF -DEXT
@@ -539,6 +557,12 @@ libnyquist_a_SOURCES = \
   nyquist/cmt/timebase.h \
   nyquist/cmt/userio.c \
   nyquist/cmt/userio.h \
+   nyquist/cmupv/src/cmupv.c \
+   nyquist/cmupv/src/cmupv.h \
+   nyquist/cmupv/src/cmupvdbg.c \
+   nyquist/cmupv/src/cmupvdbg.h \
+   nyquist/cmupv/src/internal.c \
+   nyquist/cmupv/src/internal.h \
   nyquist/ffts/src/fftext.c \
   nyquist/ffts/src/fftext.h \
   nyquist/ffts/src/fftlib.c \
@@ -616,6 +640,8 @@ libnyquist_a_SOURCES = \
   nyquist/nyqsrc/sound.c \
   nyquist/nyqsrc/sound.h \
   nyquist/nyqsrc/stats.c \
+   nyquist/nyqsrc/stoponzero.c \
+   nyquist/nyqsrc/stoponzero.h \
   nyquist/nyqsrc/stdefs.h \
   nyquist/nyqsrc/trigger.c \
   nyquist/nyqsrc/trigger.h \
@@ -713,6 +739,8 @@ libnyquist_a_SOURCES = \
   nyquist/tran/alpasscv.c \
   nyquist/tran/alpasscv.h \
   nyquist/tran/alpass.h \
+   nyquist/tran/alpassvc.c \
+   nyquist/tran/alpassvc.h \
   nyquist/tran/alpassvv.c \
   nyquist/tran/alpassvv.h \
   nyquist/tran/amosc.c \
@@ -1082,7 +1110,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -1172,6 +1199,20 @@ nyquist/cmt/timebase.$(OBJEXT): nyquist/cmt/$(am__dirstamp) \
 	nyquist/cmt/$(DEPDIR)/$(am__dirstamp)
 nyquist/cmt/userio.$(OBJEXT): nyquist/cmt/$(am__dirstamp) \
 	nyquist/cmt/$(DEPDIR)/$(am__dirstamp)
+nyquist/cmupv/src/$(am__dirstamp):
+	@$(MKDIR_P) nyquist/cmupv/src
+	@: > nyquist/cmupv/src/$(am__dirstamp)
+nyquist/cmupv/src/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) nyquist/cmupv/src/$(DEPDIR)
+	@: > nyquist/cmupv/src/$(DEPDIR)/$(am__dirstamp)
+nyquist/cmupv/src/cmupv.$(OBJEXT): nyquist/cmupv/src/$(am__dirstamp) \
+	nyquist/cmupv/src/$(DEPDIR)/$(am__dirstamp)
+nyquist/cmupv/src/cmupvdbg.$(OBJEXT):  \
+	nyquist/cmupv/src/$(am__dirstamp) \
+	nyquist/cmupv/src/$(DEPDIR)/$(am__dirstamp)
+nyquist/cmupv/src/internal.$(OBJEXT):  \
+	nyquist/cmupv/src/$(am__dirstamp) \
+	nyquist/cmupv/src/$(DEPDIR)/$(am__dirstamp)
 nyquist/ffts/src/$(am__dirstamp):
 	@$(MKDIR_P) nyquist/ffts/src
 	@: > nyquist/ffts/src/$(am__dirstamp)
@@ -1254,6 +1295,8 @@ nyquist/nyqsrc/sound.$(OBJEXT): nyquist/nyqsrc/$(am__dirstamp) \
 	nyquist/nyqsrc/$(DEPDIR)/$(am__dirstamp)
 nyquist/nyqsrc/stats.$(OBJEXT): nyquist/nyqsrc/$(am__dirstamp) \
 	nyquist/nyqsrc/$(DEPDIR)/$(am__dirstamp)
+nyquist/nyqsrc/stoponzero.$(OBJEXT): nyquist/nyqsrc/$(am__dirstamp) \
+	nyquist/nyqsrc/$(DEPDIR)/$(am__dirstamp)
 nyquist/nyqsrc/trigger.$(OBJEXT): nyquist/nyqsrc/$(am__dirstamp) \
 	nyquist/nyqsrc/$(DEPDIR)/$(am__dirstamp)
 nyquist/nyqsrc/yin.$(OBJEXT): nyquist/nyqsrc/$(am__dirstamp) \
@@ -1403,6 +1446,8 @@ nyquist/tran/alpass.$(OBJEXT): nyquist/tran/$(am__dirstamp) \
 	nyquist/tran/$(DEPDIR)/$(am__dirstamp)
 nyquist/tran/alpasscv.$(OBJEXT): nyquist/tran/$(am__dirstamp) \
 	nyquist/tran/$(DEPDIR)/$(am__dirstamp)
+nyquist/tran/alpassvc.$(OBJEXT): nyquist/tran/$(am__dirstamp) \
+	nyquist/tran/$(DEPDIR)/$(am__dirstamp)
 nyquist/tran/alpassvv.$(OBJEXT): nyquist/tran/$(am__dirstamp) \
 	nyquist/tran/$(DEPDIR)/$(am__dirstamp)
 nyquist/tran/amosc.$(OBJEXT): nyquist/tran/$(am__dirstamp) \
@@ -1620,6 +1665,7 @@ libnyquist.a: $(libnyquist_a_OBJECTS) $(libnyquist_a_DEPENDENCIES) $(EXTRA_libny
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 	-rm -f nyquist/cmt/*.$(OBJEXT)
+	-rm -f nyquist/cmupv/src/*.$(OBJEXT)
 	-rm -f nyquist/ffts/src/*.$(OBJEXT)
 	-rm -f nyquist/nyqsrc/*.$(OBJEXT)
 	-rm -f nyquist/nyqstk/*.$(OBJEXT)
@@ -1648,6 +1694,9 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/cmt/$(DEPDIR)/tempomap.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/cmt/$(DEPDIR)/timebase.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/cmt/$(DEPDIR)/userio.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@nyquist/cmupv/src/$(DEPDIR)/cmupv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@nyquist/cmupv/src/$(DEPDIR)/cmupvdbg.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@nyquist/cmupv/src/$(DEPDIR)/internal.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/ffts/src/$(DEPDIR)/fftext.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/ffts/src/$(DEPDIR)/fftlib.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/ffts/src/$(DEPDIR)/matlib.Po@am__quote@
@@ -1683,6 +1732,7 @@ distclean-compile:
@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@
+@AMDEP_TRUE@@am__include@ @am__quote@nyquist/nyqsrc/$(DEPDIR)/stoponzero.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/nyqsrc/$(DEPDIR)/trigger.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/nyqsrc/$(DEPDIR)/yin.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/nyqstk/$(DEPDIR)/instr.Po@am__quote@
@@ -1731,6 +1781,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/tran/$(DEPDIR)/allpoles.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/tran/$(DEPDIR)/alpass.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/tran/$(DEPDIR)/alpasscv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@nyquist/tran/$(DEPDIR)/alpassvc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/tran/$(DEPDIR)/alpassvv.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/tran/$(DEPDIR)/amosc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@nyquist/tran/$(DEPDIR)/areson.Po@am__quote@
@@ -1964,7 +2015,7 @@ distdir: $(DISTFILES)
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
 	$(am__post_remove_distdir)

 dist-bzip2: distdir
@@ -1980,17 +2031,17 @@ dist-xz: distdir
 	$(am__post_remove_distdir)

 dist-tarZ: distdir
-	@echo WARNING: "Support for shar distribution archives is" \
-	               "deprecated." >&2
+	@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
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__post_remove_distdir)

 dist-shar: distdir
-	@echo WARNING: "Support for distribution archives compressed with" \
-		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "Support for shar distribution archives 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
+	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)

 dist-zip: distdir
@@ -2008,7 +2059,7 @@ dist dist-all:
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lz*) \
@@ -2018,23 +2069,23 @@ distcheck: dist
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
 	chmod -R a-w $(distdir)
 	chmod u+w $(distdir)
-	mkdir $(distdir)/_build $(distdir)/_inst
+	mkdir $(distdir)/_build $(distdir)/_build/sub $(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 \
+	  && $(am__cd) $(distdir)/_build/sub \
+	  && ../../configure \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	    --srcdir=.. --prefix="$$dc_install_base" \
+	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -2122,6 +2173,8 @@ distclean-generic:
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 	-rm -f nyquist/cmt/$(DEPDIR)/$(am__dirstamp)
 	-rm -f nyquist/cmt/$(am__dirstamp)
+	-rm -f nyquist/cmupv/src/$(DEPDIR)/$(am__dirstamp)
+	-rm -f nyquist/cmupv/src/$(am__dirstamp)
 	-rm -f nyquist/ffts/src/$(DEPDIR)/$(am__dirstamp)
 	-rm -f nyquist/ffts/src/$(am__dirstamp)
 	-rm -f nyquist/nyqsrc/$(DEPDIR)/$(am__dirstamp)
@@ -2145,7 +2198,7 @@ clean-am: clean-generic clean-libLIBRARIES mostlyclean-am

 distclean: distclean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf ./$(DEPDIR) nyquist/cmt/$(DEPDIR) nyquist/ffts/src/$(DEPDIR) nyquist/nyqsrc/$(DEPDIR) nyquist/nyqstk/$(DEPDIR) nyquist/nyqstk/src/$(DEPDIR) nyquist/tran/$(DEPDIR) nyquist/xlisp/$(DEPDIR)
+	-rm -rf ./$(DEPDIR) nyquist/cmt/$(DEPDIR) nyquist/cmupv/src/$(DEPDIR) nyquist/ffts/src/$(DEPDIR) nyquist/nyqsrc/$(DEPDIR) nyquist/nyqstk/$(DEPDIR) nyquist/nyqstk/src/$(DEPDIR) nyquist/tran/$(DEPDIR) nyquist/xlisp/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -2193,7 +2246,7 @@ installcheck-am:
 maintainer-clean: maintainer-clean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf ./$(DEPDIR) nyquist/cmt/$(DEPDIR) nyquist/ffts/src/$(DEPDIR) nyquist/nyqsrc/$(DEPDIR) nyquist/nyqstk/$(DEPDIR) nyquist/nyqstk/src/$(DEPDIR) nyquist/tran/$(DEPDIR) nyquist/xlisp/$(DEPDIR)
+	-rm -rf ./$(DEPDIR) nyquist/cmt/$(DEPDIR) nyquist/cmupv/src/$(DEPDIR) nyquist/ffts/src/$(DEPDIR) nyquist/nyqsrc/$(DEPDIR) nyquist/nyqstk/$(DEPDIR) nyquist/nyqstk/src/$(DEPDIR) nyquist/tran/$(DEPDIR) nyquist/xlisp/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic

@@ -2229,6 +2282,8 @@ uninstall-am: uninstall-libLIBRARIES
 	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
 	tags tags-am uninstall uninstall-am uninstall-libLIBRARIES

+.PRECIOUS: Makefile
+

 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/lib-src/libnyquist/configure
+++ b/lib-src/libnyquist/configure
@@ -703,6 +703,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -780,6 +781,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1032,6 +1034,15 @@ do
  | -silent | --silent | --silen | --sile | --sil)
    silent=yes ;;

+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
    ac_prev=sbindir ;;
  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1169,7 +1180,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
  eval ac_val=\$$ac_var
  # Remove trailing slashes.
@@ -1322,6 +1333,7 @@ Fine tuning of the installation directories:
  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
  --libdir=DIR            object code libraries [EPREFIX/lib]
  --includedir=DIR        C header files [PREFIX/include]
  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -2282,7 +2294,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.

 # which also contains a subdir containing macros

-am__api_version='1.14'
+am__api_version='1.15'

 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -2454,8 +2466,8 @@ test "$program_suffix" != NONE &&
 ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`

-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`

 if test x"${MISSING+set}" != xset; then
  case $am_aux_dir in
@@ -2474,7 +2486,7 @@ else
 $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi

-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
  case $am_aux_dir in
  *\ * | *\	*)
    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -2802,8 +2814,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 mkdir_p='$(MKDIR_P)'

-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
 # Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AMTAR='$${TAR-tar}'
@@ -2861,6 +2873,7 @@ END
  fi
 fi

+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
    # Check whether --enable-maintainer-mode was given.