Mercurial > mplayer.hg
changeset 31717:9c9d8fe59b53
Fix dependency generation for libav*
| author | reimar |
|---|---|
| date | Sat, 24 Jul 2010 15:14:43 +0000 |
| parents | dcd1791cabb3 |
| children | 56e3df9c8aaa |
| files | Makefile configure |
| diffstat | 2 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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. $< $@
--- 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