Mercurial > mplayer.hg

changeset 32320:d7de0c0de45c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
config.asm should be generate in ffmpeg/, not the root.
author reimar
date Wed, 29 Sep 2010 18:05:27 +0000
parents 9a91a876aab6
children 44f7f5dd379f
files Makefile configure
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Wed Sep 29 16:15:42 2010 +0000
+++ b/Makefile	Wed Sep 29 18:05:27 2010 +0000
@@ -993,7 +993,7 @@
 	-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
--- a/configure	Wed Sep 29 16:15:42 2010 +0000
+++ b/configure	Wed Sep 29 18:05:27 2010 +0000
@@ -8839,7 +8839,7 @@
   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