diff options
| -rw-r--r-- | Makefile | 17 | ||||
| -rw-r--r-- | libass/Makefile | 15 |
2 files changed, 10 insertions, 22 deletions
@@ -33,6 +33,15 @@ SRCS_COMMON = asxparser.c \ 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-$(FAAD_INTERNAL) += libfaad2/libfaad2.a 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 @@ PARTS = dvdread \ liba52 \ libaf \ libao2 \ - libass \ libavcodec \ libavformat \ libavutil \ @@ -147,6 +154,7 @@ PARTS = dvdread \ vidix \ DIRS = input \ + libass \ libmenu \ osdep \ @@ -171,9 +179,6 @@ libdvdcss/libdvdcss.a: loader/libloader.a: $(MAKE) -C loader -libass/libass.a: - $(MAKE) -C libass - libmpdemux/libmpdemux.a: $(MAKE) -C libmpdemux libmpdemux.a @@ -415,6 +420,4 @@ loader/libloader.a: .norecurse $(wildcard loader/*.[chSs]) 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 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 |