# HG changeset patch
# User diego
# Date 1278026296 0
# Node ID 0c9300413b283bcd3d18df9eca72840ddaf43742
# Parent  05537cb15be655fe0de82107f84513fc15d6705d
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.

diff -r 05537cb15be6 -r 0c9300413b28 Makefile
--- 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. $< $@
diff -r 05537cb15be6 -r 0c9300413b28 configure
--- 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