Mercurial > mplayer.hg

comparison Makefile @ 22900:a9e111b88c4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged libdha and libvidix, moved all files from libdha to vidix directory
author ben
date Fri, 06 Apr 2007 15:20:49 +0000
parents 77def5093daf
children d8cfd3a1300e
comparison
equal deleted inserted replaced
22899:515545f81186 22900:a9e111b88c4a
76 76
77 LIBS_MPLAYER = libvo/libvo.a \ 77 LIBS_MPLAYER = libvo/libvo.a \
78 libao2/libao2.a \ 78 libao2/libao2.a \
79 input/libinput.a \ 79 input/libinput.a \
80 80
81 LIBS_MPLAYER-$(VIDIX) += vidix/libvidix.a libdha/libdha.a 81 LIBS_MPLAYER-$(VIDIX) += vidix/libvidix.a
82 LIBS_MPLAYER-$(GUI) += Gui/libgui.a 82 LIBS_MPLAYER-$(GUI) += Gui/libgui.a
83 LIBS_MPLAYER-$(LIBMENU) += libmenu/libmenu.a 83 LIBS_MPLAYER-$(LIBMENU) += libmenu/libmenu.a
84 84
85 LIBS_MENCODER = libmpcodecs/libmpencoders.a \ 85 LIBS_MENCODER = libmpcodecs/libmpencoders.a \
86 libmpdemux/libmpmux.a \ 86 libmpdemux/libmpmux.a \
132 loader \ 132 loader \
133 mp3lib \ 133 mp3lib \
134 libmpeg2 \ 134 libmpeg2 \
135 libfaad2 \ 135 libfaad2 \
136 tremor \ 136 tremor \
137 libdha \
138 vidix \ 137 vidix \
139 dvdread \ 138 dvdread \
140 libdvdcss \ 139 libdvdcss \
141 libass \ 140 libass \
142 Gui \ 141 Gui \
209 $(MAKE) -C mp3lib 208 $(MAKE) -C mp3lib
210 209
211 tremor/libvorbisidec.a: 210 tremor/libvorbisidec.a:
212 $(MAKE) -C tremor 211 $(MAKE) -C tremor
213 212
214 libdha/libdha.a: 213 vidix/libvidix.a:
215 $(MAKE) -C libdha
216
217 vidix/libvidix.a: libdha/libdha.a
218 $(MAKE) -C vidix 214 $(MAKE) -C vidix
219 215
220 Gui/libgui.a: 216 Gui/libgui.a:
221 $(MAKE) -C Gui 217 $(MAKE) -C Gui
222 218
405 liba52/liba52.a: .norecurse $(wildcard liba52/*.[ch]) 401 liba52/liba52.a: .norecurse $(wildcard liba52/*.[ch])
406 mp3lib/libmp3.a: .norecurse $(wildcard mp3lib/*.[ch]) 402 mp3lib/libmp3.a: .norecurse $(wildcard mp3lib/*.[ch])
407 libfaad2/libfaad2.a: .norecurse $(wildcard libfaad2/*.[ch] libfaad2/*/*.[ch]) 403 libfaad2/libfaad2.a: .norecurse $(wildcard libfaad2/*.[ch] libfaad2/*/*.[ch])
408 404
409 loader/libloader.a: .norecurse $(wildcard loader/*.[chSs]) 405 loader/libloader.a: .norecurse $(wildcard loader/*.[chSs])
410 libdha/libdha.a: .norecurse $(wildcard libdha/*.[ch])
411 vidix/libvidix.a: .norecurse $(wildcard vidix/*.[ch]) 406 vidix/libvidix.a: .norecurse $(wildcard vidix/*.[ch])
412 Gui/libgui.a: .norecurse $(wildcard Gui/*.[ch] Gui/*/*.[ch] Gui/*/*/*.[ch]) 407 Gui/libgui.a: .norecurse $(wildcard Gui/*.[ch] Gui/*/*.[ch] Gui/*/*/*.[ch])
413 408
414 libass/libass.a: .norecurse $(wildcard libass/*.[ch]) 409 libass/libass.a: .norecurse $(wildcard libass/*.[ch])
415 410