Mercurial > mplayer.hg

changeset 30485:a26b7e0a8c8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix linking of liba52 test program when internal liba52 is disabled. Dependencies were only set correctly if internal liba52 was enabled.
author diego
date Mon, 08 Feb 2010 22:21:16 +0000
parents 0e067fdaf442
children 51db2b34b91c
files Makefile
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Mon Feb 08 10:14:42 2010 +0000
+++ b/Makefile	Mon Feb 08 22:21:16 2010 +0000
@@ -107,7 +107,7 @@
 SRCS_COMMON-$(JPEG)                  += libmpcodecs/vd_ijpg.c
 SRCS_COMMON-$(LADSPA)                += libaf/af_ladspa.c
 SRCS_COMMON-$(LIBA52)                += libmpcodecs/ad_liba52.c
-SRCS_COMMON-$(LIBA52_INTERNAL)       += liba52/crc.c \
+SRCS_LIBA52_INTERNAL                 += liba52/crc.c \
                                         liba52/resample.c \
                                         liba52/bit_allocate.c \
                                         liba52/bitstream.c \
@@ -115,6 +115,8 @@
                                         liba52/imdct.c \
                                         liba52/parse.c \
 
+SRCS_COMMON-$(LIBA52_INTERNAL)       += $(SRCS_LIBA52_INTERNAL)
+
 SRCS_COMMON-$(LIBASS)                += libmpcodecs/vf_ass.c \
                                         libass/ass_mp.c \
 
@@ -1005,7 +1007,7 @@
 codecs2html$(EXESUF): codec-cfg.c help_mp.h $(TEST_OBJS)
 	$(CC) -I. -DCODECS2HTML -o $@ $^
 
-liba52/test$(EXESUF): cpudetect.o $(filter liba52/%,$(SRCS_COMMON:.c=.o)) -lm
+liba52/test$(EXESUF): cpudetect.o $(SRCS_LIBA52_INTERNAL:.c=.o) -lm
 
 libvo/aspecttest$(EXESUF): libvo/aspect.o libvo/geometry.o $(TEST_OBJS)