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 | 550d08a1bf57c27fafd74850c0c48a32cc4b09bc (patch) | |
tree | 235d8ca08d91aba0c7a838181cfc908a786d83e5 /libass | |
parent | 91d0873f4473ac8131bad687e348fb60d81f645b (diff) | |
download | libass-550d08a1bf57c27fafd74850c0c48a32cc4b09bc.tar.bz2 libass-550d08a1bf57c27fafd74850c0c48a32cc4b09bc.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 53c8db1..0000000 --- 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 |