88 files changed, 23 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac
index c5a6dd138..582173f99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1117,11 +1117,18 @@ contrib/Makefile
 contrib/a52dec/Makefile
 contrib/gsm610/Makefile
 contrib/libdca/Makefile
+contrib/libdha/Makefile
+contrib/libdha/bin/Makefile
+contrib/libdha/kernelhelper/Makefile
+contrib/libdha/oth/Makefile
+contrib/libdha/sysdep/Makefile
 contrib/libfaad/Makefile
 contrib/libmad/Makefile
 contrib/libmpcdec/Makefile
 contrib/libxdg-basedir/Makefile
 contrib/nosefart/Makefile
+contrib/vidix/Makefile
+contrib/vidix/drivers/Makefile
 include/Makefile
 include/xine.h
 lib/Makefile
@@ -1178,14 +1185,7 @@ src/post/audio/Makefile
 src/post/deinterlace/Makefile
 src/post/deinterlace/plugins/Makefile
 src/video_out/Makefile
-src/video_out/libdha/Makefile
-src/video_out/libdha/bin/Makefile
-src/video_out/libdha/kernelhelper/Makefile
-src/video_out/libdha/oth/Makefile
-src/video_out/libdha/sysdep/Makefile
 src/video_out/macosx/Makefile
-src/video_out/vidix/Makefile
-src/video_out/vidix/drivers/Makefile
 src/xine-utils/Makefile
 src/xine-engine/Makefile
 src/vdr/Makefile
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index e7fdf5de5..acbdde39a 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,6 +1,19 @@
 SUBDIRS = libmpcdec libxdg-basedir libdca nosefart gsm610 libmad a52dec \
 	libfaad
 
+
+if BUILD_DHA_KMOD
+SUBDIRS += libdha
+endif
+
+# vidix depends on portions of dha
+if ENABLE_VIDIX
+if !BUILD_DHA_KMOD
+SUBDIRS += libdha
+endif
+SUBDIRS += vidix
+endif
+
 srcdir = $(shell cd @srcdir@; pwd)
 
 ffmpeg_builder = $(srcdir)/ffmpeg-universal.sh
