use-system-sndfile

===================================================================

Gbp-Pq: Name use-system-sndfile.patch

1 files changed, 4 insertions, 37 deletions

diff --git a/sys/unix/nonalsa/Makefile b/sys/unix/nonalsa/Makefile
index 18de908..3b94fe0 100644
--- a/sys/unix/nonalsa/Makefile
+++ b/sys/unix/nonalsa/Makefile
@@ -53,11 +53,11 @@ jnyqide/jNyqIDE.jar: $(JAVASRC)
 INCL = -Inyqsrc -Itran -Ixlisp -Isys/unix -Icmt -Iffts/src \
    -Inyqstk/include -Inyqstk -Iportaudio/include -Iportaudio/src/common \
    -Iportaudio/src/os/unix \
-   -Iliblo -Inylsf
+   -Iliblo
 
 # system dependent stuff for nonalsa:
 
-AUDIOLIBS =
+AUDIOLIBS = -lsndfile
 
 CC = gcc
 
@@ -143,40 +143,7 @@ OBJECTS = xlisp/extern.o xlisp/xldmem.o  \
 	cmt/seqmread.o cmt/seqmwrite.o  \
 	cmt/seqread.o cmt/seqwrite.o  \
 	cmt/tempomap.o cmt/timebase.o  \
-	cmt/userio.o nylsf/aiff.o  \
-	nylsf/alaw.o nylsf/au.o  \
-	nylsf/avr.o nylsf/broadcast.o  \
-	nylsf/caf.o nylsf/command.o  \
-	nylsf/common.o nylsf/dither.o  \
-	nylsf/double64.o nylsf/dwd.o  \
-	nylsf/dwvw.o nylsf/file_io.o  \
-	nylsf/flac.o nylsf/float32.o  \
-	nylsf/gsm610.o nylsf/htk.o  \
-	nylsf/ima_adpcm.o nylsf/interleave.o  \
-	nylsf/ircam.o nylsf/macbinary3.o  \
-	nylsf/macos.o nylsf/mat4.o  \
-	nylsf/mat5.o nylsf/ms_adpcm.o  \
-	nylsf/nist.o nylsf/ogg.o  \
-	nylsf/paf.o nylsf/pcm.o  \
-	nylsf/pvf.o nylsf/raw.o  \
-	nylsf/rx2.o nylsf/sd2.o  \
-	nylsf/sds.o nylsf/sndfile.o  \
-	nylsf/strings.o nylsf/svx.o  \
-	nylsf/txw.o nylsf/ulaw.o  \
-	nylsf/voc.o nylsf/vox_adpcm.o  \
-	nylsf/w64.o nylsf/wav.o  \
-	nylsf/wav_w64.o nylsf/wve.o  \
-	nylsf/xi.o nylsf/g72x.o  \
-	nylsf/GSM610/add.o nylsf/GSM610/code.o  \
-	nylsf/GSM610/decode.o nylsf/GSM610/gsm_create.o  \
-	nylsf/GSM610/gsm_decode.o nylsf/GSM610/gsm_destroy.o  \
-	nylsf/GSM610/gsm_encode.o nylsf/GSM610/gsm_option.o  \
-	nylsf/GSM610/long_term.o nylsf/GSM610/lpc.o  \
-	nylsf/GSM610/preprocess.o nylsf/GSM610/rpe.o  \
-	nylsf/GSM610/short_term.o nylsf/GSM610/table.o  \
-	nylsf/G72x/g721.o nylsf/G72x/g723_16.o  \
-	nylsf/G72x/g723_24.o nylsf/G72x/g723_40.o  \
-	nylsf/G72x/g72x.o nyqsrc/debug.o  \
+	cmt/userio.o nyqsrc/debug.o  \
 	nyqsrc/falloc.o nyqsrc/local.o  \
 	nyqsrc/handlers.o nyqsrc/multiread.o  \
 	nyqsrc/seqext.o nyqsrc/seqinterf.o  \
@@ -219,7 +186,7 @@ OBJECTS = xlisp/extern.o xlisp/xldmem.o  \
 	sys/unix/osstuff.o sys/unix/term.o 
 
 # Sound functions to add to xlisp
-NYQHDRS = nyqsrc/sndfmt.h nylsf/sndfile.h  \
+NYQHDRS = nyqsrc/sndfmt.h /usr/include/sndfile.h \
 	nyqsrc/sound.h nyqsrc/add.h  \
 	nyqsrc/avg.h nyqsrc/compose.h  \
 	nyqsrc/convolve.h nyqsrc/downsample.h  \