7 files changed, 43 insertions, 33 deletions
diff --git a/src/video_out/vidix/drivers/Makefile.am b/src/video_out/vidix/drivers/Makefile.am
index 8c0bb6f3d..a68628646 100644
--- a/src/video_out/vidix/drivers/Makefile.am
+++ b/src/video_out/vidix/drivers/Makefile.am
@@ -4,8 +4,15 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 libdir = $(XINE_PLUGINDIR)/vidix
 
 if HAVE_VIDIX
-vidix_drivers = radeon_vid.la rage128_vid.la pm3_vid.la mach64_vid.la nvidia_vid.la \
-	genfb_vid.la mga_vid.la mga_crtc2_vid.la
+vidix_drivers = \
+	genfb_vid.la \
+	mach64_vid.la \
+	mga_crtc2_vid.la \
+	mga_vid.la \
+	nvidia_vid.la \
+	pm3_vid.la \
+	radeon_vid.la \
+	rage128_vid.la
 endif
 
 lib_LTLIBRARIES = $(vidix_drivers)
@@ -74,6 +81,9 @@ mga_crtc2_vid_la_LDFLAGS = -avoid-version -module
 
 noinst_HEADERS = mach64.h nvidia.h pm3_regs.h radeon.h
 
+AM_CPPFLAGS = -I$(top_srcdir)/src/video_out/vidix \
+	-I$(top_srcdir)/src/video_out/libdha
+
 debug:
 	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) -DXINE_COMPILE"
 
diff --git a/src/video_out/vidix/drivers/genfb_vid.c b/src/video_out/vidix/drivers/genfb_vid.c
index 3dacd4beb..82633eda3 100644
--- a/src/video_out/vidix/drivers/genfb_vid.c
+++ b/src/video_out/vidix/drivers/genfb_vid.c
@@ -6,11 +6,11 @@
 #include <inttypes.h>
 #include <fcntl.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.h"
+#include "pci_ids.h"
+#include "pci_names.h"
 
 #define DEMO_DRIVER 1
 
diff --git a/src/video_out/vidix/drivers/mach64_vid.c b/src/video_out/vidix/drivers/mach64_vid.c
index 9b630375f..8c4f00868 100644
--- a/src/video_out/vidix/drivers/mach64_vid.c
+++ b/src/video_out/vidix/drivers/mach64_vid.c
@@ -25,11 +25,11 @@
 #endif
 
 
-#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.h"
+#include "pci_ids.h"
+#include "pci_names.h"
 
 #include "mach64.h"
 
diff --git a/src/video_out/vidix/drivers/mga_vid.c b/src/video_out/vidix/drivers/mga_vid.c
index f34f5ed20..39b2176b2 100644
--- a/src/video_out/vidix/drivers/mga_vid.c
+++ b/src/video_out/vidix/drivers/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.h"
+#include "pci_ids.h"
+#include "pci_names.h"
 
 #if    !defined(ENOTSUP) && defined(EOPNOTSUPP)
 #define ENOTSUP EOPNOTSUPP
diff --git a/src/video_out/vidix/drivers/nvidia_vid.c b/src/video_out/vidix/drivers/nvidia_vid.c
index 0a639e93a..4f40fdd33 100644
--- a/src/video_out/vidix/drivers/nvidia_vid.c
+++ b/src/video_out/vidix/drivers/nvidia_vid.c
@@ -5,11 +5,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.h"
+#include "pci_ids.h"
+#include "pci_names.h"
 
 #include "nvidia.h"
 
diff --git a/src/video_out/vidix/drivers/pm3_vid.c b/src/video_out/vidix/drivers/pm3_vid.c
index 2078113cc..c5b97782c 100644
--- a/src/video_out/vidix/drivers/pm3_vid.c
+++ b/src/video_out/vidix/drivers/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.h"
+#include "pci_ids.h"
+#include "pci_names.h"
+#include "config.h"
 
 #include "pm3_regs.h"
 
diff --git a/src/video_out/vidix/drivers/radeon_vid.c b/src/video_out/vidix/drivers/radeon_vid.c
index ed5a4ee41..8d8805264 100644
--- a/src/video_out/vidix/drivers/radeon_vid.c
+++ b/src/video_out/vidix/drivers/radeon_vid.c
@@ -12,11 +12,11 @@
 #include <math.h>
 #include <inttypes.h>
 #include <sys/mman.h>
-#include "../../libdha/pci_ids.h"
-#include "../../libdha/pci_names.h"
-#include "../vidix.h"
-#include "../fourcc.h"
-#include "../../libdha/libdha.h"
+#include "pci_ids.h"
+#include "pci_names.h"
+#include "vidix.h"
+#include "fourcc.h"
+#include "libdha.h"
 #include "radeon.h"
 
 #ifdef RAGE128