summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2006-04-17 07:27:43 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2006-04-17 07:27:43 +0000
commit0f065059dcaf9c452f1cdec115f619f697fd71cc (patch)
tree06b3417b4cbe08a96ce293f5371662f9c61a09de
parentba632f697a782cd47870705b6cecaac2c60d30ff (diff)
Wrap a couple more SDK headers in if XORG, as per Dave Airlie's commit on
2006-01-18.
-rw-r--r--ChangeLog7
-rw-r--r--exa/Makefile.am2
-rw-r--r--randr/Makefile.am2
3 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 792cf6d42..e6c67279e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2006-04-17 Donnie Berkholz <spyderous@gentoo.org>
+ * exa/Makefile.am:
+ * randr/Makefile.am:
+ Wrap a couple more SDK headers in if XORG, as per Dave Airlie's commit on
+ 2006-01-18.
+
+2006-04-17 Donnie Berkholz <spyderous@gentoo.org>
+
* hw/kdrive/ephyr/Makefile.am:
Fix kdrive build by linking in libexa before KDRIVE_LIBS.
diff --git a/exa/Makefile.am b/exa/Makefile.am
index a4992052d..c9cbf9b45 100644
--- a/exa/Makefile.am
+++ b/exa/Makefile.am
@@ -1,6 +1,8 @@
noinst_LTLIBRARIES = libexa.la
+if XORG
sdk_HEADERS = exa.h
+endif
INCLUDES = \
$(XORG_INCS) \
diff --git a/randr/Makefile.am b/randr/Makefile.am
index 307014201..753eebb54 100644
--- a/randr/Makefile.am
+++ b/randr/Makefile.am
@@ -2,7 +2,9 @@ noinst_LTLIBRARIES = librandr.la
AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
+if XORG
sdk_HEADERS = randrstr.h
+endif
librandr_la_SOURCES = \
mirandr.c \