summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-24 16:06:22 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-24 16:06:22 +0000
commitf4f37679b558184ec83d4c3946b483079a670b4f (patch)
tree09e619793329d619522d88d59347f7ff0d83e73d /Makefile
parent294744fec7032e1096800ae931c92315b8e9dfa7 (diff)
downloadmpv-f4f37679b558184ec83d4c3946b483079a670b4f.tar.bz2
mpv-f4f37679b558184ec83d4c3946b483079a670b4f.tar.xz
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
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index a0cc92f3f4..df623c64bd 100644
--- a/Makefile
+++ b/Makefile
@@ -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