Revert to previous dependency checking behavior.

Take included header files into account when generating dependency files.
This has problems when header files are removed or renamed, but does not
silently miscompile files.


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

2 files changed, 2 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 45dd590c47..9987b9fb6b 100644
--- a/Makefile
+++ b/Makefile
@@ -774,7 +774,6 @@ version.h:
 	./version.sh `$(CC) -dumpversion`
 
 %(EXESUF): %.c
-%.o: %.d
 
 
 
diff --git a/configure b/configure
index e540053970..c987d8e800 100755
--- a/configure
+++ b/configure
@@ -7932,8 +7932,8 @@ HAVE_XVMC = $_xvmc
 
 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 -e "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&,"
-MPDEPEND_CMD_CXX = \$(CC) -MM \$(CXXFLAGS) \$(filter-out %.h,$^) | sed -e "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&,"
+MPDEPEND_CMD     = \$(CC) -MM \$(CFLAGS)   \$(filter-out %.h,$^) | sed -e "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&," -e "s,\(.*\)\.o: ,\1.d &,"
+MPDEPEND_CMD_CXX = \$(CC) -MM \$(CXXFLAGS) \$(filter-out %.h,$^) | sed -e "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&," -e "s,\(.*\)\.o: ,\1.d &,"
 
 EOF