1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38
|
Author: Andreas Tille <tille@debian.org>
Date: Thu, 24 Mar 2011 15:02:45 +0100
Last-Changed: Mon, 24 Feb 2014 15:30:19 +0100
Description: Make sure -lavcodec and -lavutil
is propagated to the linker
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,12 +24,11 @@ AM_CFLAGS = \
$(GSL_CFLAGS) \
$(LIBFAME_CFLAGS) \
$(AMIDE_GTK_CFLAGS) \
- $(AMIDE_DEBUG_CFLAGS) \
$(AMIDE_CHECK_OBSOLETE_CFLAGS) \
$(AMIDE_LIBDCMDATA_CFLAGS) \
- -I/usr/local/include \
$(XMEDCON_CFLAGS) \
- $(FFMPEG_CFLAGS)
+ $(LIBAVCODEC_CFLAGS) \
+ -DG_DISABLE_DEPRECATED
@@ -42,12 +41,11 @@ bin_PROGRAMS = amide
# to be behind the DCMTK stuff
amide_LDADD = \
$(GSL_LIBS) \
- $(LIBFAME_LIBS) \
$(AMIDE_LIBECAT_LIBS) \
$(AMIDE_LIBVOLPACK_LIBS) \
$(AMIDE_GTK_LIBS) \
$(XMEDCON_LIBS) \
- $(FFMPEG_LIBS) \
+ $(LIBAVCODEC_LIBS) \
$(AMIDE_LIBDCMDATA_LIBS) \
$(AMIDE_LDADD_WIN32)
|