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

[diego]

Author: diego
Date: Sun Jun 26 16:16:40 2011
New Revision: 33731

Log:
build: Compile libav* libraries from the top level of the ffmpeg subdirectory.

Compiling from subdirectories is not guaranteed to work correctly.

Modified:
   trunk/Makefile
   trunk/configure

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Sun Jun 26 16:16:38 2011	(r33730)
+++ trunk/Makefile	Sun Jun 26 16:16:40 2011	(r33731)
@@ -807,7 +807,7 @@ all: $(ALL_PRG-yes)
 	$(WINDRES) -I. $< $@
 
 $(FFMPEGLIBS): $(FFMPEGFILES) config.h
-	$(MAKE) -C $(@D)
+	$(MAKE) -C ffmpeg $(@:ffmpeg/%=%)
 	touch $@
 
 mencoder$(EXESUF): $(MENCODER_DEPS)

Modified: trunk/configure
==============================================================================
--- trunk/configure	Sun Jun 26 16:16:38 2011	(r33730)
+++ trunk/configure	Sun Jun 26 16:16:40 2011	(r33731)
@@ -8772,7 +8772,10 @@ fi
 
 # Create a config.mak for FFmpeg that includes MPlayer's config.mak.
 cat > ffmpeg/config.mak << EOF
-include ../../config.mak
+ifndef FFMPEG_CONFIG_MAK
+FFMPEG_CONFIG_MAK = 1
+include ../config.mak
+endif # MPLAYER_CONFIG_MAK
 EOF
 
 cat > ffmpeg/config.h << EOF