diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-07-01 23:18:16 +0000 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-02 04:14:20 +0200 |
commit | 853dc929e4778d6aefd41678d136dc366ea9449a (patch) | |
tree | c80780783ee9b9ed8f3848e32fc5a2f5effaca0b | |
parent | 948fa5d0706ce96368f46a0311bad426765af53a (diff) | |
download | mpv-853dc929e4778d6aefd41678d136dc366ea9449a.tar.bz2 mpv-853dc929e4778d6aefd41678d136dc366ea9449a.tar.xz |
configure: Separate dependency 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.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31614 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | Makefile | 8 | ||||
-rwxr-xr-x | configure | 3 |
2 files changed, 6 insertions, 5 deletions
@@ -743,16 +743,16 @@ all: $(ALL_PRG-yes) locales $(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $< %.o: %.S - $(CC) $(CFLAGS) -c -o $@ $< + $(CC) $(DEPFLAGS) $(CFLAGS) -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. $< $@ @@ -2438,7 +2438,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 && CFLAGS="-MD -MP $CFLAGS" +cflag_check -MD -MP && DEPFLAGS="-MD -MP $CFLAGS" if test -n "$LDFLAGS" ; then @@ -7733,6 +7733,7 @@ WINDRES = $_windres CFLAGS = $CFLAGS $extra_cflags CXXFLAGS = $CXXFLAGS $extra_cflags $extra_cxxflags +DEPFLAGS = $DEPFLAGS CFLAGS_DHAHELPER = $cflags_dhahelper CFLAGS_FAAD_FIXED = $cflags_faad_fixed |