[MPlayer-cvslog] r30527 - trunk/Makefile

[diego]

Author: diego
Date: Mon Feb  8 23:21:16 2010
New Revision: 30527

Log:
Fix linking of liba52 test program when internal liba52 is disabled.

Modified:
   trunk/Makefile

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Mon Feb  8 11:14:42 2010	(r30526)
+++ trunk/Makefile	Mon Feb  8 23:21:16 2010	(r30527)
@@ -107,7 +107,7 @@ SRCS_COMMON-$(HAVE_SYS_MMAN_H)       += 
 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 @@ SRCS_COMMON-$(LIBA52_INTERNAL)       += 
                                         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 @@ codec-cfg-test$(EXESUF): codec-cfg.c cod
 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)