# HG changeset patch # User reimar # Date 1285783527 0 # Node ID d7de0c0de45c79a8145fae41a1a83971bc9fb7e3 # Parent 9a91a876aab6f6fed71d61b8eebe8b1b33b161bb config.asm should be generate in ffmpeg/, not the root. diff -r 9a91a876aab6 -r d7de0c0de45c Makefile --- 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 diff -r 9a91a876aab6 -r d7de0c0de45c configure --- 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