From 315c741d3d215f2861fb356dd0ba8637b6019127 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Wed, 12 Mar 2008 23:30:35 +0000
Subject: Move dependency generation commands into configure. This will allow
 specifying gcc-independent commands in the future.

Originally committed as revision 12426 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 Makefile   | 5 ++---
 common.mak | 3 +--
 configure  | 6 ++++++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 93f8715ca9..bd514320db 100644
--- a/Makefile
+++ b/Makefile
@@ -223,11 +223,10 @@ depend dep: .depend .vhookdep
 	$(MAKE-$(CONFIG_AVFILTER)) -C libavfilter depend
 
 .depend: $(SRCS) version.h
-	$(CC) -MM $(CFLAGS) $(filter-out %.h,$^) > $@
+	$(DEPEND_CMD) > $@
 
-# gcc stupidly only outputs the basename of targets with -MM
 .vhookdep: $(ALLHOOKS_SRCS) version.h
-	$(CC) -MM $(VHOOKCFLAGS) $(filter-out %.h,$^) | sed 's,^\([a-z]\),vhook/\1,' > $@
+	$(VHOOK_DEPEND_CMD) > $@
 
 $(DEP_LIBS): lib
 
diff --git a/common.mak b/common.mak
index b73861944a..359aa119c8 100644
--- a/common.mak
+++ b/common.mak
@@ -61,9 +61,8 @@ $(SLIBNAME_WITH_MAJOR): $(OBJS)
 ALLHEADERS = $(subst $(LIBSRC)/,,$(wildcard $(LIBSRC)/*.h))
 checkheaders: $(filter-out %_template.ho,$(ALLHEADERS:.h=.ho))
 
-# gcc stupidly only outputs the basename of targets with -MM
 depend dep: $(SRCS)
-	$(CC) -MM $(CFLAGS) $^ | sed 's,[0-9a-z._-]*: \([a-z0-9]*/\).*,\1&,' > .depend
+	$(DEPEND_CMD) > .depend
 
 clean::
 	rm -f *.o *~ *.a *.lib *.so *.so.* *.dylib *.dll \
diff --git a/configure b/configure
index 32a398008f..afcdca5bb8 100755
--- a/configure
+++ b/configure
@@ -934,6 +934,10 @@ SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)'
 SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBMAJOR)'
 LIB_INSTALL_EXTRA_CMD='$(RANLIB) "$(LIBDIR)/$(LIBNAME)"'
 
+# gcc stupidly only outputs the basename of targets with -MM
+DEPEND_CMD='$(CC) -MM $(CFLAGS) $(filter-out %.h,$^) | sed "s,[0-9a-z._-]*: \([a-z0-9]*/\).*,\1&,"'
+VHOOKDEPEND_CMD='$(CC) -MM $(VHOOKCFLAGS) $(filter-out %.h,$^) | sed "s,^\([a-z]\),vhook/\1,"'
+
 # find source path
 source_path="`dirname \"$0\"`"
 enable source_path_used
@@ -1991,6 +1995,8 @@ echo "LIBNAME=$LIBNAME" >> config.mak
 echo "SLIBPREF=$SLIBPREF" >> config.mak
 echo "SLIBSUF=$SLIBSUF" >> config.mak
 echo "EXESUF=$EXESUF" >> config.mak
+echo "DEPEND_CMD=$DEPEND_CMD" >> config.mak
+echo "VHOOKDEPEND_CMD=$VHOOKDEPEND_CMD" >> config.mak
 
 if enabled bigendian; then
     echo "WORDS_BIGENDIAN=yes" >> config.mak
-- 
cgit v1.2.3