Mercurial > mplayer.hg
changeset 26324:7cd64946eb11
Merge libass/Makefile into Makefile, one less recursive make directory.
| author | diego |
|---|---|
| date | Tue, 08 Apr 2008 22:25:59 +0000 |
| parents | a9911503e195 |
| children | 890180cde40f |
| files | Makefile libass/Makefile |
| diffstat | 2 files changed, 10 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Tue Apr 08 22:11:17 2008 +0000 +++ b/Makefile Tue Apr 08 22:25:59 2008 +0000 @@ -33,6 +33,15 @@ subopt-helper.c \ subreader.c \ vobsub.c \ + libass/ass.c \ + libass/ass_bitmap.c \ + libass/ass_cache.c \ + libass/ass_font.c \ + libass/ass_fontconfig.c \ + libass/ass_library.c \ + libass/ass_mp.c \ + libass/ass_render.c \ + libass/ass_utils.c \ osdep/$(GETCH) \ osdep/$(TIMER) \ @@ -96,7 +105,6 @@ COMMON_LIBS-$(TREMOR_INTERNAL) += tremor/libvorbisidec.a COMMON_LIBS-$(DVDREAD_INTERNAL) += dvdread/libdvdread.a COMMON_LIBS-$(DVDCSS_INTERNAL) += libdvdcss/libdvdcss.a -COMMON_LIBS-$(ASS) += libass/libass.a LIBS_MPLAYER = libvo/libvo.a \ libao2/libao2.a \ @@ -128,7 +136,6 @@ liba52 \ libaf \ libao2 \ - libass \ libavcodec \ libavformat \ libavutil \ @@ -147,6 +154,7 @@ vidix \ DIRS = input \ + libass \ libmenu \ osdep \ @@ -171,9 +179,6 @@ loader/libloader.a: $(MAKE) -C loader -libass/libass.a: - $(MAKE) -C libass - libmpdemux/libmpdemux.a: $(MAKE) -C libmpdemux libmpdemux.a @@ -415,6 +420,4 @@ vidix/libvidix.a: .norecurse $(wildcard vidix/*.[ch]) gui/libgui.a: .norecurse $(wildcard gui/*.[ch] gui/*/*.[ch] gui/*/*/*.[ch]) -libass/libass.a: .norecurse $(wildcard libass/*.[ch]) - .PHONY: all install* uninstall strip doxygen doxygen_clean TAGS tags
--- a/libass/Makefile Tue Apr 08 22:11:17 2008 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -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