# HG changeset patch
# User reimar
# Date 1279984483 0
# Node ID 9c9d8fe59b53a05e37f5543f71a751810f7a9a00
# Parent  dcd1791cabb3ade11eccbc52e7f53957b4360a13
Fix dependency generation for libav*

diff -r dcd1791cabb3 -r 9c9d8fe59b53 Makefile
--- a/Makefile	Sat Jul 24 14:43:55 2010 +0000
+++ b/Makefile	Sat Jul 24 15:14:43 2010 +0000
@@ -829,13 +829,13 @@
 	$(CC) $(ASFLAGS) -c -o $@ $<
 
 %.o: %.c
-	$(CC) $(DEPFLAGS) $(CFLAGS) -c -o $@ $<
+	$(CC) $(CC_DEPFLAGS) $(CFLAGS) -c -o $@ $<
 
 %.o: %.cpp
-	$(CC) $(DEPFLAGS) $(CXXFLAGS) -c -o $@ $<
+	$(CC) $(CC_DEPFLAGS) $(CXXFLAGS) -c -o $@ $<
 
 %.o: %.m
-	$(CC) $(DEPFLAGS) $(CFLAGS) -c -o $@ $<
+	$(CC) $(CC_DEPFLAGS) $(CFLAGS) -c -o $@ $<
 
 %-rc.o: %.rc
 	$(WINDRES) -I. $< $@
diff -r dcd1791cabb3 -r 9c9d8fe59b53 configure
--- a/configure	Sat Jul 24 14:43:55 2010 +0000
+++ b/configure	Sat Jul 24 15:14:43 2010 +0000
@@ -2562,7 +2562,7 @@
 fi
 
 cflag_check -mno-omit-leaf-frame-pointer && cflags_no_omit_leaf_frame_pointer="-mno-omit-leaf-frame-pointer"
-cflag_check -MD -MP && DEPFLAGS="-MD -MP $CFLAGS"
+cflag_check -MMD -MF "$mplayer_tmpdir/test.d" -MT test.o && DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@'
 
 
 if test -n "$LDFLAGS" ; then
@@ -8576,7 +8576,8 @@
 CFLAGS   = $CFLAGS $extra_cflags
 ASFLAGS  = \$(CFLAGS)
 CXXFLAGS = $CXXFLAGS $extra_cflags $extra_cxxflags
-DEPFLAGS = $DEPFLAGS
+CC_DEPFLAGS = $DEPFLAGS
+AS_DEPFLAGS = $DEPFLAGS
 
 CFLAGS_DHAHELPER         = $cflags_dhahelper
 CFLAGS_FAAD_FIXED        = $cflags_faad_fixed