From 21b6b9af3c4947c9625541691b1ac090f8f94ee9 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 27 Nov 2006 01:17:22 +0000 Subject: FFmpeg-style conditional dependency declaration git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21301 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/Makefile | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) (limited to 'libvo') diff --git a/libvo/Makefile b/libvo/Makefile index 0d26eb1ce5..77e5100966 100644 --- a/libvo/Makefile +++ b/libvo/Makefile @@ -18,33 +18,26 @@ SRCS=aspect.c \ vo_yuv4mpeg.c \ $(VO_SRCS) \ +SRCS-$(EXTERNAL_VIDIX) += vosub_vidix.c +SRCS-$(VIDIX) += vosub_vidix.c + SRCS2 = aclib.c \ osd.c \ sub.c \ -ifeq ($(CONFIG_LIBAVUTIL),yes) -LIBAV_INC += -I../libavutil -endif +SRCS2-$(BITMAP_FONT) += font_load.c +SRCS2-$(FREETYPE) += font_load_ft.c OBJS_TEMP=$(basename $(SRCS)) OBJS=$(OBJS_TEMP:%=%.o) OBJS2=$(SRCS2:.c=.o) -ifeq ($(BITMAP_FONT),yes) -SRCS2 += font_load.c -endif -ifeq ($(FREETYPE),yes) -SRCS2 += font_load_ft.c -endif +LIBAV_INC-$(CONFIG_LIBAVUTIL) += -I../libavutil -ifeq ($(VIDIX),yes) -SRCS += vosub_vidix.c -endif - -ifeq ($(EXTERNAL_VIDIX),yes) -SRCS += vosub_vidix.c -endif +SRCS += $(SRCS-yes) +SRCS2 += $(SRCS2-yes) +LIBAV_INC += $(LIBAV_INC-yes) CFLAGS = -I.. -I../osdep $(LIBAV_INC) -- cgit v1.2.3