summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-07-26 18:36:48 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-07-26 18:36:48 +0000
commit65f404c85f4f7028401181277313b9589ed810cf (patch)
treea4d377993528991dabfd000e2d83cd4a8ca3319d
parentd1dcbd2f87335437544484b16f933d520e5d38f3 (diff)
downloadmpv-65f404c85f4f7028401181277313b9589ed810cf.tar.bz2
mpv-65f404c85f4f7028401181277313b9589ed810cf.tar.xz
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
-rw-r--r--Makefile1
-rwxr-xr-xconfigure4
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