Remove multistage recursion for the vidix subdirectory and recurse from the

top-level Makefile only.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22807 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2007-03-24 16:06:22 +00:00
parent 294744fec7
commit f4f37679b5
2 changed files with 2 additions and 13 deletions

View File

@ -102,7 +102,7 @@ PARTS-$(FAAD_INTERNAL) += libfaad2
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

View File

@ -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