diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-08 22:25:59 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-08 22:25:59 +0000 |
commit | 32824f5ecaeea23c17d032014bcccdf5210eafc3 (patch) | |
tree | d3d843c1d27018869c6380cea3a0c8737aa6e9cb /libass | |
parent | 36d1b39c9ed0b04e4667a956ba67ab779600eff1 (diff) | |
download | mpv-32824f5ecaeea23c17d032014bcccdf5210eafc3.tar.bz2 mpv-32824f5ecaeea23c17d032014bcccdf5210eafc3.tar.xz |
Merge libass/Makefile into Makefile, one less recursive make directory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26356 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libass')
-rw-r--r-- | libass/Makefile | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/libass/Makefile b/libass/Makefile deleted file mode 100644 index 53c8db19bc..0000000000 --- a/libass/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -include ../config.mak - -LIBNAME_COMMON = libass.a - -SRCS_COMMON = ass.c \ - ass_cache.c \ - ass_fontconfig.c \ - ass_render.c \ - ass_utils.c \ - ass_mp.c \ - ass_bitmap.c \ - ass_library.c \ - ass_font.c \ - -include ../mpcommon.mak |