[MPlayer-cvslog] r26521 - in trunk: Makefile configure mpcommon.mak

[diego]

Author: diego
Date: Thu Apr 24 23:46:50 2008
New Revision: 26521

Log:
dependency generation infrastructure for C++ files


Modified:
   trunk/Makefile
   trunk/configure
   trunk/mpcommon.mak

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Thu Apr 24 23:46:50 2008
@@ -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

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Thu Apr 24 23:46:50 2008
@@ -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
 

Modified: trunk/mpcommon.mak
==============================================================================
--- trunk/mpcommon.mak	(original)
+++ trunk/mpcommon.mak	Thu Apr 24 23:46:50 2008
@@ -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 $<