diff --git a/src/video_out/libdha/.hgignore b/contrib/libdha/.hgignore
index 7b5ba91fb..7b5ba91fb 100644
--- a/src/video_out/libdha/.hgignore
+++ b/contrib/libdha/.hgignore
diff --git a/src/video_out/libdha/AsmMacros.h b/contrib/libdha/AsmMacros.h
index d1b136a7b..d1b136a7b 100644
--- a/src/video_out/libdha/AsmMacros.h
+++ b/contrib/libdha/AsmMacros.h
diff --git a/src/video_out/libdha/Makefile.am b/contrib/libdha/Makefile.am
index 05aebb704..05aebb704 100644
--- a/src/video_out/libdha/Makefile.am
+++ b/contrib/libdha/Makefile.am
diff --git a/src/video_out/libdha/README b/contrib/libdha/README
index a855880cd..a855880cd 100644
--- a/src/video_out/libdha/README
+++ b/contrib/libdha/README
diff --git a/src/video_out/libdha/bin/Makefile.am b/contrib/libdha/bin/Makefile.am
index 24c6d3abf..24c6d3abf 100644
--- a/src/video_out/libdha/bin/Makefile.am
+++ b/contrib/libdha/bin/Makefile.am
diff --git a/src/video_out/libdha/bin/README b/contrib/libdha/bin/README
index fe4bfa6f3..fe4bfa6f3 100644
--- a/src/video_out/libdha/bin/README
+++ b/contrib/libdha/bin/README
diff --git a/src/video_out/libdha/bin/mapdev.copyright b/contrib/libdha/bin/mapdev.copyright
index b22433d29..b22433d29 100644
--- a/src/video_out/libdha/bin/mapdev.copyright
+++ b/contrib/libdha/bin/mapdev.copyright
diff --git a/src/video_out/libdha/bin/mapdev.vxd b/contrib/libdha/bin/mapdev.vxd
index e09194b84..e09194b84 100644
--- a/src/video_out/libdha/bin/mapdev.vxd
+++ b/contrib/libdha/bin/mapdev.vxd
diff --git a/src/video_out/libdha/cpu_flush.c b/contrib/libdha/cpu_flush.c
index 9186f89e8..9186f89e8 100644
--- a/src/video_out/libdha/cpu_flush.c
+++ b/contrib/libdha/cpu_flush.c
diff --git a/src/video_out/libdha/irq.c b/contrib/libdha/irq.c
index abccaf74c..abccaf74c 100644
--- a/src/video_out/libdha/irq.c
+++ b/contrib/libdha/irq.c
diff --git a/src/video_out/libdha/kernelhelper/Makefile.am b/contrib/libdha/kernelhelper/Makefile.am
index fffaab433..fffaab433 100644
--- a/src/video_out/libdha/kernelhelper/Makefile.am
+++ b/contrib/libdha/kernelhelper/Makefile.am
diff --git a/src/video_out/libdha/kernelhelper/README b/contrib/libdha/kernelhelper/README
index 98a7923b3..98a7923b3 100644
--- a/src/video_out/libdha/kernelhelper/README
+++ b/contrib/libdha/kernelhelper/README
diff --git a/src/video_out/libdha/kernelhelper/dhahelper.c b/contrib/libdha/kernelhelper/dhahelper.c
index 0e755064a..0e755064a 100644
--- a/src/video_out/libdha/kernelhelper/dhahelper.c
+++ b/contrib/libdha/kernelhelper/dhahelper.c
diff --git a/src/video_out/libdha/kernelhelper/dhahelper.h b/contrib/libdha/kernelhelper/dhahelper.h
index 7db56abb5..7db56abb5 100644
--- a/src/video_out/libdha/kernelhelper/dhahelper.h
+++ b/contrib/libdha/kernelhelper/dhahelper.h
diff --git a/src/video_out/libdha/kernelhelper/test.c b/contrib/libdha/kernelhelper/test.c
index d2d807f3f..d2d807f3f 100644
--- a/src/video_out/libdha/kernelhelper/test.c
+++ b/contrib/libdha/kernelhelper/test.c
diff --git a/src/video_out/libdha/libdha.c b/contrib/libdha/libdha.c
index 73a4387a2..73a4387a2 100644
--- a/src/video_out/libdha/libdha.c
+++ b/contrib/libdha/libdha.c
diff --git a/src/video_out/libdha/libdha.h b/contrib/libdha/libdha.h
index 2bd8fe39b..2bd8fe39b 100644
--- a/src/video_out/libdha/libdha.h
+++ b/contrib/libdha/libdha.h
diff --git a/src/video_out/libdha/mmi.c b/contrib/libdha/mmi.c
index 39d21926a..39d21926a 100644
--- a/src/video_out/libdha/mmi.c
+++ b/contrib/libdha/mmi.c
diff --git a/src/video_out/libdha/mtrr.c b/contrib/libdha/mtrr.c
index 48ae5a1fd..48ae5a1fd 100644
--- a/src/video_out/libdha/mtrr.c
+++ b/contrib/libdha/mtrr.c
diff --git a/src/video_out/libdha/oth/Makefile.am b/contrib/libdha/oth/Makefile.am
index 55651d233..55651d233 100644
--- a/src/video_out/libdha/oth/Makefile.am
+++ b/contrib/libdha/oth/Makefile.am
diff --git a/src/video_out/libdha/oth/pci.db b/contrib/libdha/oth/pci.db
index 083b2892f..083b2892f 100644
--- a/src/video_out/libdha/oth/pci.db
+++ b/contrib/libdha/oth/pci.db
diff --git a/src/video_out/libdha/pci.c b/contrib/libdha/pci.c
index db8f4ddd5..db8f4ddd5 100644
--- a/src/video_out/libdha/pci.c
+++ b/contrib/libdha/pci.c
diff --git a/src/video_out/libdha/pci_db2c.awk b/contrib/libdha/pci_db2c.awk
index feaa1c7a1..feaa1c7a1 100644
--- a/src/video_out/libdha/pci_db2c.awk
+++ b/contrib/libdha/pci_db2c.awk
diff --git a/src/video_out/libdha/ports.c b/contrib/libdha/ports.c
index b531082d3..b531082d3 100644
--- a/src/video_out/libdha/ports.c
+++ b/contrib/libdha/ports.c
diff --git a/src/video_out/libdha/sysdep/AsmMacros_alpha.h b/contrib/libdha/sysdep/AsmMacros_alpha.h
index 59da53891..59da53891 100644
--- a/src/video_out/libdha/sysdep/AsmMacros_alpha.h
+++ b/contrib/libdha/sysdep/AsmMacros_alpha.h
diff --git a/src/video_out/libdha/sysdep/AsmMacros_arm32.h b/contrib/libdha/sysdep/AsmMacros_arm32.h
index e618d32ee..e618d32ee 100644
--- a/src/video_out/libdha/sysdep/AsmMacros_arm32.h
+++ b/contrib/libdha/sysdep/AsmMacros_arm32.h
diff --git a/src/video_out/libdha/sysdep/AsmMacros_generic.h b/contrib/libdha/sysdep/AsmMacros_generic.h
index 183f831e5..183f831e5 100644
--- a/src/video_out/libdha/sysdep/AsmMacros_generic.h
+++ b/contrib/libdha/sysdep/AsmMacros_generic.h
diff --git a/src/video_out/libdha/sysdep/AsmMacros_ia64.h b/contrib/libdha/sysdep/AsmMacros_ia64.h
index 7d6123f33..7d6123f33 100644
--- a/src/video_out/libdha/sysdep/AsmMacros_ia64.h
+++ b/contrib/libdha/sysdep/AsmMacros_ia64.h
diff --git a/src/video_out/libdha/sysdep/AsmMacros_powerpc.h b/contrib/libdha/sysdep/AsmMacros_powerpc.h
index 2169c96b4..2169c96b4 100644
--- a/src/video_out/libdha/sysdep/AsmMacros_powerpc.h
+++ b/contrib/libdha/sysdep/AsmMacros_powerpc.h
diff --git a/src/video_out/libdha/sysdep/AsmMacros_sparc.h b/contrib/libdha/sysdep/AsmMacros_sparc.h
index f6717b4bb..f6717b4bb 100644
--- a/src/video_out/libdha/sysdep/AsmMacros_sparc.h
+++ b/contrib/libdha/sysdep/AsmMacros_sparc.h
diff --git a/src/video_out/libdha/sysdep/AsmMacros_x86.h b/contrib/libdha/sysdep/AsmMacros_x86.h
index 97dcaae16..97dcaae16 100644
--- a/src/video_out/libdha/sysdep/AsmMacros_x86.h
+++ b/contrib/libdha/sysdep/AsmMacros_x86.h
diff --git a/src/video_out/libdha/sysdep/Makefile.am b/contrib/libdha/sysdep/Makefile.am
index 807572c39..807572c39 100644
--- a/src/video_out/libdha/sysdep/Makefile.am
+++ b/contrib/libdha/sysdep/Makefile.am
diff --git a/src/video_out/libdha/sysdep/libdha_os2.c b/contrib/libdha/sysdep/libdha_os2.c
index 041f6be71..041f6be71 100644
--- a/src/video_out/libdha/sysdep/libdha_os2.c
+++ b/contrib/libdha/sysdep/libdha_os2.c
diff --git a/src/video_out/libdha/sysdep/libdha_win32.c b/contrib/libdha/sysdep/libdha_win32.c
index 75c5dfb94..75c5dfb94 100644
--- a/src/video_out/libdha/sysdep/libdha_win32.c
+++ b/contrib/libdha/sysdep/libdha_win32.c
diff --git a/src/video_out/libdha/sysdep/pci_386bsd.c b/contrib/libdha/sysdep/pci_386bsd.c
index d00ecb078..d00ecb078 100644
--- a/src/video_out/libdha/sysdep/pci_386bsd.c
+++ b/contrib/libdha/sysdep/pci_386bsd.c
diff --git a/src/video_out/libdha/sysdep/pci_alpha.c b/contrib/libdha/sysdep/pci_alpha.c
index 74c3eb687..74c3eb687 100644
--- a/src/video_out/libdha/sysdep/pci_alpha.c
+++ b/contrib/libdha/sysdep/pci_alpha.c
diff --git a/src/video_out/libdha/sysdep/pci_arm32.c b/contrib/libdha/sysdep/pci_arm32.c
index 6920b615e..6920b615e 100644
--- a/src/video_out/libdha/sysdep/pci_arm32.c
+++ b/contrib/libdha/sysdep/pci_arm32.c
diff --git a/src/video_out/libdha/sysdep/pci_bsdi.c b/contrib/libdha/sysdep/pci_bsdi.c
index b6b142054..b6b142054 100644
--- a/src/video_out/libdha/sysdep/pci_bsdi.c
+++ b/contrib/libdha/sysdep/pci_bsdi.c
diff --git a/src/video_out/libdha/sysdep/pci_freebsd.c b/contrib/libdha/sysdep/pci_freebsd.c
index 9ad4b15f2..9ad4b15f2 100644
--- a/src/video_out/libdha/sysdep/pci_freebsd.c
+++ b/contrib/libdha/sysdep/pci_freebsd.c
diff --git a/src/video_out/libdha/sysdep/pci_generic_cpu.c b/contrib/libdha/sysdep/pci_generic_cpu.c
index 729d48b5a..729d48b5a 100644
--- a/src/video_out/libdha/sysdep/pci_generic_cpu.c
+++ b/contrib/libdha/sysdep/pci_generic_cpu.c
diff --git a/src/video_out/libdha/sysdep/pci_generic_os.c b/contrib/libdha/sysdep/pci_generic_os.c
index 8855bb4ba..8855bb4ba 100644
--- a/src/video_out/libdha/sysdep/pci_generic_os.c
+++ b/contrib/libdha/sysdep/pci_generic_os.c
diff --git a/src/video_out/libdha/sysdep/pci_ia64.c b/contrib/libdha/sysdep/pci_ia64.c
index ef2074ab2..ef2074ab2 100644
--- a/src/video_out/libdha/sysdep/pci_ia64.c
+++ b/contrib/libdha/sysdep/pci_ia64.c
diff --git a/src/video_out/libdha/sysdep/pci_isc.c b/contrib/libdha/sysdep/pci_isc.c
index 5b5a59182..5b5a59182 100644
--- a/src/video_out/libdha/sysdep/pci_isc.c
+++ b/contrib/libdha/sysdep/pci_isc.c
diff --git a/src/video_out/libdha/sysdep/pci_linux.c b/contrib/libdha/sysdep/pci_linux.c
index 1d2116da6..1d2116da6 100644
--- a/src/video_out/libdha/sysdep/pci_linux.c
+++ b/contrib/libdha/sysdep/pci_linux.c
diff --git a/src/video_out/libdha/sysdep/pci_lynx.c b/contrib/libdha/sysdep/pci_lynx.c
index b698f6308..b698f6308 100644
--- a/src/video_out/libdha/sysdep/pci_lynx.c
+++ b/contrib/libdha/sysdep/pci_lynx.c
diff --git a/src/video_out/libdha/sysdep/pci_mach386.c b/contrib/libdha/sysdep/pci_mach386.c
index 31621862b..31621862b 100644
--- a/src/video_out/libdha/sysdep/pci_mach386.c
+++ b/contrib/libdha/sysdep/pci_mach386.c
diff --git a/src/video_out/libdha/sysdep/pci_netbsd.c b/contrib/libdha/sysdep/pci_netbsd.c
index 793944beb..793944beb 100644
--- a/src/video_out/libdha/sysdep/pci_netbsd.c
+++ b/contrib/libdha/sysdep/pci_netbsd.c
diff --git a/src/video_out/libdha/sysdep/pci_openbsd.c b/contrib/libdha/sysdep/pci_openbsd.c
index 89c85eab6..89c85eab6 100644
--- a/src/video_out/libdha/sysdep/pci_openbsd.c
+++ b/contrib/libdha/sysdep/pci_openbsd.c
diff --git a/src/video_out/libdha/sysdep/pci_os2.c b/contrib/libdha/sysdep/pci_os2.c
index ddfc0c0ea..ddfc0c0ea 100644
--- a/src/video_out/libdha/sysdep/pci_os2.c
+++ b/contrib/libdha/sysdep/pci_os2.c
diff --git a/src/video_out/libdha/sysdep/pci_powerpc.c b/contrib/libdha/sysdep/pci_powerpc.c
index 667b4db37..667b4db37 100644
--- a/src/video_out/libdha/sysdep/pci_powerpc.c
+++ b/contrib/libdha/sysdep/pci_powerpc.c
diff --git a/src/video_out/libdha/sysdep/pci_sco.c b/contrib/libdha/sysdep/pci_sco.c
index 9cb2282ad..9cb2282ad 100644
--- a/src/video_out/libdha/sysdep/pci_sco.c
+++ b/contrib/libdha/sysdep/pci_sco.c
diff --git a/src/video_out/libdha/sysdep/pci_sparc.c b/contrib/libdha/sysdep/pci_sparc.c
index ef2074ab2..ef2074ab2 100644
--- a/src/video_out/libdha/sysdep/pci_sparc.c
+++ b/contrib/libdha/sysdep/pci_sparc.c
diff --git a/src/video_out/libdha/sysdep/pci_svr4.c b/contrib/libdha/sysdep/pci_svr4.c
index bcce5c901..bcce5c901 100644
--- a/src/video_out/libdha/sysdep/pci_svr4.c
+++ b/contrib/libdha/sysdep/pci_svr4.c
diff --git a/src/video_out/libdha/sysdep/pci_win32.c b/contrib/libdha/sysdep/pci_win32.c
index 1c88cb13e..1c88cb13e 100644
--- a/src/video_out/libdha/sysdep/pci_win32.c
+++ b/contrib/libdha/sysdep/pci_win32.c
diff --git a/src/video_out/libdha/sysdep/pci_x86.c b/contrib/libdha/sysdep/pci_x86.c
index ef2074ab2..ef2074ab2 100644
--- a/src/video_out/libdha/sysdep/pci_x86.c
+++ b/contrib/libdha/sysdep/pci_x86.c
diff --git a/src/video_out/libdha/test.c b/contrib/libdha/test.c
index 857e739c6..857e739c6 100644
--- a/src/video_out/libdha/test.c
+++ b/contrib/libdha/test.c
diff --git a/src/video_out/vidix/Makefile.am b/contrib/vidix/Makefile.am
index 7f19e7ce8..7f19e7ce8 100644
--- a/src/video_out/vidix/Makefile.am
+++ b/contrib/vidix/Makefile.am
diff --git a/src/video_out/vidix/README b/contrib/vidix/README
index 23bcaca30..23bcaca30 100644
--- a/src/video_out/vidix/README
+++ b/contrib/vidix/README
diff --git a/src/video_out/vidix/drivers/Makefile.am b/contrib/vidix/drivers/Makefile.am
index db3adc078..db3adc078 100644
--- a/src/video_out/vidix/drivers/Makefile.am
+++ b/contrib/vidix/drivers/Makefile.am
diff --git a/src/video_out/vidix/drivers/cyberblade_regs.h b/contrib/vidix/drivers/cyberblade_regs.h
index 1bae61d4a..1bae61d4a 100644
--- a/src/video_out/vidix/drivers/cyberblade_regs.h
+++ b/contrib/vidix/drivers/cyberblade_regs.h
diff --git a/src/video_out/vidix/drivers/cyberblade_vid.c b/contrib/vidix/drivers/cyberblade_vid.c
index 7a32ce7bd..7a32ce7bd 100644
--- a/src/video_out/vidix/drivers/cyberblade_vid.c
+++ b/contrib/vidix/drivers/cyberblade_vid.c
diff --git a/src/video_out/vidix/drivers/genfb_vid.c b/contrib/vidix/drivers/genfb_vid.c
index eaf548438..eaf548438 100644
--- a/src/video_out/vidix/drivers/genfb_vid.c
+++ b/contrib/vidix/drivers/genfb_vid.c
diff --git a/src/video_out/vidix/drivers/glint_regs.h b/contrib/vidix/drivers/glint_regs.h
index f33accd3d..f33accd3d 100644
--- a/src/video_out/vidix/drivers/glint_regs.h
+++ b/contrib/vidix/drivers/glint_regs.h
diff --git a/src/video_out/vidix/drivers/mach64.h b/contrib/vidix/drivers/mach64.h
index 807efdb8d..807efdb8d 100644
--- a/src/video_out/vidix/drivers/mach64.h
+++ b/contrib/vidix/drivers/mach64.h
diff --git a/src/video_out/vidix/drivers/mach64_vid.c b/contrib/vidix/drivers/mach64_vid.c
index 02447af19..02447af19 100644
--- a/src/video_out/vidix/drivers/mach64_vid.c
+++ b/contrib/vidix/drivers/mach64_vid.c
diff --git a/src/video_out/vidix/drivers/mga_vid.c b/contrib/vidix/drivers/mga_vid.c
index eed2b9e65..eed2b9e65 100644
--- a/src/video_out/vidix/drivers/mga_vid.c
+++ b/contrib/vidix/drivers/mga_vid.c
diff --git a/src/video_out/vidix/drivers/nvidia_vid.c b/contrib/vidix/drivers/nvidia_vid.c
index 34fa27cb7..34fa27cb7 100644
--- a/src/video_out/vidix/drivers/nvidia_vid.c
+++ b/contrib/vidix/drivers/nvidia_vid.c
diff --git a/src/video_out/vidix/drivers/pm2_vid.c b/contrib/vidix/drivers/pm2_vid.c
index 075b178de..075b178de 100644
--- a/src/video_out/vidix/drivers/pm2_vid.c
+++ b/contrib/vidix/drivers/pm2_vid.c
diff --git a/src/video_out/vidix/drivers/pm3_regs.h b/contrib/vidix/drivers/pm3_regs.h
index 44cc92dca..44cc92dca 100644
--- a/src/video_out/vidix/drivers/pm3_regs.h
+++ b/contrib/vidix/drivers/pm3_regs.h
diff --git a/src/video_out/vidix/drivers/pm3_vid.c b/contrib/vidix/drivers/pm3_vid.c
index 72a6523b3..72a6523b3 100644
--- a/src/video_out/vidix/drivers/pm3_vid.c
+++ b/contrib/vidix/drivers/pm3_vid.c
diff --git a/src/video_out/vidix/drivers/radeon.h b/contrib/vidix/drivers/radeon.h
index 090fbf8df..090fbf8df 100644
--- a/src/video_out/vidix/drivers/radeon.h
+++ b/contrib/vidix/drivers/radeon.h
diff --git a/src/video_out/vidix/drivers/radeon_vid.c b/contrib/vidix/drivers/radeon_vid.c
index de4e66194..de4e66194 100644
--- a/src/video_out/vidix/drivers/radeon_vid.c
+++ b/contrib/vidix/drivers/radeon_vid.c
diff --git a/src/video_out/vidix/drivers/savage_regs.h b/contrib/vidix/drivers/savage_regs.h
index a8a44c7c3..a8a44c7c3 100644
--- a/src/video_out/vidix/drivers/savage_regs.h
+++ b/contrib/vidix/drivers/savage_regs.h
diff --git a/src/video_out/vidix/drivers/savage_vid.c b/contrib/vidix/drivers/savage_vid.c
index 2ac76198d..2ac76198d 100644
--- a/src/video_out/vidix/drivers/savage_vid.c
+++ b/contrib/vidix/drivers/savage_vid.c
diff --git a/src/video_out/vidix/drivers/sis_bridge.c b/contrib/vidix/drivers/sis_bridge.c
index f6916ae87..f6916ae87 100644
--- a/src/video_out/vidix/drivers/sis_bridge.c
+++ b/contrib/vidix/drivers/sis_bridge.c
diff --git a/src/video_out/vidix/drivers/sis_defs.h b/contrib/vidix/drivers/sis_defs.h
index 79a61a19b..79a61a19b 100644
--- a/src/video_out/vidix/drivers/sis_defs.h
+++ b/contrib/vidix/drivers/sis_defs.h
diff --git a/src/video_out/vidix/drivers/sis_regs.h b/contrib/vidix/drivers/sis_regs.h
index 0157e049a..0157e049a 100644
--- a/src/video_out/vidix/drivers/sis_regs.h
+++ b/contrib/vidix/drivers/sis_regs.h
diff --git a/src/video_out/vidix/drivers/sis_vid.c b/contrib/vidix/drivers/sis_vid.c
index c3ef2bdcf..c3ef2bdcf 100644
--- a/src/video_out/vidix/drivers/sis_vid.c
+++ b/contrib/vidix/drivers/sis_vid.c
diff --git a/src/video_out/vidix/drivers/unichrome_regs.h b/contrib/vidix/drivers/unichrome_regs.h
index 15795f126..15795f126 100644
--- a/src/video_out/vidix/drivers/unichrome_regs.h
+++ b/contrib/vidix/drivers/unichrome_regs.h
diff --git a/src/video_out/vidix/drivers/unichrome_vid.c b/contrib/vidix/drivers/unichrome_vid.c
index b5ff314e6..b5ff314e6 100644
--- a/src/video_out/vidix/drivers/unichrome_vid.c
+++ b/contrib/vidix/drivers/unichrome_vid.c
diff --git a/src/video_out/vidix/fourcc.h b/contrib/vidix/fourcc.h
index 891f0b6ff..891f0b6ff 100644
--- a/src/video_out/vidix/fourcc.h
+++ b/contrib/vidix/fourcc.h
diff --git a/src/video_out/vidix/vidix.h b/contrib/vidix/vidix.h
index bcf6b4ae0..bcf6b4ae0 100644
--- a/src/video_out/vidix/vidix.h
+++ b/contrib/vidix/vidix.h
diff --git a/src/video_out/vidix/vidix.txt b/contrib/vidix/vidix.txt
index e642147b4..e642147b4 100644
--- a/src/video_out/vidix/vidix.txt
+++ b/contrib/vidix/vidix.txt
diff --git a/src/video_out/vidix/vidixlib.c b/contrib/vidix/vidixlib.c
index 37af2035b..37af2035b 100644
--- a/src/video_out/vidix/vidixlib.c
+++ b/contrib/vidix/vidixlib.c
diff --git a/src/video_out/vidix/vidixlib.h b/contrib/vidix/vidixlib.h
index ebc3dd309..ebc3dd309 100644
--- a/src/video_out/vidix/vidixlib.h
+++ b/contrib/vidix/vidixlib.h
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index a4f219b9c..880e7b30f 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -6,18 +6,6 @@ AM_OBJCFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 
 SUBDIRS = 
 
