[MPlayer-cvslog] r22807 - in trunk: Makefile vidix/Makefile

[diego]

Author: diego
Date: Sat Mar 24 17:06:22 2007
New Revision: 22807

Modified:
   trunk/Makefile
   trunk/vidix/Makefile

Log:
Remove multistage recursion for the vidix subdirectory and recurse from the
top-level Makefile only.


Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Sat Mar 24 17:06:22 2007
@@ -102,7 +102,7 @@ PARTS-$(FAAD_INTERNAL)            += lib
 COMMON_LIBS-$(TREMOR_INTERNAL)    += tremor/libvorbisidec.a
 PARTS-$(TREMOR_INTERNAL)          += tremor
 LIBS_MPLAYER-$(VIDIX)             += vidix/libvidix.a
-PARTS-$(VIDIX)                    += libdha vidix
+PARTS-$(VIDIX)                    += libdha vidix vidix/drivers
 COMMON_LIBS-$(DVDREAD_INTERNAL)   += dvdread/libdvdread.a
 PARTS-$(DVDREAD_INTERNAL)         += dvdread
 COMMON_LIBS-$(DVDCSS_INTERNAL)    += libdvdcss/libdvdcss.a
@@ -210,6 +210,7 @@ libdha/libdha.so:
 
 vidix/libvidix.a: libdha/libdha.so
 	$(MAKE) -C vidix
+	$(MAKE) -C vidix/drivers
 
 Gui/libgui.a:
 	$(MAKE) -C Gui

Modified: trunk/vidix/Makefile
==============================================================================
--- trunk/vidix/Makefile	(original)
+++ trunk/vidix/Makefile	Sat Mar 24 17:06:22 2007
@@ -4,16 +4,4 @@ LIBNAME_MPLAYER = libvidix.a
 
 SRCS_MPLAYER    = vidixlib.c
 
-libs:
-	$(MAKE) -C drivers
-
-clean::
-	$(MAKE) -C drivers clean
-
-distclean::
-	$(MAKE) -C drivers distclean
-
-dep depend::
-	$(MAKE) -C drivers depend
-
 include ../mpcommon.mak