summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile3
-rw-r--r--vidix/Makefile12
2 files changed, 2 insertions, 13 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
diff --git a/vidix/Makefile b/vidix/Makefile
index bad801ea10..a73b4f4e1a 100644
--- a/vidix/Makefile
+++ b/vidix/Makefile
@@ -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