3 files changed, 15 insertions, 4 deletions
diff --git a/contrib/vidix/Makefile.am b/contrib/vidix/Makefile.am
index 7f19e7ce8..a76fc380b 100644
--- a/contrib/vidix/Makefile.am
+++ b/contrib/vidix/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/misc/Makefile.common
 SUBDIRS = drivers
 
 AM_CFLAGS   = $(DEFAULT_OCFLAGS)
-AM_CPPFLAGS = -I$(top_srcdir)/src/video_out/vidix -I$(top_builddir)/src/video_out/libdha
+AM_CPPFLAGS = -I$(top_srcdir)/contrib/vidix -I$(top_builddir)/contrib/libdha
 
 EXTRA_DIST = README vidix.txt
 
@@ -11,6 +11,9 @@ noinst_HEADERS = fourcc.h vidix.h vidixlib.h
 
 noinst_LTLIBRARIES = libvidix.la
 
+$(top_builddir)/contrib/libdha/libdha.la:
+	$(MAKE) -C $(top_builddir)/contrib/libdha libdha.la
+
 libvidix_la_SOURCES = vidixlib.c
-libvidix_la_LIBADD = $(DYNAMIC_LD_LIBS) $(top_builddir)/src/video_out/libdha/libdha.la
+libvidix_la_LIBADD = $(DYNAMIC_LD_LIBS) $(top_builddir)/contrib/libdha/libdha.la
 
diff --git a/contrib/vidix/drivers/Makefile.am b/contrib/vidix/drivers/Makefile.am
index db3adc078..f2711fc07 100644
--- a/contrib/vidix/drivers/Makefile.am
+++ b/contrib/vidix/drivers/Makefile.am
@@ -1,8 +1,8 @@
 include $(top_srcdir)/misc/Makefile.common
 
 AM_CFLAGS   = $(DEFAULT_OCFLAGS)
-AM_CPPFLAGS = -I$(top_srcdir)/src/video_out/vidix \
-              -I$(top_srcdir)/src/video_out/libdha -I$(top_builddir)/src/video_out/libdha
+AM_CPPFLAGS = -I$(top_srcdir)/contrib/vidix \
+              -I$(top_srcdir)/contrib/libdha -I$(top_builddir)/contrib/libdha
 AM_LDFLAGS  = $(xineplug_ldflags)
 
 EXTRA_DIST = genfb_vid.c
@@ -10,6 +10,12 @@ EXTRA_DIST = genfb_vid.c
 noinst_HEADERS = mach64.h glint_regs.h pm3_regs.h radeon.h savage_regs.h \
                  cyberblade_regs.h unichrome_regs.h sis_defs.h sis_regs.h
 
+BUILT_SOURCES = $(top_srcdir)/contrib/libdha/pci_ids.h \
+		$(top_srcdir)/contrib/libdha/pci_names.h
+
+$(BUILT_SOURCES):
+	$(MAKE) -C $(dir $@) $(notdir $@)
+
 vidix_LTLIBRARIES = \
 	mach64_vid.la \
 	mga_crtc2_vid.la \
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index 880e7b30f..4a0c7a65f 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -52,6 +52,8 @@ endif
 
 if ENABLE_VIDIX
 vidix_module = xineplug_vo_out_vidix.la
+$(top_builddir)/contrib/vidix/libvidix.la:
+	$(MAKE) -C $(top_builddir)/contrib/vidix libvidix.la
 endif
 
 if ENABLE_AA