spek

commit 91bb390bdb52b1245195e7ea62740abefa1f6cf7
parent 0e17c5ab06b68e786bec530e8cf43bbb105f26f7
Author: Alexander Kojevnikov <alexander@kojevnikov.com>
Date:   Thu, 24 Oct 2013 16:51:08 -0700

Separate checks for FFmpeg libraries

Diffstat:
M
configure.ac
 | 
5
++++-
M
src/Makefile.am
 | 
8
++++++--
M
tests/Makefile.am
 | 
13
+++++++------

3 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -8,6 +8,7 @@ AC_LANG([C++])
 AC_PROG_CXX
 CXXFLAGS="$CXXFLAGS -std=gnu++11 -Wall -Wextra"
 AC_PROG_CXXCPP
+AC_PROG_LIBTOOL
 AC_PROG_RANLIB
 AC_PROG_INSTALL
 IT_PROG_INTLTOOL([0.40.0])
@@ -45,7 +46,9 @@ AM_COND_IF([USE_VALGRIND], [use_valgrind=yes], [use_valgrind=no])
 
 AC_CHECK_LIB(m, log10)
 
-PKG_CHECK_MODULES(FFMPEG, [libavcodec >= 53.25 libavformat >= 53.17 libavutil >= 51.17])
+PKG_CHECK_MODULES(AVFORMAT, [libavformat >= 53.17])
+PKG_CHECK_MODULES(AVCODEC, [libavcodec >= 53.25])
+PKG_CHECK_MODULES(AVUTIL, [libavutil >= 51.17])
 
 AM_OPTIONS_WXCONFIG
 reqwx=2.8.0
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -18,7 +18,9 @@ libspek_a_CPPFLAGS = \
 	$(WX_CPPFLAGS)
 
 libspek_a_CXXFLAGS = \
-	$(FFMPEG_CFLAGS) \
+	$(AVFORMAT_CFLAGS) \
+	$(AVCODEC_CFLAGS) \
+	$(AVUTIL_CFLAGS) \
 	$(WX_CXXFLAGS_ONLY)
 
 bin_PROGRAMS = spek
@@ -52,7 +54,9 @@ spek_CXXFLAGS = \
 
 spek_LDADD = \
 	libspek.a \
-	$(FFMPEG_LIBS) \
+	$(AVFORMAT_LIBS) \
+	$(AVCODEC_LIBS) \
+	$(AVUTIL_LIBS) \
 	$(WX_LIBS)
 
 spek_LDFLAGS = \
diff --git a/tests/Makefile.am b/tests/Makefile.am
@@ -17,17 +17,18 @@ AM_CPPFLAGS = \
 	-include config.h \
 	-I$(top_srcdir)/src \
 	-DSAMPLES_DIR=\"$(srcdir)/samples\" \
-	-pthread \
-	$(WX_CPPFLAGS)
+	-pthread
 
 AM_CXXFLAGS = \
-	$(FFMPEG_CFLAGS) \
-	$(WX_CXXFLAGS_ONLY)
+	$(AVFORMAT_CFLAGS) \
+	$(AVCODEC_CFLAGS) \
+	$(AVUTIL_CFLAGS)
 
 LDADD = \
 	../src/libspek.a \
-	$(FFMPEG_LIBS) \
-	$(WX_LIBS)
+	$(AVFORMAT_LIBS) \
+	$(AVCODEC_LIBS) \
+	$(AVUTIL_LIBS)
 
 AM_LDFLAGS = \
 	-pthread