summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2013-12-18 11:41:33 -0800
committerEric Anholt <eric@anholt.net>2014-01-27 09:30:47 -0800
commita7b8ce8b4207a93c0455a0b796cfc47917c04a9c (patch)
tree337623035fc660824cc8b2b40b6ebf936c723d18
parent7759e4d090f56cdcad1c8a2acb2c1be20021de5d (diff)
glamor: Drop xfree86 dependencies from this dix module.
Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com> Reviewed-by: Keith Packard <keithp@keithp.com>
-rw-r--r--glamor/Makefile.am2
-rw-r--r--glamor/glamor.h4
2 files changed, 2 insertions, 4 deletions
diff --git a/glamor/Makefile.am b/glamor/Makefile.am
index 15a8b7409..90d80a746 100644
--- a/glamor/Makefile.am
+++ b/glamor/Makefile.am
@@ -6,7 +6,7 @@ else
libglamor_la_LIBADD = $(GL_LIBS)
endif
-AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS) $(LIBDRM_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(DIX_CFLAGS) $(LIBDRM_CFLAGS)
libglamor_la_LDFLAGS = -version-info 0:0:0
diff --git a/glamor/glamor.h b/glamor/glamor.h
index 7dc297311..f1805e01d 100644
--- a/glamor/glamor.h
+++ b/glamor/glamor.h
@@ -30,14 +30,12 @@
#define GLAMOR_H
#include <scrnintstr.h>
-#include <xf86.h>
-#include <xf86str.h>
#include <pixmapstr.h>
#include <gcstruct.h>
#include <picturestr.h>
#include <fb.h>
#include <fbpict.h>
-#include <xf86xv.h>
+
/*
* glamor_pixmap_type : glamor pixmap's type.
* @MEMORY: pixmap is in memory.