github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-28 06:03:45 +01:00
Code Releases Activity

Merge libass/Makefile into Makefile, one less recursive make directory.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26356 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2008-04-08 22:25:59 +00:00
parent 36d1b39c9e
commit 32824f5eca
2 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile
View File

@ -33,6 +33,15 @@ SRCS_COMMON = asxparser.c \
subopt-helper.c \ subopt-helper.c \
subreader.c \ subreader.c \
vobsub.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/$(GETCH) \
osdep/$(TIMER) \ osdep/$(TIMER) \
@ -96,7 +105,6 @@ COMMON_LIBS-$(FAAD_INTERNAL) += libfaad2/libfaad2.a
COMMON_LIBS-$(TREMOR_INTERNAL) += tremor/libvorbisidec.a COMMON_LIBS-$(TREMOR_INTERNAL) += tremor/libvorbisidec.a
COMMON_LIBS-$(DVDREAD_INTERNAL) += dvdread/libdvdread.a COMMON_LIBS-$(DVDREAD_INTERNAL) += dvdread/libdvdread.a
COMMON_LIBS-$(DVDCSS_INTERNAL) += libdvdcss/libdvdcss.a COMMON_LIBS-$(DVDCSS_INTERNAL) += libdvdcss/libdvdcss.a
COMMON_LIBS-$(ASS) += libass/libass.a
LIBS_MPLAYER = libvo/libvo.a \ LIBS_MPLAYER = libvo/libvo.a \
libao2/libao2.a \ libao2/libao2.a \
@ -128,7 +136,6 @@ PARTS = dvdread \
liba52 \ liba52 \
libaf \ libaf \
libao2 \ libao2 \
libass \
libavcodec \ libavcodec \
libavformat \ libavformat \
libavutil \ libavutil \
@ -147,6 +154,7 @@ PARTS = dvdread \
vidix \ vidix \
DIRS = input \ DIRS = input \
libass \
libmenu \ libmenu \
osdep \ osdep \
@ -171,9 +179,6 @@ libdvdcss/libdvdcss.a:
loader/libloader.a: loader/libloader.a:
$(MAKE) -C loader $(MAKE) -C loader
libass/libass.a:
$(MAKE) -C libass
libmpdemux/libmpdemux.a: libmpdemux/libmpdemux.a:
$(MAKE) -C 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]) vidix/libvidix.a: .norecurse $(wildcard vidix/*.[ch])
gui/libgui.a: .norecurse $(wildcard gui/*.[ch] gui/*/*.[ch] gui/*/*/*.[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 .PHONY: all install* uninstall strip doxygen doxygen_clean TAGS tags

15
libass/Makefile
View File

@ -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