From 4a3877c93ac469786ab704159b1a4744621daf73 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 9 Jul 2006 15:42:26 +0000 Subject: [PATCH] Simplify ASS handling. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18980 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 2ed2853e05..a9c053be51 100644 --- a/Makefile +++ b/Makefile @@ -82,12 +82,6 @@ ifeq ($(EXTERNAL_VIDIX),yes) VO_LIBS += $(EXTERNAL_VIDIX_LIB) endif -ASS_LIB = - -ifeq ($(CONFIG_ASS),yes) -ASS_LIB += libass/libass.a -endif - AO_LIBS = $(ARTS_LIB) \ $(ESD_LIB) \ $(JACK_LIB) \ @@ -119,7 +113,6 @@ COMMON_LIBS = libmpcodecs/libmpcodecs.a \ $(W32_LIB) \ libaf/libaf.a \ libmpdemux/libmpdemux.a \ - $(ASS_LIB) \ libswscale/libswscale.a \ osdep/libosdep.a \ $(DVDREAD_LIB) \ @@ -263,6 +256,7 @@ COMMON_DEPS += libmpdvdkit2/libmpdvdkit.a endif ifeq ($(CONFIG_ASS),yes) COMMON_DEPS += libass/libass.a +COMMON_LIBS += libass/libass.a PARTS += libass endif