summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2008-11-17 20:50:23 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2008-11-17 20:50:23 +0200
commit1715c2a33632b333f8e8e581ef23ea5fe0234edd (patch)
treef2f9ddca0f4940edd845d71a5bfd74c8a09ba633 /Makefile
parente46ce9c0ac88cdc3b4604c249576cfde0c5c4946 (diff)
parent409bb1c5daba69aac788ce5065d05b8ea8441cfd (diff)
downloadmpv-1715c2a33632b333f8e8e581ef23ea5fe0234edd.tar.bz2
mpv-1715c2a33632b333f8e8e581ef23ea5fe0234edd.tar.xz
Merge svn changes up to r27949
Conflicts: common.mak libvo/vo_xv.c libvo/x11_common.c libvo/x11_common.h stream/cache2.c
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index c52fdca131..e552e1d644 100644
--- a/Makefile
+++ b/Makefile
@@ -876,10 +876,10 @@ doxygen:
doxygen DOCS/tech/Doxyfile
TAGS:
- rm -f $@; ( find -name '*.[chS]' -print ) | xargs etags -a
+ rm -f $@; ( find -name '*.[chS]' -o -name '*.asm' -print ) | xargs etags -a
tags:
- rm -f $@; ( find -name '*.[chS]' -print ) | xargs ctags -a
+ rm -f $@; ( find -name '*.[chS]' -o -name '*.asm' -print ) | xargs ctags -a