shithub: opus-tools

Download patch

ref: 5739b4028906a00eed50ff8c69a2b7d753693797
parent: 7c04034cd9a200f5ca3f7085319c507dad750368
author: Ron <ron@debian.org>
date: Sat Sep 7 14:48:59 EDT 2013

Don't overlink everything with flac

Only opusenc uses it at present.

--- a/Makefile.am
+++ b/Makefile.am
@@ -53,7 +53,8 @@
 
 opusenc_SOURCES = src/opus_header.c src/opusenc.c src/picture.c src/resample.c src/audio-in.c src/diag_range.c src/flac.c src/lpc.c win32/unicode_support.c
 opusenc_CPPFLAGS = $(AM_CPPFLAGS) $(resampler_CPPFLAGS)
-opusenc_LDADD = $(OGG_LIBS) $(OPUS_LIBS) $(LIBM)
+opusenc_CFLAGS = $(AM_CFLAGS) $(FLAC_CFLAGS)
+opusenc_LDADD = $(OPUS_LIBS) $(FLAC_LIBS) $(OGG_LIBS) $(LIBM)
 opusenc_MANS = man/opusenc.1
 
 opusdec_SOURCES = src/opus_header.c src/wav_io.c src/wave_out.c src/opusdec.c src/resample.c src/diag_range.c win32/unicode_support.c
--- a/configure.ac
+++ b/configure.ac
@@ -191,8 +191,6 @@
     )
    ])
 
-  CFLAGS="$FLAC_CFLAGS $CFLAGS"
-  LIBS="$FLAC_LIBS $LIBS"
   AC_DEFINE([HAVE_LIBFLAC],[1],[FLAC])
  ])