summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-31 13:37:29 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-31 13:37:29 +0000
commitd898f5c990cd24fd2ba709af964001da99db92fb (patch)
tree6a9df7f68472252b97daf68a7a95256f3e0c4c42 /Makefile
parent5f938f54c618da20274d946d1a130f57051415c4 (diff)
downloadmpv-d898f5c990cd24fd2ba709af964001da99db92fb.tar.bz2
mpv-d898f5c990cd24fd2ba709af964001da99db92fb.tar.xz
Build libdha statically like all the other libraries.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22855 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 3 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 5aac1332d4..f16780be3f 100644
--- a/Makefile
+++ b/Makefile
@@ -213,10 +213,10 @@ mp3lib/libmp3.a:
tremor/libvorbisidec.a:
$(MAKE) -C tremor
-libdha/libdha.so:
+libdha/libdha.a:
$(MAKE) -C libdha
-vidix/libvidix.a: libdha/libdha.so
+vidix/libvidix.a: libdha/libdha.a
$(MAKE) -C vidix
$(MAKE) -C vidix/drivers
@@ -298,7 +298,6 @@ install-gui:
$(INSTALL) -m 644 etc/mplayer.desktop $(prefix)/share/applications/
install-vidix:
- $(MAKE) -C libdha install
mkdir -p $(LIBDIR)/mplayer/vidix
$(INSTALL) -m 755 $(INSTALLSTRIP) -p vidix/drivers/*.so $(LIBDIR)/mplayer/vidix
@@ -315,7 +314,6 @@ uninstall:
$(MANDIR)/$$l/man1/gmplayer.1 ; \
fi ; \
done
- $(MAKE) -C libdha uninstall
rm -f $(LIBDIR)/mplayer/vidix/*.so
-rmdir -p $(LIBDIR)/mplayer/vidix
@@ -418,7 +416,7 @@ 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.so: .norecurse $(wildcard libdha/*.[ch])
+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])