From 539cb1eb346ce6a607b20e55da2daec2a334ec79 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 21 Aug 2006 21:50:52 +0000
Subject: Simplify VIDIX lib handling.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19488 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 Makefile | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 197695e5bb..0caa5279cd 100644
--- a/Makefile
+++ b/Makefile
@@ -70,6 +70,9 @@ VO_LIBS = $(AA_LIB) \
           $(CACA_LIB) \
 	  $(VESA_LIB) \
 
+ifeq ($(VIDIX),yes)
+VO_LIBS += vidix/libvidix.a
+endif
 ifeq ($(EXTERNAL_VIDIX),yes)
 VO_LIBS += $(EXTERNAL_VIDIX_LIB)
 endif
@@ -355,12 +358,6 @@ endif
 
 MENCODER_DEP = $(OBJS_MENCODER) $(COMMON_DEPS) libmpcodecs/libmpencoders.a
 
-ifeq ($(VIDIX),yes)
-VIDIX_LIBS = vidix/libvidix.a
-else
-VIDIX_LIBS =
-endif
-
 ifeq ($(TARGET_WIN32),yes)
 OBJS_MPLAYER += osdep/mplayer-rc.o
 endif
@@ -369,7 +366,6 @@ LIBS_MPLAYER = libvo/libvo.a \
                libao2/libao2.a \
                input/libinput.a \
                $(MENU_LIBS) \
-               $(VIDIX_LIBS) \
                $(GUI_LIBS) \
                $(COMMON_LIBS) \
                $(VO_LIBS) \
-- 
cgit v1.2.3