-if BUILD_DHA_KMOD
-SUBDIRS += libdha
-endif
-
-# vidix depends on portions of dha
-if ENABLE_VIDIX
-if !BUILD_DHA_KMOD
-SUBDIRS += libdha
-endif
-SUBDIRS += vidix
-endif
-
 if ENABLE_MACOSX_VIDEO
 SUBDIRS += macosx
 endif
@@ -165,10 +153,10 @@ xineplug_vo_out_pgx32_la_CPPFLAGS = $(AM_CPPFLAGS) $(SUNDGA_CPPFLAGS)
 
 xineplug_vo_out_vidix_la_SOURCES = video_out_vidix.c $(X11OSD)
 xineplug_vo_out_vidix_la_LIBADD =  $(XINE_LIB) $(X_LIBS) \
-	$(top_builddir)/src/video_out/vidix/libvidix.la $(PTHREAD_LIBS)
+	$(top_builddir)/contrib/vidix/libvidix.la $(PTHREAD_LIBS)
 xineplug_vo_out_vidix_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) -fno-strict-aliasing
-xineplug_vo_out_vidix_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/src/video_out/vidix \
-	-I$(top_srcdir)/src/video_out/vidix
+xineplug_vo_out_vidix_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/contrib/vidix \
+	-I$(top_srcdir)/contrib/vidix
 
 
 xineplug_vo_out_aa_la_SOURCES =  video_out_aa.c