Mercurial > mplayer.hg

changeset 18975:a670787e51af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify ASS handling.
author diego
date Sun, 09 Jul 2006 15:42:26 +0000
parents e9702c5cb0b6
children 6a08d0dabca8
files Makefile
diffstat 1 files changed, 1 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sun Jul 09 15:38:44 2006 +0000
+++ b/Makefile	Sun Jul 09 15:42:26 2006 +0000
@@ -82,12 +82,6 @@
 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 @@
               $(W32_LIB) \
               libaf/libaf.a \
               libmpdemux/libmpdemux.a \
-              $(ASS_LIB) \
               libswscale/libswscale.a \
               osdep/libosdep.a \
               $(DVDREAD_LIB) \
@@ -263,6 +256,7 @@
 endif
 ifeq ($(CONFIG_ASS),yes)
 COMMON_DEPS += libass/libass.a
+COMMON_LIBS += libass/libass.a
 PARTS += libass
 endif