From 51ba40dcd64518c8d5f9ce586171c8fb347a42c0 Mon Sep 17 00:00:00 2001 From: ben Date: Fri, 6 Apr 2007 15:20:49 +0000 Subject: 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 --- Makefile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e683d9e805..12e18a1775 100644 --- a/Makefile +++ b/Makefile @@ -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]) -- cgit v1.2.3