Fix FFmpeg DEPEND_CMD to account for latest changes and add MPDEPEND_CMD.

MPlayer needs a slightly modified incantation due to different levels
of Makefile indirection.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26348 b3059339-0415-0410-9bf9-f77b7e298cf2

2 files changed, 5 insertions, 3 deletions

diff --git a/configure b/configure
index 5135d3b3c2..da99423e75 100755
--- a/configure
+++ b/configure
@@ -7880,8 +7880,6 @@ CONFIG_MLIB = $_mlib
 CONFIG_SWSCALE=yes
 CONFIG_ZLIB=$_zlib
 
-DEPEND_CMD=\$(CC) -MM \$(CFLAGS) \$(filter-out %.h,$^) | sed "s,[0-9a-z._-]*: \(\$(SRC_DIR)/\)*\([a-z0-9]*/\)[^/]* ,\\2&,"
-
 HAVE_PTHREADS = $_pthreads
 HAVE_W32THREADS = $_w32threads
 HAVE_XVMC = $_xvmc
@@ -7893,6 +7891,10 @@ HAVE_XVMC = $_xvmc
 `echo $_libavmuxers | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
 `echo $_libavbsfs | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
 
+DEPEND_CMD   = \$(CC) -MM \$(CFLAGS) \$(filter-out %.h,\$$^) | sed "s,[0-9a-z._-]*: \(\$(SRC_DIR)/\)*\([a-z0-9]*/\)[^/]* ,\\2&,"
+
+MPDEPEND_CMD = \$(CC) -MM \$(CFLAGS) \$(filter-out %.h,$^) | sed "s,[0-9a-z._-]*: \(\$(SRC_DIR)/\)*\([a-z0-9]*/\)[^/]* ,\\2&,"
+
 EOF
 
 #############################################################################
diff --git a/mpcommon.mak b/mpcommon.mak
index 47b2ad104b..3d6f6ddfd9 100644
--- a/mpcommon.mak
+++ b/mpcommon.mak
@@ -28,7 +28,7 @@ distclean:: clean
 	rm -f .depend test test2
 
 dep depend:: $(SRCS_COMMON) $(SRCS_MPLAYER) $(SRCS_MENCODER)
-	$(DEPEND_CMD) > .depend
+	$(MPDEPEND_CMD) > .depend
 
 %.ho: %.h
 	$(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $<