Merge branch 'master' into staging

Conflicts:
	NEWS
	configure.ac
	src/Makefile.am
	src/gen6_mfc.c
	src/gen6_mfd.c
	src/gen6_vme.c
	src/gen6_vme.h
	src/gen75_mfc.c
	src/gen75_mfd.c
	src/gen75_vme.c
	src/gen75_vpp_vebox.c
	src/gen75_vpp_vebox.h
	src/gen7_mfd.c
	src/i965_avc_bsd.c
	src/i965_decoder.h
	src/i965_decoder_utils.c
	src/i965_defines.h
	src/i965_drv_video.c
	src/i965_drv_video.h
	src/i965_encoder.c
	src/i965_encoder.h
	src/i965_output_dri.c
	src/i965_post_processing.c
	src/i965_post_processing.h
	src/i965_render.c
	src/i965_structs.h
	src/intel_driver.c
	src/object_heap.c
	src/shaders/post_processing/Common/AYUV_Load_16x8.asm
	src/shaders/post_processing/Common/AYUV_Load_16x8.inc
	src/shaders/post_processing/Common/Init_All_Regs.asm
	src/shaders/post_processing/Makefile.am
	src/shaders/post_processing/gen5_6/Common/AYUV_Load_16x8.asm
	src/shaders/post_processing/gen5_6/Common/AYUV_Load_16x8.inc
	src/shaders/post_processing/gen5_6/Common/Init_All_Regs.asm
	src/shaders/post_processing/gen5_6/Common/NV12_Load_8x4.asm
	src/shaders/post_processing/gen5_6/Common/RGBX_Load_16x8.asm
	src/shaders/post_processing/gen5_6/Common/RGBX_Load_16x8.inc
	src/shaders/post_processing/gen5_6/Makefile.am
	src/shaders/post_processing/gen5_6/nv12_avs_nv12.g4b.gen5
	src/shaders/post_processing/gen5_6/nv12_avs_nv12.g6b
	src/shaders/post_processing/gen5_6/nv12_dn_nv12.g4b.gen5
	src/shaders/post_processing/gen5_6/nv12_dn_nv12.g6b
	src/shaders/post_processing/gen5_6/nv12_dndi_nv12.g4b.gen5
	src/shaders/post_processing/gen5_6/nv12_dndi_nv12.g6b
	src/shaders/post_processing/gen5_6/nv12_load_save_nv12.g4b.gen5
	src/shaders/post_processing/gen5_6/nv12_load_save_nv12.g6b
	src/shaders/post_processing/gen5_6/nv12_load_save_pa.g4b.gen5
	src/shaders/post_processing/gen5_6/nv12_load_save_pa.g6b
	src/shaders/post_processing/gen5_6/nv12_load_save_pl3.g4b.gen5
	src/shaders/post_processing/gen5_6/nv12_load_save_pl3.g6b
	src/shaders/post_processing/gen5_6/pa_load_save_nv12.g4b.gen5
	src/shaders/post_processing/gen5_6/pa_load_save_nv12.g6b
	src/shaders/post_processing/gen5_6/pa_load_save_pl3.g4b.gen5
	src/shaders/post_processing/gen5_6/pa_load_save_pl3.g6b
	src/shaders/post_processing/gen5_6/pl3_load_save_nv12.g4b.gen5
	src/shaders/post_processing/gen5_6/pl3_load_save_nv12.g6b
	src/shaders/post_processing/gen5_6/pl3_load_save_pa.g4b.gen5
	src/shaders/post_processing/gen5_6/pl3_load_save_pa.g6b
	src/shaders/post_processing/gen5_6/pl3_load_save_pl3.g4b.gen5
	src/shaders/post_processing/gen5_6/pl3_load_save_pl3.g6b
	src/shaders/post_processing/gen7/EOT.g4a
	src/shaders/post_processing/gen7/Makefile.am
	src/shaders/post_processing/gen7/PA_AVS_Buf_0.g4a
	src/shaders/post_processing/gen7/PA_AVS_Buf_1.g4a
	src/shaders/post_processing/gen7/PA_AVS_Buf_2.g4a
	src/shaders/post_processing/gen7/PA_AVS_Buf_3.g4a
	src/shaders/post_processing/gen7/PL2_AVS_Buf_0.g4a
	src/shaders/post_processing/gen7/PL2_AVS_Buf_1.g4a
	src/shaders/post_processing/gen7/PL2_AVS_Buf_2.g4a
	src/shaders/post_processing/gen7/PL2_AVS_Buf_3.g4a
	src/shaders/post_processing/gen7/PL3_AVS_Buf_0.g4a
	src/shaders/post_processing/gen7/PL3_AVS_Buf_1.g4a
	src/shaders/post_processing/gen7/PL3_AVS_Buf_2.g4a
	src/shaders/post_processing/gen7/PL3_AVS_Buf_3.g4a
	src/shaders/post_processing/gen7/Save_AVS_NV12.g4a
	src/shaders/post_processing/gen7/Save_AVS_PA.g4a
	src/shaders/post_processing/gen7/Save_AVS_PL3.g4a
	src/shaders/post_processing/gen7/Save_AVS_RGB.g4a
	src/shaders/post_processing/gen7/Set_AVS_Buf_0123_BGRA.g4a
	src/shaders/post_processing/gen7/Set_AVS_Buf_0123_PL2.g4a
	src/shaders/post_processing/gen7/Set_AVS_Buf_0123_PL3.g4a
	src/shaders/post_processing/gen7/Set_AVS_Buf_0123_VUYA.g4a
	src/shaders/post_processing/gen7/Set_AVS_Buf_0123_VYUA.g4a
	src/shaders/post_processing/gen7/Set_Layer_0.g4a
	src/shaders/post_processing/gen7/VP_Setup.g4a
	src/shaders/vme/Makefile.am
	src/shaders/vme/inter_frame_haswell.asm
	src/shaders/vme/inter_frame_haswell.g75b
	src/shaders/vme/intra_frame_haswell.asm
	src/shaders/vme/intra_frame_haswell.g75b
	src/shaders/vme/vme75.inc
	src/shaders/vme/vme7_mpeg2.inc

