New project build rules and files.

16 files changed, 38 insertions, 14 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 405489b4..7a8de4db 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,11 +23,9 @@
 SUBDIRS = shaders
 
 INCLUDES = \
-	-I$(top_srcdir)		\
-	-I$(top_srcdir)/va	\
-	-I$(top_srcdir)/va/x11	\
 	-DPTHREADS		\
 	$(DRM_CFLAGS)		\
+	$(LIBVA_DEPS_CFLAGS)	\
 	$(NULL)
 
 driver_cflags = \
@@ -39,7 +37,13 @@ driver_ldflags = \
 	-module -avoid-version	\
 	-no-undefined		\
 	-Wl,--no-undefined	\
+	$(NULL)
+
+driver_libs = \
+	-lpthread		\
 	$(DRM_LIBS) -ldrm_intel	\
+	$(LIBVA_DEPS_LIBS)	\
+	$(LIBVA_X11_DEPS_LIBS)	\
 	$(NULL)
 
 source_c = \
@@ -94,6 +98,9 @@ i965_drv_video_la_LTLIBRARIES	= i965_drv_video.la
 i965_drv_video_ladir		= $(LIBVA_DRIVERS_PATH)
 i965_drv_video_la_CFLAGS	= $(driver_cflags)
 i965_drv_video_la_LDFLAGS	= $(driver_ldflags)
-i965_drv_video_la_LIBADD	= $(top_builddir)/va/libva-x11.la -lpthread
+i965_drv_video_la_LIBADD	= $(driver_libs)
 i965_drv_video_la_SOURCES	= $(source_c)
 noinst_HEADERS			= $(source_h)
+
+# Extra clean files so that maintainer-clean removes *everything*
+MAINTAINERCLEANFILES = Makefile.in config.h.in
diff --git a/src/i965_avc_bsd.c b/src/i965_avc_bsd.c
index 2fa53fc1..9fa9649a 100644
--- a/src/i965_avc_bsd.c
+++ b/src/i965_avc_bsd.c
@@ -30,8 +30,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include "va_backend.h"
-
 #include "intel_batchbuffer.h"
 #include "intel_driver.h"
 
diff --git a/src/i965_avc_hw_scoreboard.c b/src/i965_avc_hw_scoreboard.c
index 3fb7ae3a..b17ea83f 100644
--- a/src/i965_avc_hw_scoreboard.c
+++ b/src/i965_avc_hw_scoreboard.c
@@ -30,8 +30,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include "va_backend.h"
-
 #include "intel_batchbuffer.h"
 #include "intel_driver.h"
 
diff --git a/src/i965_avc_ildb.c b/src/i965_avc_ildb.c
index 0518a181..a4277d7a 100644
--- a/src/i965_avc_ildb.c
+++ b/src/i965_avc_ildb.c
@@ -30,7 +30,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include "va_backend.h"
 
 #include "intel_batchbuffer.h"
 #include "intel_driver.h"
diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c
index 72f82b7b..e788bc59 100644
--- a/src/i965_drv_video.c
+++ b/src/i965_drv_video.c
@@ -32,7 +32,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "va/x11/va_dricommon.h"
+#include <va/va_dricommon.h>
 
 #include "intel_driver.h"
 #include "intel_memman.h"
diff --git a/src/i965_media_h264.c b/src/i965_media_h264.c
index ddc43de5..b31ef0bd 100644
--- a/src/i965_media_h264.c
+++ b/src/i965_media_h264.c
@@ -3,7 +3,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include "va_backend.h"
 
 #include "intel_batchbuffer.h"
 #include "intel_driver.h"
diff --git a/src/i965_render.c b/src/i965_render.c
index fee71090..ad8de1ef 100644
--- a/src/i965_render.c
+++ b/src/i965_render.c
@@ -37,7 +37,7 @@
 #include <assert.h>
 
 #include <va/va_backend.h>
-#include "va/x11/va_dricommon.h"
+#include <va/va_dricommon.h>
 
 #include "intel_batchbuffer.h"
 #include "intel_driver.h"
