ref: d52327c0de75b39aabbb58233d7c4065d708ab06
parent: a2cfb2e79eda64b644d9bebd66421bd9404570fe
author: cbagwell <cbagwell>
date: Sat Aug 2 10:18:53 EDT 2008
Link sndfile.c directly into all libraries that require it so we don't have to worry about rpath issues.
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -157,24 +157,33 @@
libsox_fmt_sndfile_la_SOURCES = sndfile.c
libsox_fmt_sndfile_la_CFLAGS = @SNDFILE_CFLAGS@
libsox_fmt_sndfile_la_LIBADD = libsox.la @SNDFILE_LIBS@
-libsox_fmt_caf_la_SOURCES = caf.c
-libsox_fmt_caf_la_LIBADD = libsox.la libsox_fmt_sndfile.la
-libsox_fmt_mat4_la_SOURCES = mat4.c
-libsox_fmt_mat4_la_LIBADD = libsox.la libsox_fmt_sndfile.la
-libsox_fmt_mat5_la_SOURCES = mat5.c
-libsox_fmt_mat5_la_LIBADD = libsox.la libsox_fmt_sndfile.la
-libsox_fmt_paf_la_SOURCES = paf.c
-libsox_fmt_paf_la_LIBADD = libsox.la libsox_fmt_sndfile.la
-libsox_fmt_fap_la_SOURCES = fap.c
-libsox_fmt_fap_la_LIBADD = libsox.la libsox_fmt_sndfile.la
-libsox_fmt_w64_la_SOURCES = w64.c
-libsox_fmt_w64_la_LIBADD = libsox.la libsox_fmt_sndfile.la
-libsox_fmt_xi_la_SOURCES = xi.c
-libsox_fmt_xi_la_LIBADD = libsox.la libsox_fmt_sndfile.la
-libsox_fmt_pvf_la_SOURCES = pvf.c
-libsox_fmt_pvf_la_LIBADD = libsox.la libsox_fmt_sndfile.la
-libsox_fmt_sd2_la_SOURCES = sd2.c
-libsox_fmt_sd2_la_LIBADD = libsox.la libsox_fmt_sndfile.la
+libsox_fmt_caf_la_SOURCES = caf.c sndfile.c
+libsox_fmt_caf_la_CFLAGS = @SNDFILE_CFLAGS@
+libsox_fmt_caf_la_LIBADD = libsox.la @SNDFILE_LIBS@
+libsox_fmt_mat4_la_SOURCES = mat4.c sndfile.c
+libsox_fmt_mat4_la_CFLAGS = @SNDFILE_CFLAGS@
+libsox_fmt_mat4_la_LIBADD = libsox.la @SNDFILE_LIBS@
+libsox_fmt_mat5_la_SOURCES = mat5.c sndfile.c
+libsox_fmt_mat5_la_CFLAGS = @SNDFILE_CFLAGS@
+libsox_fmt_mat5_la_LIBADD = libsox.la @SNDFILE_LIBS@
+libsox_fmt_paf_la_SOURCES = paf.c sndfile.c
+libsox_fmt_paf_la_CFLAGS = @SNDFILE_CFLAGS@
+libsox_fmt_paf_la_LIBADD = libsox.la @SNDFILE_LIBS@
+libsox_fmt_fap_la_SOURCES = fap.c sndfile.c
+libsox_fmt_fap_la_CFLAGS = @SNDFILE_CFLAGS@
+libsox_fmt_fap_la_LIBADD = libsox.la @SNDFILE_LIBS@
+libsox_fmt_w64_la_SOURCES = w64.c sndfile.c
+libsox_fmt_w64_la_CFLAGS = @SNDFILE_CFLAGS@
+libsox_fmt_w64_la_LIBADD = libsox.la @SNDFILE_LIBS@
+libsox_fmt_xi_la_SOURCES = xi.c sndfile.c
+libsox_fmt_wi_la_CFLAGS = @SNDFILE_CFLAGS@
+libsox_fmt_xi_la_LIBADD = libsox.la @SNDFILE_LIBS@
+libsox_fmt_pvf_la_SOURCES = pvf.c sndfile.c
+libsox_fmt_pvf_CFLAGS = @SNDFILE_CFLAGS@
+libsox_fmt_pvf_la_LIBADD = libsox.la @SNDFILE_LIBS@
+libsox_fmt_sd2_la_SOURCES = sd2.c sndfile.c
+libsox_fmt_sd2_CFLAGS = @SNDFILE_CFLAGS@
+libsox_fmt_sd2_la_LIBADD = libsox.la @SNDFILE_LIBS@
pkglib_LTLIBRARIES += libsox_fmt_sndfile.la libsox_fmt_caf.la libsox_fmt_mat4.la libsox_fmt_mat5.la libsox_fmt_paf.la libsox_fmt_fap.la libsox_fmt_w64.la libsox_fmt_xi.la libsox_fmt_pvf.la libsox_fmt_sd2.la
endif
if HAVE_AMRWB