[Xcb-commit] 2 commits - xcb-util

[Josh Triplett]

 xcb-util/icccm/Makefile.am     |    1 -
 xcb-util/icccm/xcb-icccm.pc.in |    2 +-
 xcb-util/keysyms/xcb_keysyms.h |    2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

New commits:
diff-tree 9895e42193297a5630bf9435fb25a4ebf2c7aa9f (from 39ca34b6eb103484550e80b7ce0bce51843c5eee)
Author: Josh Triplett <josh at freedesktop.org>
Date:   Fri Apr 28 11:38:41 2006 -0700

    Make xcb_keysyms.h self-contained by including xcb.h

diff --git a/xcb-util/keysyms/xcb_keysyms.h b/xcb-util/keysyms/xcb_keysyms.h
index d9e36cd..b5ef9f2 100644
--- a/xcb-util/keysyms/xcb_keysyms.h
+++ b/xcb-util/keysyms/xcb_keysyms.h
@@ -1,6 +1,6 @@
 #ifndef __XCB_KEYSYMS_H__
 #define __XCB_KEYSYMS_H__
-
+#include <X11/XCB/xcb.h>
 
 
 typedef struct _XCBKeySymbols XCBKeySymbols;
diff-tree 39ca34b6eb103484550e80b7ce0bce51843c5eee (from 2aca179885b88aff8fa258666367850cd8820d97)
Author: Josh Triplett <josh at freedesktop.org>
Date:   Fri Apr 28 11:30:11 2006 -0700

    xcb-icccm doesn't use xcb-event; it just needs the headers due to xcb-property, and can't use the xcb-property pkg-config file from within the same source tree to pull it in.

diff --git a/xcb-util/icccm/Makefile.am b/xcb-util/icccm/Makefile.am
index dd63eb5..337e410 100644
--- a/xcb-util/icccm/Makefile.am
+++ b/xcb-util/icccm/Makefile.am
@@ -11,7 +11,6 @@ libXCBICCCM_la_SOURCES = icccm.c
 libXCBICCCM_la_CFLAGS = $(XCB_CFLAGS) -I../atom -I../event -I../property
 libXCBICCCM_la_LIBADD = $(XCB_LIBS) \
 	-L../atom -lXCBAtom \
-	-L../event -lXCBEvent \
 	-L../property -lXCBProperty
 
 pkgconfig_DATA = xcb-icccm.pc
diff --git a/xcb-util/icccm/xcb-icccm.pc.in b/xcb-util/icccm/xcb-icccm.pc.in
index c1c4e2d..9eb6613 100644
--- a/xcb-util/icccm/xcb-icccm.pc.in
+++ b/xcb-util/icccm/xcb-icccm.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: XCBICCCM
 Description: XCB ICCCM binding
 Version: @PACKAGE_VERSION@
-Requires: xcb xcb-atom xcb-event xcb-property
+Requires: xcb xcb-atom xcb-property
 Libs: -L${libdir} -lXCBICCCM @LIBS@
 Cflags: -I${includedir}