summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-07-01 23:18:16 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-02 04:14:20 +0200
commit853dc929e4778d6aefd41678d136dc366ea9449a (patch)
treec80780783ee9b9ed8f3848e32fc5a2f5effaca0b /Makefile
parent948fa5d0706ce96368f46a0311bad426765af53a (diff)
downloadmpv-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
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 1d951f40b9..1ede58f37d 100644
--- a/Makefile
+++ b/Makefile
@@ -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. $< $@