summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2006-04-18 00:25:37 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2006-04-18 00:25:37 +0000
commitc7a2971dc18bae08a4f25cb3e70320cb75614515 (patch)
tree1b70b65ebe110655ec24b54c953b5c63574e09e9
parent22f77bbcca23d037232199a8f59ae71364c2fbee (diff)
Bug #6628: Wrap a couple more SDK headers in if XORG, as per Dave Airlie's
commit on 2006-01-18.
-rw-r--r--ChangeLog9
-rw-r--r--exa/Makefile.am2
-rw-r--r--randr/Makefile.am2
3 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8e31fe0c3..90e276d23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,15 @@
reviewed by: Adam Jackson
+ * exa/Makefile.am:
+ * randr/Makefile.am:
+ Bug #6628: 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>
+
+ reviewed by: Adam Jackson
+
* hw/kdrive/ephyr/Makefile.am:
Bug #6628: 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 \