summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGwenole Beauchesne <gwenole.beauchesne@intel.com>2012-04-16 10:41:56 +0200
committerGwenole Beauchesne <gwenole.beauchesne@intel.com>2012-06-28 10:57:08 +0200
commit55d57a27428b692ce1f61facfe819bb232347c4c (patch)
tree98d520fa617fce5ba6ff2d12f98d863e77846f4c
parent90460bb796d99eaaec71a0a25be936544645446e (diff)
Fix build with alternate X11, GLX and EGL prefixes.
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
-rw-r--r--va/egl/Makefile.am7
-rw-r--r--va/glx/Makefile.am9
-rw-r--r--va/x11/Makefile.am8
3 files changed, 21 insertions, 3 deletions
diff --git a/va/egl/Makefile.am b/va/egl/Makefile.am
index 7de0967..52e7dc1 100644
--- a/va/egl/Makefile.am
+++ b/va/egl/Makefile.am
@@ -20,7 +20,12 @@
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-INCLUDES = -DLINUX -I$(top_srcdir) -I$(top_srcdir)/va $(EGL_DEPS_CFLAGS)
+INCLUDES = \
+ -DLINUX \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/va \
+ $(EGL_DEPS_CFLAGS) \
+ $(NULL)
source_c = \
va_egl.c \
diff --git a/va/glx/Makefile.am b/va/glx/Makefile.am
index 05cfbce..19f2cf5 100644
--- a/va/glx/Makefile.am
+++ b/va/glx/Makefile.am
@@ -20,7 +20,14 @@
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-INCLUDES = -DLINUX -I$(top_srcdir) -I$(top_srcdir)/va -I$(top_srcdir)/va/x11
+INCLUDES = \
+ -DLINUX \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/va \
+ -I$(top_srcdir)/va/x11 \
+ $(X11_CFLAGS) \
+ $(GL_DEPS_CFLAGS) \
+ $(NULL)
source_c = \
va_glx.c \
diff --git a/va/x11/Makefile.am b/va/x11/Makefile.am
index fc20f02..8bcc284 100644
--- a/va/x11/Makefile.am
+++ b/va/x11/Makefile.am
@@ -20,7 +20,13 @@
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-INCLUDES = -DLINUX -I$(top_srcdir) -I$(top_srcdir)/va $(DRM_CFLAGS)
+INCLUDES = \
+ -DLINUX \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/va \
+ $(X11_CFLAGS) \
+ $(DRM_CFLAGS) \
+ $(NULL)
source_c = \
dri2_util.c \