# HG changeset patch
# User diego
# Date 1174752382 0
# Node ID 12ae53050d941436e0014487972276cc08f02553
# Parent  16aa0544c85d4b6dd8b0439465db18a2a0faa009
Remove multistage recursion for the vidix subdirectory and recurse from the
top-level Makefile only.

diff -r 16aa0544c85d -r 12ae53050d94 Makefile
--- a/Makefile	Sat Mar 24 15:26:13 2007 +0000
+++ b/Makefile	Sat Mar 24 16:06:22 2007 +0000
@@ -102,7 +102,7 @@
 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 @@
 
 vidix/libvidix.a: libdha/libdha.so
 	$(MAKE) -C vidix
+	$(MAKE) -C vidix/drivers
 
 Gui/libgui.a:
 	$(MAKE) -C Gui
diff -r 16aa0544c85d -r 12ae53050d94 vidix/Makefile
--- a/vidix/Makefile	Sat Mar 24 15:26:13 2007 +0000
+++ b/vidix/Makefile	Sat Mar 24 16:06:22 2007 +0000
@@ -4,16 +4,4 @@
 
 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