1 files changed, 10 insertions, 8 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 3b020b6e..3299733c 100755
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,7 +22,7 @@
 
 SUBDIRS = shaders
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-DPTHREADS		\
 	$(DRM_CFLAGS)		\
 	$(LIBVA_DEPS_CFLAGS)	\
@@ -55,11 +55,11 @@ source_c = \
 	gen7_mfc.c		\
 	gen7_mfd.c		\
 	gen75_mfd.c		\
-	gen75_vme.c		\
 	gen75_mfc.c		\
-	gen75_vpp_vebox.c	\
-	gen75_vpp_gpe.c  	\
 	gen75_picture_process.c	\
+	gen75_vme.c		\
+	gen75_vpp_gpe.c  	\
+	gen75_vpp_vebox.c	\
 	i965_avc_bsd.c		\
 	i965_avc_hw_scoreboard.c\
 	i965_avc_ildb.c		\
@@ -87,9 +87,9 @@ source_h = \
 	gen6_mfd.h		\
 	gen6_vme.h		\
 	gen7_mfd.h		\
-	gen75_vpp_vebox.h	\
-	gen75_vpp_gpe.h 	\
 	gen75_picture_process.h	\
+	gen75_vpp_gpe.h 	\
+	gen75_vpp_vebox.h	\
 	i965_avc_bsd.h		\
 	i965_avc_hw_scoreboard.h\
 	i965_avc_ildb.h		\
@@ -111,9 +111,11 @@ source_h = \
 	intel_batchbuffer_dump.h\
 	intel_compiler.h	\
 	intel_driver.h          \
+	intel_media.h           \
 	intel_memman.h          \
 	object_heap.h           \
-	intel_media.h           \
+	sysdeps.h		\
+	va_backend_compat.h	\
 	$(NULL)
 
 i965_drv_video_la_LTLIBRARIES	= i965_drv_video.la
@@ -139,7 +141,7 @@ endif
 i965_output_wayland.c: $(protocol_source_h)
 @wayland_scanner_rules@
 
-DIST_SUBDIRS = wayland
+DIST_SUBDIRS = $(SUBDIRS) wayland
 
 # Extra clean files so that maintainer-clean removes *everything*
 MAINTAINERCLEANFILES = Makefile.in config.h.in