# HG changeset patch
# User diego
# Date 1175384928 0
# Node ID bddb09395c3e2ad4b94b4b672bbd3f59522d43a6
# Parent  82f06c55cf97d6786540dd357319458600281c7f
Merge all VIDIX drivers into libvidix.a.

diff -r 82f06c55cf97 -r bddb09395c3e Makefile
--- 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
diff -r 82f06c55cf97 -r bddb09395c3e vidix/Makefile
--- a/vidix/Makefile	Sat Mar 31 23:33:30 2007 +0000
+++ b/vidix/Makefile	Sat Mar 31 23:48:48 2007 +0000
@@ -2,6 +2,19 @@
 
 LIBNAME_MPLAYER = libvidix.a
 
-SRCS_MPLAYER    = vidixlib.c
+SRCS_MPLAYER    = vidixlib.c \
+                  $(wildcard drivers/*.c)
+
+OBJS_MPLAYER    = drivers/mga_crtc2_vid.o \
+                  drivers/rage128_vid.o \
 
 include ../mpcommon.mak
+
+drivers/mga_crtc2_vid.o: drivers/mga_vid.c
+	$(CC) -c $(CFLAGS) -DCRTC2 -o $@ $<
+
+drivers/rage128_vid.o: drivers/radeon_vid.c
+	$(CC) -c $(CFLAGS) -DRAGE128 -o $@ $<
+
+clean::
+	rm -f drivers/*.o drivers/*~
diff -r 82f06c55cf97 -r bddb09395c3e vidix/drivers/Makefile
--- a/vidix/drivers/Makefile	Sat Mar 31 23:33:30 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-include ../../config.mak
-
-SRCS_MPLAYER = $(wildcard *.c)
-VIDIX_LIBS   = -L../../libdha -ldha
-CFLAGS       = -fPIC
-
-libs:   cyberblade_vid.so radeon_vid.so rage128_vid.so mach64_vid.so \
-        nvidia_vid.so mga_vid.so mga_crtc2_vid.so pm3_vid.so \
-        sis_vid.so unichrome_vid.so savage_vid.so
-
-%.so: %.o
-	$(CC) -shared $^ $(VIDIX_LIBS) -Wl,-soname,$@ -o $@
-
-mga_crtc2_vid.o: mga_vid.c
-	$(CC) -c $(CFLAGS) -DCRTC2 -o $@ $<
-
-rage128_vid.o: radeon_vid.c
-	$(CC) -c $(CFLAGS) -DRAGE128 -o $@ $<
-
-sis_vid.so: sis_vid.o sis_bridge.o
-
-cyberblade_vid.so nvidia_vid.so mga_vid.so mga_crtc2_vid.so unichrome_vid.so \
-savage_vid.so: VIDIX_LIBS += -lm
-
-include ../../mpcommon.mak
-
-clean::
-	rm -f *.so