From e7f6edf300f9d465c92a6112c8f782ccb53c26eb Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 24 Apr 2008 21:46:50 +0000
Subject: dependency generation infrastructure for C++ files

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26521 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 Makefile     | 2 +-
 configure    | 1 +
 mpcommon.mak | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index cc9450470f..0face2127f 100644
--- a/Makefile
+++ b/Makefile
@@ -494,7 +494,7 @@ DEPS = foo
 
 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 --git a/configure b/configure
index 296f1b2be5..92be2f7c91 100755
--- a/configure
+++ b/configure
@@ -7903,6 +7903,7 @@ HAVE_XVMC = $_xvmc
 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 --git a/mpcommon.mak b/mpcommon.mak
index 9c68b9acdd..2cdcf7f266 100644
--- a/mpcommon.mak
+++ b/mpcommon.mak
@@ -34,6 +34,9 @@ distclean:: clean
 %.d: %.c
 	$(MPDEPEND_CMD) > $@
 
+%.d: %.cpp
+	$(MPDEPEND_CMD_CXX) > $@
+
 %.ho: %.h
 	$(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $<
 
-- 
cgit v1.2.3