[MPlayer-cvslog] r19488 - trunk/Makefile

[diego]

Author: diego
Date: Mon Aug 21 23:50:52 2006
New Revision: 19488

Modified:
   trunk/Makefile

Log:
Simplify VIDIX lib handling.


Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Mon Aug 21 23:50:52 2006
@@ -70,6 +70,9 @@
           $(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 @@
 
 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 @@
                libao2/libao2.a \
                input/libinput.a \
                $(MENU_LIBS) \
-               $(VIDIX_LIBS) \
                $(GUI_LIBS) \
                $(COMMON_LIBS) \
                $(VO_LIBS) \