Move driver files directly into the vidix directory.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22868 b3059339-0415-0410-9bf9-f77b7e298cf2

19 files changed, 66 insertions, 69 deletions

diff --git a/vidix/Makefile b/vidix/Makefile
index 0ee4a8875d..b05b3b4fe2 100644
--- a/vidix/Makefile
+++ b/vidix/Makefile
@@ -3,18 +3,15 @@ include ../config.mak
 LIBNAME_MPLAYER = libvidix.a
 
 SRCS_MPLAYER    = vidixlib.c \
-                  $(wildcard drivers/*.c)
+                  $(wildcard *.c)
 
-OBJS_MPLAYER    = drivers/mga_crtc2_vid.o \
-                  drivers/rage128_vid.o \
+OBJS_MPLAYER    = mga_crtc2_vid.o \
+                  rage128_vid.o \
 
 include ../mpcommon.mak
 
-drivers/mga_crtc2_vid.o: drivers/mga_vid.c
+mga_crtc2_vid.o: mga_vid.c
 	$(CC) -c $(CFLAGS) -DCRTC2 -o $@ $<
 
-drivers/rage128_vid.o: drivers/radeon_vid.c
+rage128_vid.o: radeon_vid.c
 	$(CC) -c $(CFLAGS) -DRAGE128 -o $@ $<
-
-clean::
-	rm -f drivers/*.o drivers/*~
diff --git a/vidix/drivers/cyberblade_regs.h b/vidix/cyberblade_regs.h
index 049fde6aa5..049fde6aa5 100644
--- a/vidix/drivers/cyberblade_regs.h
+++ b/vidix/cyberblade_regs.h
diff --git a/vidix/drivers/cyberblade_vid.c b/vidix/cyberblade_vid.c
index 3000bab87d..3da2f4db2e 100644
--- a/vidix/drivers/cyberblade_vid.c
+++ b/vidix/cyberblade_vid.c
@@ -43,12 +43,12 @@
 #include <inttypes.h>
 #include <unistd.h>
 
-#include "../vidix.h"
-#include "../fourcc.h"
-#include "../../libdha/libdha.h"
-#include "../../libdha/pci_ids.h"
-#include "../../libdha/pci_names.h"
-#include "../../config.h"
+#include "vidix.h"
+#include "fourcc.h"
+#include "../libdha/libdha.h"
+#include "../libdha/pci_ids.h"
+#include "../libdha/pci_names.h"
+#include "../config.h"
 
 #include "cyberblade_regs.h"
 
diff --git a/vidix/drivers/mach64.h b/vidix/mach64.h
index 085d401510..085d401510 100644
--- a/vidix/drivers/mach64.h
+++ b/vidix/mach64.h
diff --git a/vidix/drivers/mach64_vid.c b/vidix/mach64_vid.c
index a1d068f545..a967506396 100644
--- a/vidix/drivers/mach64_vid.c
+++ b/vidix/mach64_vid.c
@@ -13,17 +13,17 @@
 #include <inttypes.h>
 #include <fcntl.h>
 
-#include "../../config.h"
-#include "../../libavutil/common.h"
-#include "../../mpbswap.h"
-#include "../vidix.h"
-#include "../fourcc.h"
-#include "../../libdha/libdha.h"
-#include "../../libdha/pci_ids.h"
-#include "../../libdha/pci_names.h"
+#include "../config.h"
+#include "../libavutil/common.h"
+#include "../mpbswap.h"
+#include "vidix.h"
+#include "fourcc.h"
+#include "../libdha/libdha.h"
+#include "../libdha/pci_ids.h"
+#include "../libdha/pci_names.h"
 
 #include "mach64.h"
-#include "../../version.h"
+#include "../version.h"
 
 #define UNUSED(x) ((void)(x)) /**< Removes warning about unused arguments */
 
diff --git a/vidix/drivers/mga_vid.c b/vidix/mga_vid.c
index 3a96d97185..f75ac8ff59 100644
--- a/vidix/drivers/mga_vid.c
+++ b/vidix/mga_vid.c
@@ -54,11 +54,11 @@
 #include <math.h>
 #include <inttypes.h>
 
-#include "../vidix.h"
-#include "../fourcc.h"
-#include "../../libdha/libdha.h"
-#include "../../libdha/pci_ids.h"
-#include "../../libdha/pci_names.h"
+#include "vidix.h"
+#include "fourcc.h"
+#include "../libdha/libdha.h"
+#include "../libdha/pci_ids.h"
+#include "../libdha/pci_names.h"
 
 #ifdef __MINGW32__
 #define ENOTSUP 134
diff --git a/vidix/drivers/nvidia_vid.c b/vidix/nvidia_vid.c
index 8a5376b77f..f76a5f09b1 100644
--- a/vidix/drivers/nvidia_vid.c
+++ b/vidix/nvidia_vid.c
@@ -18,14 +18,14 @@
 #include <unistd.h>
 
 
-#include "../vidix.h"
-#include "../fourcc.h"
-#include "../../libdha/libdha.h"
-#include "../../libdha/pci_ids.h"
-#include "../../libdha/pci_names.h"
-#include "../../config.h"
-#include "../../libavutil/common.h"
-#include "../../mpbswap.h"
+#include "vidix.h"
+#include "fourcc.h"
+#include "../libdha/libdha.h"
+#include "../libdha/pci_ids.h"
+#include "../libdha/pci_names.h"
+#include "../config.h"
+#include "../libavutil/common.h"
+#include "../mpbswap.h"
 
 
 pciinfo_t pci_info;
diff --git a/vidix/drivers/pm3_regs.h b/vidix/pm3_regs.h
index 30c717f44b..30c717f44b 100644
--- a/vidix/drivers/pm3_regs.h
+++ b/vidix/pm3_regs.h
diff --git a/vidix/drivers/pm3_vid.c b/vidix/pm3_vid.c
index 73965ed01f..ff030b4ea5 100644
--- a/vidix/drivers/pm3_vid.c
+++ b/vidix/pm3_vid.c
@@ -25,12 +25,12 @@
 #include <inttypes.h>
 #include <unistd.h>
 
-#include "../vidix.h"
-#include "../fourcc.h"
-#include "../../libdha/libdha.h"
-#include "../../libdha/pci_ids.h"
-#include "../../libdha/pci_names.h"
-#include "../../config.h"
+#include "vidix.h"
+#include "fourcc.h"
+#include "../libdha/libdha.h"
+#include "../libdha/pci_ids.h"
+#include "../libdha/pci_names.h"
+#include "../config.h"
 
 #include "pm3_regs.h"
 
diff --git a/vidix/drivers/radeon.h b/vidix/radeon.h
index 6093356c1b..6093356c1b 100644
--- a/vidix/drivers/radeon.h
+++ b/vidix/radeon.h
diff --git a/vidix/drivers/radeon_vid.c b/vidix/radeon_vid.c
index dec17f531f..3b3031be80 100644
--- a/vidix/drivers/radeon_vid.c
+++ b/vidix/radeon_vid.c
@@ -16,14 +16,14 @@
 #include <math.h>
 #include <inttypes.h>
 
-#include "../../config.h"
-#include "../../libavutil/common.h"
-#include "../../mpbswap.h"
-#include "../../libdha/pci_ids.h"
-#include "../../libdha/pci_names.h"
-#include "../vidix.h"
-#include "../fourcc.h"
-#include "../../libdha/libdha.h"
+#include "../config.h"
+#include "../libavutil/common.h"
+#include "../mpbswap.h"
+#include "../libdha/pci_ids.h"
+#include "../libdha/pci_names.h"
+#include "vidix.h"
+#include "fourcc.h"
+#include "../libdha/libdha.h"
 #include "radeon.h"
 
 #ifdef HAVE_X11
diff --git a/vidix/drivers/savage_regs.h b/vidix/savage_regs.h
index 0272e87b4b..0272e87b4b 100644
--- a/vidix/drivers/savage_regs.h
+++ b/vidix/savage_regs.h
diff --git a/vidix/drivers/savage_vid.c b/vidix/savage_vid.c
index 219a4f595e..ef907f76b9 100644
--- a/vidix/drivers/savage_vid.c
+++ b/vidix/savage_vid.c
@@ -38,12 +38,12 @@
 #include <unistd.h>
 #include <math.h>
 
-#include "../vidix.h"
-#include "../fourcc.h"
-#include "../../libdha/libdha.h"
-#include "../../libdha/pci_ids.h"
-#include "../../libdha/pci_names.h"
-#include "../../config.h"
+#include "vidix.h"
+#include "fourcc.h"
+#include "../libdha/libdha.h"
+#include "../libdha/pci_ids.h"
+#include "../libdha/pci_names.h"
+#include "../config.h"
 
 #include "savage_regs.h"
 
diff --git a/vidix/drivers/sis_bridge.c b/vidix/sis_bridge.c
index 0ac37cf328..5ff0a5991c 100644
--- a/vidix/drivers/sis_bridge.c
+++ b/vidix/sis_bridge.c
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "../../libdha/libdha.h"
+#include "../libdha/libdha.h"
 #include "sis_regs.h"
 #include "sis_defs.h"
 
diff --git a/vidix/drivers/sis_defs.h b/vidix/sis_defs.h
index 3a20195026..3a20195026 100644
--- a/vidix/drivers/sis_defs.h
+++ b/vidix/sis_defs.h
diff --git a/vidix/drivers/sis_regs.h b/vidix/sis_regs.h
index 44efb3b241..44efb3b241 100644
--- a/vidix/drivers/sis_regs.h
+++ b/vidix/sis_regs.h
diff --git a/vidix/drivers/sis_vid.c b/vidix/sis_vid.c
index e42000161e..605f95e5ac 100644
--- a/vidix/drivers/sis_vid.c
+++ b/vidix/sis_vid.c
@@ -30,12 +30,12 @@
 #include <inttypes.h>
 #include <unistd.h>
 
-#include "../vidix.h"
-#include "../fourcc.h"
-#include "../../libdha/libdha.h"
-#include "../../libdha/pci_ids.h"
-#include "../../libdha/pci_names.h"
-#include "../../config.h"
+#include "vidix.h"
+#include "fourcc.h"
+#include "../libdha/libdha.h"
+#include "../libdha/pci_ids.h"
+#include "../libdha/pci_names.h"
+#include "../config.h"
 
 #include "sis_regs.h"
 #include "sis_defs.h"
diff --git a/vidix/drivers/unichrome_regs.h b/vidix/unichrome_regs.h
index 15795f126b..15795f126b 100644
--- a/vidix/drivers/unichrome_regs.h
+++ b/vidix/unichrome_regs.h
diff --git a/vidix/drivers/unichrome_vid.c b/vidix/unichrome_vid.c
index 851915ede5..30730a8939 100644
--- a/vidix/drivers/unichrome_vid.c
+++ b/vidix/unichrome_vid.c
@@ -39,12 +39,12 @@
 #include <inttypes.h>
 #include <unistd.h>
 
-#include "../vidix.h"
-#include "../fourcc.h"
-#include "../../libdha/libdha.h"
-#include "../../libdha/pci_ids.h"
-#include "../../libdha/pci_names.h"
-#include "../../config.h"
+#include "vidix.h"
+#include "fourcc.h"
+#include "../libdha/libdha.h"
+#include "../libdha/pci_ids.h"
+#include "../libdha/pci_names.h"
+#include "../config.h"
 
 #include "unichrome_regs.h"