diff Makefile @ 22849:bddb09395c3e

Merge all VIDIX drivers into libvidix.a.

--- a/Makefile	Sat Mar 31 23:33:30 2007 +0000
+++ b/Makefile	Sat Mar 31 23:48:48 2007 +0000
@@ -110,7 +110,6 @@
 INSTALL_TARGETS-$(MPLAYER)  += install-mplayer  install-mplayer-man
 INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mplayer-man
 INSTALL_TARGETS-$(GUI)      += install-gui
-INSTALL_TARGETS-$(VIDIX)    += install-vidix
 INSTALL_TARGETS             += $(INSTALL_TARGETS-yes)
 
 PARTS = libmpdemux \
@@ -137,7 +136,6 @@
         tremor \
         libdha \
         vidix \
-        vidix/drivers \
         dvdread \
         libdvdcss \
         libass \
@@ -218,7 +216,6 @@
 
 vidix/libvidix.a: libdha/libdha.a
 	$(MAKE) -C vidix
-	$(MAKE) -C vidix/drivers
 
 Gui/libgui.a:
 	$(MAKE) -C Gui
@@ -297,10 +294,6 @@
 	$(INSTALL) -d $(prefix)/share/applications
 	$(INSTALL) -m 644 etc/mplayer.desktop $(prefix)/share/applications/
 
-install-vidix:
-	mkdir -p $(LIBDIR)/mplayer/vidix
-	$(INSTALL) -m 755 $(INSTALLSTRIP) -p vidix/drivers/*.so $(LIBDIR)/mplayer/vidix
-
 uninstall:
 	-rm -f $(BINDIR)/mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF)
 	-rm -f $(BINDIR)/mencoder$(EXESUF)
@@ -314,8 +307,6 @@
 	          $(MANDIR)/$$l/man1/gmplayer.1 ; \
 	  fi ; \
 	done
-	rm -f $(LIBDIR)/mplayer/vidix/*.so
-	-rmdir -p $(LIBDIR)/mplayer/vidix
 
 dep depend: help_mp.h version.h codecs.conf.h
 	$(CC) -MM $(CFLAGS) $(SRCS_MPLAYER) $(SRCS_MENCODER) $(SRCS_COMMON) 1>.depend