diff --git a/src/intel_driver.c b/src/intel_driver.c
index 5ccdfa58..5fd22c92 100644
--- a/src/intel_driver.c
+++ b/src/intel_driver.c
@@ -29,7 +29,7 @@
 
 #include <assert.h>
 
-#include "va_dricommon.h"
+#include <va/va_dricommon.h>
 
 #include "intel_batchbuffer.h"
 #include "intel_memman.h"
diff --git a/src/shaders/Makefile.am b/src/shaders/Makefile.am
index 17770a92..6669923e 100644
--- a/src/shaders/Makefile.am
+++ b/src/shaders/Makefile.am
@@ -1 +1,4 @@
 SUBDIRS = h264 mpeg2 render post_processing vme
+
+# Extra clean files so that maintainer-clean removes *everything*
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/shaders/h264/Makefile.am b/src/shaders/h264/Makefile.am
index d6d106b3..68a9b59a 100644
--- a/src/shaders/h264/Makefile.am
+++ b/src/shaders/h264/Makefile.am
@@ -1 +1,4 @@
 SUBDIRS = mc
+
+# Extra clean files so that maintainer-clean removes *everything*
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/shaders/h264/mc/Makefile.am b/src/shaders/h264/mc/Makefile.am
index a4ab3c05..f3be1ed7 100644
--- a/src/shaders/h264/mc/Makefile.am
+++ b/src/shaders/h264/mc/Makefile.am
@@ -182,3 +182,6 @@ clean-local:
 	-rm -f $(INTEL_G4B_GEN5)
 	-rm -f $(INTEL_MC_G4B_GEN5) $(INTEL_MC_EXPORT_GEN5)
 endif    
+
+# Extra clean files so that maintainer-clean removes *everything*
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/shaders/mpeg2/Makefile.am b/src/shaders/mpeg2/Makefile.am
index e5c6e7f0..97955947 100644
--- a/src/shaders/mpeg2/Makefile.am
+++ b/src/shaders/mpeg2/Makefile.am
@@ -1 +1,4 @@
 SUBDIRS = vld
+
+# Extra clean files so that maintainer-clean removes *everything*
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/shaders/mpeg2/vld/Makefile.am b/src/shaders/mpeg2/vld/Makefile.am
index ff534fe0..04130546 100644
--- a/src/shaders/mpeg2/vld/Makefile.am
+++ b/src/shaders/mpeg2/vld/Makefile.am
@@ -1,4 +1,3 @@
-
 INTEL_G4I = addidct.g4i               \
 	    do_iq_intra.g4i           \
 	    do_iq_non_intra.g4i       \
@@ -88,3 +87,6 @@ clean-local:
 	-rm -f $(INTEL_G4B)
 	-rm -f $(INTEL_G4B_GEN5)
 endif    
+
+# Extra clean files so that maintainer-clean removes *everything*
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/shaders/post_processing/Makefile.am b/src/shaders/post_processing/Makefile.am
index e5af86b4..762c3ce3 100644
--- a/src/shaders/post_processing/Makefile.am
+++ b/src/shaders/post_processing/Makefile.am
@@ -140,3 +140,6 @@ clean-local:
 	-rm -f $(INTEL_PP_G6B)
 
 endif    
+
+# Extra clean files so that maintainer-clean removes *everything*
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/shaders/render/Makefile.am b/src/shaders/render/Makefile.am
index a571ea25..b3a8c236 100644
--- a/src/shaders/render/Makefile.am
+++ b/src/shaders/render/Makefile.am
@@ -87,3 +87,6 @@ clean-local:
 	-rm -f $(INTEL_G6B)
 	-rm -f $(INTEL_G7B)
 endif    
+
+# Extra clean files so that maintainer-clean removes *everything*
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/shaders/vme/Makefile.am b/src/shaders/vme/Makefile.am
index e1097a78..5252ff9f 100644
--- a/src/shaders/vme/Makefile.am
+++ b/src/shaders/vme/Makefile.am
@@ -35,3 +35,6 @@ clean-local:
 	-rm -f $(INTEL_G7B)
 
 endif    
+
+# Extra clean files so that maintainer-clean removes *everything*
+MAINTAINERCLEANFILES = Makefile.in