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

[reimar]

Author: reimar
Date: Wed Sep 29 20:05:27 2010
New Revision: 32406

Log:
config.asm should be generate in ffmpeg/, not the root.

Modified:
   trunk/Makefile
   trunk/configure

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Wed Sep 29 18:15:42 2010	(r32405)
+++ trunk/Makefile	Wed Sep 29 20:05:27 2010	(r32406)
@@ -993,7 +993,7 @@ distclean: clean testsclean toolsclean d
 	-rm -f config.* codecs.conf.h help_mp.h version.h TAGS tags
 	-rm -f $(VIDIX_PCI_FILES)
 	-rm -f $(call ADD_ALL_EXESUFS,codec-cfg cpuinfo)
-	-rm -f ffmpeg/libavutil/avconfig.h ffmpeg/config.mak
+	-rm -f ffmpeg/libavutil/avconfig.h ffmpeg/config.*
 
 doxygen:
 	doxygen DOCS/tech/Doxyfile

Modified: trunk/configure
==============================================================================
--- trunk/configure	Wed Sep 29 18:15:42 2010	(r32405)
+++ trunk/configure	Wed Sep 29 20:05:27 2010	(r32406)
@@ -8839,7 +8839,7 @@ for part in $arch $subarch; do
   echo "%define ARCH_${part}" >> "$TMPS"
 done
 
-cmp -s "$TMPS" config.asm || mv -f "$TMPS" config.asm
+cmp -s "$TMPS" ffmpeg/config.asm || mv -f "$TMPS" ffmpeg/config.asm
 fi