Mercurial > mplayer.hg

diff Makefile @ 31548:0c9300413b28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 083786e4aaf2
children 480cdba9e480
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. $< $@