diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-24 21:46:50 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-24 21:46:50 +0000 |
commit | e7f6edf300f9d465c92a6112c8f782ccb53c26eb (patch) | |
tree | 930f3899229ed688800fffac39d9776d121fedd3 | |
parent | b5653b5698b468d2f5528979e331ec21eb868562 (diff) | |
download | mpv-e7f6edf300f9d465c92a6112c8f782ccb53c26eb.tar.bz2 mpv-e7f6edf300f9d465c92a6112c8f782ccb53c26eb.tar.xz |
dependency generation infrastructure for C++ files
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26521 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | Makefile | 2 | ||||
-rwxr-xr-x | configure | 1 | ||||
-rw-r--r-- | mpcommon.mak | 3 |
3 files changed, 5 insertions, 1 deletions
@@ -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 @@ -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 $< |