summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-08-07 20:58:39 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-08-07 20:58:39 +0000
commitfafb459b3594f8b716ea9aa34f0fcf9168849bdb (patch)
treee140160758311852e5622872367194bc13d07b80
parent1e356eac98055061a00eb27283d16ab4aeab5258 (diff)
downloadmpv-fafb459b3594f8b716ea9aa34f0fcf9168849bdb.tar.bz2
mpv-fafb459b3594f8b716ea9aa34f0fcf9168849bdb.tar.xz
cosmetics: Rename TREMOR variable to TREMOR_INTERNAL for consistency.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19357 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--Makefile4
-rwxr-xr-xconfigure2
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index f4c5ee03f6..197695e5bb 100644
--- a/Makefile
+++ b/Makefile
@@ -185,7 +185,7 @@ endif
ifeq ($(LIBMENU),yes)
PARTS += libmenu
endif
-ifeq ($(TREMOR),yes)
+ifeq ($(TREMOR_INTERNAL),yes)
PARTS += tremor
endif
@@ -221,7 +221,7 @@ endif
ifeq ($(FAAD_INTERNAL),yes)
COMMON_DEPS += libfaad2/libfaad2.a
endif
-ifeq ($(TREMOR),yes)
+ifeq ($(TREMOR_INTERNAL),yes)
COMMON_DEPS += tremor/libvorbisidec.a
COMMON_LIBS += tremor/libvorbisidec.a
endif
diff --git a/configure b/configure
index 2874959a55..f022853f2e 100755
--- a/configure
+++ b/configure
@@ -7272,7 +7272,7 @@ LIBMENU = $_menu
MP3LIB = $_mp3lib
LIBA52 = $_liba52
LIBMPEG2 = $_libmpeg2
-TREMOR = $_tremor_internal
+TREMOR_INTERNAL = $_tremor_internal
TREMOR_FLAGS = $_tremor_flags
FAAD = $_faad