From 167bafa26f06ed305da487cc01408a7e82336612 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 25 Apr 2007 08:38:04 +0000 Subject: cosmetics: Rename Makefile variable CONFIG_ASS --> ASS. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23111 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- configure | 2 +- libmpcodecs/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 7aed04708d..7a24064aeb 100644 --- a/Makefile +++ b/Makefile @@ -72,7 +72,7 @@ COMMON_LIBS-$(FAAD_INTERNAL) += libfaad2/libfaad2.a COMMON_LIBS-$(TREMOR_INTERNAL) += tremor/libvorbisidec.a COMMON_LIBS-$(DVDREAD_INTERNAL) += dvdread/libdvdread.a COMMON_LIBS-$(DVDCSS_INTERNAL) += libdvdcss/libdvdcss.a -COMMON_LIBS-$(CONFIG_ASS) += libass/libass.a +COMMON_LIBS-$(ASS) += libass/libass.a LIBS_MPLAYER = libvo/libvo.a \ libao2/libao2.a \ diff --git a/configure b/configure index dd9576d16b..67cb629d8e 100755 --- a/configure +++ b/configure @@ -7771,7 +7771,7 @@ CDDA = $_cdda CDDB = $_cddb BITMAP_FONT = $_bitmap_font FREETYPE = $_freetype -CONFIG_ASS = $_ass +ASS = $_ass LIBMAD = $_mad LIBVORBIS = $_vorbis LIBTHEORA = $_theora diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile index 827f9bd9f8..a6e6aacfbf 100644 --- a/libmpcodecs/Makefile +++ b/libmpcodecs/Makefile @@ -93,7 +93,6 @@ SRCS_COMMON = native/nuppelvideo.c \ vf_yuy2.c \ vf_yvu9.c \ -SRCS_COMMON-$(CONFIG_ASS) += vf_ass.c # These filters use private headers and do not work with shared libavcodec. SRCS_COMMON-$(LIBAVCODEC) += vf_fspp.c \ vf_geq.c \ @@ -102,6 +101,7 @@ SRCS_COMMON-$(LIBAVCODEC) += vf_fspp.c \ vf_spp.c \ vf_uspp.c \ +SRCS_COMMON-$(ASS) += vf_ass.c SRCS_COMMON-$(FAAD) += ad_faad.c SRCS_COMMON-$(HAVE_POSIX_SELECT) += vf_bmovl.c SRCS_COMMON-$(JPEG) += vd_ijpg.c -- cgit v1.2.3