Mercurial > mplayer.hg
changeset 31548:0c9300413b28
Separate automatic dependency generation flags from general CFLAGS.
Before, there was an unfortunate interaction with 'make checkheaders':
Compiling a .h file would generate a .d dependency information file for
that .h file as a sideeffect of compilation. Unfortunately this would
clobber the .d files of the .c files with the same basename, resulting
in broken dependency information when running plain make.
| author | diego |
|---|---|
| date | Thu, 01 Jul 2010 23:18:16 +0000 |
| parents | 05537cb15be6 |
| children | 77723c0716bb |
| files | Makefile configure |
| diffstat | 2 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Thu Jul 01 23:03:40 2010 +0000 +++ b/Makefile Thu Jul 01 23:18:16 2010 +0000 @@ -824,13 +824,13 @@ $(CC) $(ASFLAGS) -c -o $@ $< %.o: %.c - $(CC) $(CFLAGS) -c -o $@ $< + $(CC) $(DEPFLAGS) $(CFLAGS) -c -o $@ $< %.o: %.cpp - $(CC) $(CXXFLAGS) -c -o $@ $< + $(CC) $(DEPFLAGS) $(CXXFLAGS) -c -o $@ $< %.o: %.m - $(CC) $(CFLAGS) -c -o $@ $< + $(CC) $(DEPFLAGS) $(CFLAGS) -c -o $@ $< %-rc.o: %.rc $(WINDRES) -I. $< $@
--- a/configure Thu Jul 01 23:03:40 2010 +0000 +++ b/configure Thu Jul 01 23:18:16 2010 +0000 @@ -2557,7 +2557,7 @@ fi cflag_check -mno-omit-leaf-frame-pointer && cflags_no_omit_leaf_frame_pointer="-mno-omit-leaf-frame-pointer" -cflag_check -MD -MP && CFLAGS="-MD -MP $CFLAGS" +cflag_check -MD -MP && DEPFLAGS="-MD -MP $CFLAGS" if test -n "$LDFLAGS" ; then @@ -8463,6 +8463,7 @@ CFLAGS = $CFLAGS $extra_cflags ASFLAGS = \$(CFLAGS) CXXFLAGS = $CXXFLAGS $extra_cflags $extra_cxxflags +DEPFLAGS = $DEPFLAGS CFLAGS_DHAHELPER = $cflags_dhahelper CFLAGS_FAAD_FIXED = $cflags_faad_fixed