summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-09 15:42:26 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-09 15:42:26 +0000
commit4a3877c93ac469786ab704159b1a4744621daf73 (patch)
tree8e956665524ccf1e901ff8d98e91e1db58bae424
parentdc5cf1cd928de1459208814621fc3da874dab5f4 (diff)
downloadmpv-4a3877c93ac469786ab704159b1a4744621daf73.tar.bz2
mpv-4a3877c93ac469786ab704159b1a4744621daf73.tar.xz
Simplify ASS handling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18980 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--Makefile8
1 files changed, 1 insertions, 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