Mercurial > mplayer.hg

changeset 22789:12ae53050d94

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove multistage recursion for the vidix subdirectory and recurse from the top-level Makefile only.
author diego
date Sat, 24 Mar 2007 16:06:22 +0000
parents 16aa0544c85d
children d1e8f85138e7
files Makefile vidix/Makefile
diffstat 2 files changed, 2 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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