[MPlayer-cvslog] r31783 - in trunk: Makefile configure

[reimar]

Author: reimar
Date: Sat Jul 24 17:14:43 2010
New Revision: 31783

Log:
Fix dependency generation for libav*

Modified:
   trunk/Makefile
   trunk/configure

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Sat Jul 24 16:43:55 2010	(r31782)
+++ trunk/Makefile	Sat Jul 24 17:14:43 2010	(r31783)
@@ -829,13 +829,13 @@ all: $(ALL_PRG-yes)
 	$(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. $< $@

Modified: trunk/configure
==============================================================================
--- trunk/configure	Sat Jul 24 16:43:55 2010	(r31782)
+++ trunk/configure	Sat Jul 24 17:14:43 2010	(r31783)
@@ -2562,7 +2562,7 @@ else
 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 @@ WINDRES = $_windres
 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