diff options
author | ben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-04-06 15:20:49 +0000 |
---|---|---|
committer | ben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-04-06 15:20:49 +0000 |
commit | 51ba40dcd64518c8d5f9ce586171c8fb347a42c0 (patch) | |
tree | 590b1ce6d17f2126b67d1a5cb1576cdd7e8dea5c /Makefile | |
parent | 3099d0da16505cbc0aaab34f9299404e9ec19241 (diff) | |
download | mpv-51ba40dcd64518c8d5f9ce586171c8fb347a42c0.tar.bz2 mpv-51ba40dcd64518c8d5f9ce586171c8fb347a42c0.tar.xz |
merged libdha and libvidix, moved all files from libdha to vidix directory
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22918 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 9 |
1 files changed, 2 insertions, 7 deletions
@@ -78,7 +78,7 @@ LIBS_MPLAYER = libvo/libvo.a \ libao2/libao2.a \ input/libinput.a \ -LIBS_MPLAYER-$(VIDIX) += vidix/libvidix.a libdha/libdha.a +LIBS_MPLAYER-$(VIDIX) += vidix/libvidix.a LIBS_MPLAYER-$(GUI) += Gui/libgui.a LIBS_MPLAYER-$(LIBMENU) += libmenu/libmenu.a @@ -134,7 +134,6 @@ PARTS = libmpdemux \ libmpeg2 \ libfaad2 \ tremor \ - libdha \ vidix \ dvdread \ libdvdcss \ @@ -211,10 +210,7 @@ mp3lib/libmp3.a: tremor/libvorbisidec.a: $(MAKE) -C tremor -libdha/libdha.a: - $(MAKE) -C libdha - -vidix/libvidix.a: libdha/libdha.a +vidix/libvidix.a: $(MAKE) -C vidix Gui/libgui.a: @@ -407,7 +403,6 @@ mp3lib/libmp3.a: .norecurse $(wildcard mp3lib/*.[ch]) libfaad2/libfaad2.a: .norecurse $(wildcard libfaad2/*.[ch] libfaad2/*/*.[ch]) loader/libloader.a: .norecurse $(wildcard loader/*.[chSs]) -libdha/libdha.a: .norecurse $(wildcard libdha/*.[ch]) vidix/libvidix.a: .norecurse $(wildcard vidix/*.[ch]) Gui/libgui.a: .norecurse $(wildcard Gui/*.[ch] Gui/*/*.[ch] Gui/*/*/*.[ch]) |