# HG changeset patch
# User diego
# Date 1209073610 0
# Node ID 925b2b7a1f34e85783c562075cfab077b2b27ba0
# Parent  a347dc8f3dcdd13985be5678c05b5f1e3cfbd768
dependency generation infrastructure for C++ files

diff -r a347dc8f3dcd -r 925b2b7a1f34 Makefile
--- a/Makefile	Thu Apr 24 17:41:19 2008 +0000
+++ b/Makefile	Thu Apr 24 21:46:50 2008 +0000
@@ -494,7 +494,7 @@
 
 include mpcommon.mak
 
-DEPS = $(SRCS_COMMON:.c=.d) $(SRCS_MPLAYER:.c=.d) $(SRCS_MENCODER:.c=.d)
+DEPS = $(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER) $(SRCS_MENCODER)))
 $(DEPS) recurse: help_mp.h version.h codecs.conf.h
 dep depend: $(DEPS)
 	for part in $(PARTS); do $(MAKE) -C $$part .depend; done
diff -r a347dc8f3dcd -r 925b2b7a1f34 configure
--- a/configure	Thu Apr 24 17:41:19 2008 +0000
+++ b/configure	Thu Apr 24 21:46:50 2008 +0000
@@ -7903,6 +7903,7 @@
 DEPEND_CMD   = \$(CC) -MM \$(CFLAGS) \$(filter-out %.h,\$^) | sed "s,[0-9a-z._-]*: \(\$(SRC_DIR)/\)*\([a-z0-9]*/\)[^/]* ,\\2&,"
 
 MPDEPEND_CMD = \$(CC) -MM \$(CFLAGS) \$(filter-out %.h,$^) | sed "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&,"
+MPDEPEND_CMD_CXX = \$(CC) -MM \$(CXXFLAGS) \$(filter-out %.h,$^) | sed "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&,"
 
 EOF
 
diff -r a347dc8f3dcd -r 925b2b7a1f34 mpcommon.mak
--- a/mpcommon.mak	Thu Apr 24 17:41:19 2008 +0000
+++ b/mpcommon.mak	Thu Apr 24 21:46:50 2008 +0000
@@ -34,6 +34,9 @@
 %.d: %.c
 	$(MPDEPEND_CMD) > $@
 
+%.d: %.cpp
+	$(MPDEPEND_CMD_CXX) > $@
+
 %.ho: %.h
 	$(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $<