Mercurial > mplayer.hg
changeset 26316:7abf7a9345d9
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.
| author | diego |
|---|---|
| date | Mon, 07 Apr 2008 23:49:39 +0000 |
| parents | a80f0a7d73f4 |
| children | 955f4b8ac094 |
| files | configure mpcommon.mak |
| diffstat | 2 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Mon Apr 07 22:25:13 2008 +0000 +++ b/configure Mon Apr 07 23:49:39 2008 +0000 @@ -7880,8 +7880,6 @@ 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 @@ `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 #############################################################################
--- a/mpcommon.mak Mon Apr 07 22:25:13 2008 +0000 +++ b/mpcommon.mak Mon Apr 07 23:49:39 2008 +0000 @@ -28,7 +28,7 @@ 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 $<