[MPlayer-cvslog] r31026 - in trunk: Makefile configure

diego subversion at mplayerhq.hu
Tue Apr 6 12:08:19 CEST 2010


Author: diego
Date: Tue Apr  6 12:08:19 2010
New Revision: 31026

Log:
Generate dependency information as a sideeffect of compilation.
This speeds up compilation times and simplifies the code.

Modified:
   trunk/Makefile
   trunk/configure

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Tue Apr  6 11:46:47 2010	(r31025)
+++ trunk/Makefile	Tue Apr  6 12:08:19 2010	(r31026)
@@ -831,15 +831,6 @@ FFMPEGFILES = $(foreach part, $(FFMPEGPA
 
 all: $(ALL_PRG-yes)
 
-%.d: %.c
-	$(MPDEPEND_CMD) > $@
-
-%.d: %.cpp
-	$(MPDEPEND_CMD_CXX) > $@
-
-%.d: %.m
-	$(MPDEPEND_CMD) > $@
-
 %.ho: %.h
 	$(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $<
 

Modified: trunk/configure
==============================================================================
--- trunk/configure	Tue Apr  6 11:46:47 2010	(r31025)
+++ trunk/configure	Tue Apr  6 12:08:19 2010	(r31026)
@@ -2513,6 +2513,7 @@ else
 fi
 
 cc_check -mno-omit-leaf-frame-pointer && cflags_no_omit_leaf_frame_pointer="-mno-omit-leaf-frame-pointer"
+cc_check -MD -MP && CFLAGS="-MD -MP $CFLAGS"
 
 
 if test -n "$LDFLAGS" ; then
@@ -8472,9 +8473,6 @@ EXTRALIBS          = $extra_ldflags $_ld
 EXTRALIBS_MPLAYER  = $libs_mplayer
 EXTRALIBS_MENCODER = $libs_mencoder
 
-MPDEPEND_CMD     = \$(CC) -MM -MP \$(CFLAGS)   \$(filter-out %.xpm,\$(filter-out %.h,$^)) | sed -e "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&," -e "s,\(.*\)\.o: ,\1.d &,"
-MPDEPEND_CMD_CXX = \$(CC) -MM -MP \$(CXXFLAGS) \$(filter-out  %.hh,\$(filter-out %.h,$^)) | sed -e "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&," -e "s,\(.*\)\.o: ,\1.d &,"
-
 GETCH = $_getch
 HELP_FILE = $_mp_help
 TIMER = $_timer


More information about the MPlayer-cvslog mailing list