From ef15210ef1ec41cf75f1bd0d77113a7c1347bb86 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 24 Jun 2008 08:48:04 +0000
Subject: Do not unconditionally recurse into FFmpeg subdirectories. Instead,
 just recurse if any file in the subdirectory changed.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27130 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 Makefile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 76eec75f6e..6b5470be5d 100644
--- a/Makefile
+++ b/Makefile
@@ -735,7 +735,13 @@ dep depend: $(DEPS)
 
 ALLPARTLIBS = $(foreach part, $(PARTS), $(part)/$(part).a)
 
-$(ALLPARTLIBS): recurse
+libavutil/libavutil.a: libavutil/*.[ch]
+libavcodec/libavcodec.a: libavcodec/*.[ch] libavcodec/*/*.[chS]
+libavformat/libavformat.a: libavformat/*.[ch]
+libpostproc/libpostproc.a: libpostproc/*.[ch]
+libswscale/libswscale.a: libswscale/*.[chS]
+
+$(ALLPARTLIBS):
 	$(MAKE) -C $(@D)
 
 mplayer$(EXESUF): $(MPLAYER_DEPS)
@@ -1051,5 +1057,5 @@ dhahelperwinclean:
 
 -include $(DEPS)
 
-.PHONY: all doxygen *install* recurse *tools drivers dhahelper*
+.PHONY: all doxygen *install* *tools drivers dhahelper*
 .PHONY: checkheaders *clean dep depend tests
-- 
cgit v1.2.3


From 26243c40faf09b9c4dcabb0b7494e1c474b99154 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 24 Jun 2008 08:55:06 +0000
Subject: Touch FFmpeg libraries after recursing into their subdirectories.
 Otherwise, if the recursion was due to a changed file that is not built into
 the library, the recursion will become unconditional.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27131 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 6b5470be5d..edc145cd93 100644
--- a/Makefile
+++ b/Makefile
@@ -743,6 +743,7 @@ libswscale/libswscale.a: libswscale/*.[chS]
 
 $(ALLPARTLIBS):
 	$(MAKE) -C $(@D)
+	touch $@
 
 mplayer$(EXESUF): $(MPLAYER_DEPS)
 	$(CC) -o $@ $^ $(LDFLAGS_MPLAYER)
-- 
cgit v1.2.3


From 768a2f3851dbe1ef32f0c49b9eb92222fc22add0 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 1 Jul 2008 10:02:05 +0000
Subject: Fix FFmpeg subdirectory dependencies: The FFmpeg libraries depend on
 each other as well as on two header files in MPlayer.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27183 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 Makefile | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index edc145cd93..511a73deeb 100644
--- a/Makefile
+++ b/Makefile
@@ -735,13 +735,7 @@ dep depend: $(DEPS)
 
 ALLPARTLIBS = $(foreach part, $(PARTS), $(part)/$(part).a)
 
-libavutil/libavutil.a: libavutil/*.[ch]
-libavcodec/libavcodec.a: libavcodec/*.[ch] libavcodec/*/*.[chS]
-libavformat/libavformat.a: libavformat/*.[ch]
-libpostproc/libpostproc.a: libpostproc/*.[ch]
-libswscale/libswscale.a: libswscale/*.[chS]
-
-$(ALLPARTLIBS):
+$(ALLPARTLIBS): libavutil/*.[ch] libavcodec/*.[ch] libavcodec/*/*.[chS] libavformat/*.[ch] libpostproc/*.[ch] libswscale/*.[chS] libvo/fastmemcpy.h config.h
 	$(MAKE) -C $(@D)
 	touch $@
 
-- 
cgit v1.2.3