[xine-cvs] HG: xine-lib-1.2: Make vidix buildable again.

[<li...@yo...>]

# HG changeset patch
# User Darren Salt <li...@yo...>
# Date 1180643740 -3600
# Node ID 13315cf8b38d28a5a65c2dd5b124d538ba83585f
# Parent  c208e467fee95a8646d8d5d7945f611db6a40efa
Make vidix buildable again.

diff -r 13315cf8b38d28a5a65c2dd5b124d538ba83585f -r c208e467fee95a8646d8d5d7945f611db6a40efa contrib/vidix/Makefile.am
--- a/contrib/vidix/Makefile.am	Thu May 31 21:35:40 2007 +0100
+++ b/contrib/vidix/Makefile.am	Thu May 31 22:26:56 2007 +0200
@@ -3,7 +3,7 @@ SUBDIRS = drivers
 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 vidixl
 
 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 -r 13315cf8b38d28a5a65c2dd5b124d538ba83585f -r c208e467fee95a8646d8d5d7945f611db6a40efa contrib/vidix/drivers/Makefile.am
--- a/contrib/vidix/drivers/Makefile.am	Thu May 31 21:35:40 2007 +0100
+++ b/contrib/vidix/drivers/Makefile.am	Thu May 31 22:26:56 2007 +0200
@@ -1,14 +1,20 @@ include $(top_srcdir)/misc/Makefile.comm
 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
 
 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 \
diff -r 13315cf8b38d28a5a65c2dd5b124d538ba83585f -r c208e467fee95a8646d8d5d7945f611db6a40efa src/video_out/Makefile.am
--- a/src/video_out/Makefile.am	Thu May 31 21:35:40 2007 +0100
+++ b/src/video_out/Makefile.am	Thu May 31 22:26:56 2007 +0200
@@ -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