summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJamey Sharp <jamey@minilop.net>2006-09-25 02:00:23 -0700
committerJamey Sharp <jamey@minilop.net>2006-09-25 02:00:23 -0700
commit46b7dbdd9306235ae04da9d0e3431a1b58f89048 (patch)
treec77ba6dae24e0df5f25abb0b0c8cf64adba2b14e
parentcf80bab8e6410915ad27a61cef3bb5f456c7d80f (diff)
We no longer need xproto: do not list it as a dependency.
-rw-r--r--configure.ac1
-rw-r--r--src/Makefile.am4
-rw-r--r--tests/Makefile.am2
-rw-r--r--xcb.pc.in1
4 files changed, 3 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index 022b617..d72677c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,6 @@ AC_SUBST(HTML_CHECK_RESULT)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 0.9)
-PKG_CHECK_MODULES(XPROTO, xproto)
PKG_CHECK_MODULES(XAU, xau)
PKG_CHECK_MODULES(XDMCP, xdmcp,
diff --git a/src/Makefile.am b/src/Makefile.am
index 41c6e0e..f49cc38 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -101,8 +101,8 @@ COREPROTO = $(CORESOURCES) $(COREHEADERS)
xcbinclude_HEADERS = xcb.h xcbext.h xcbxlib.h $(COREHEADERS) $(EXTHEADERS)
noinst_HEADERS = xcbint.h
-AM_CFLAGS = $(COPTFLAGS) $(CWARNFLAGS) $(CDEBUGFLAGS) $(XCBPROTO_CFLAGS) $(XPROTO_CFLAGS) $(XAU_CFLAGS) $(XDMCP_CFLAGS)
-libxcb_la_LIBADD = $(XCBPROTO_LIBS) $(XPROTO_LIBS) $(XAU_LIBS) $(XDMCP_LIBS)
+AM_CFLAGS = $(COPTFLAGS) $(CWARNFLAGS) $(CDEBUGFLAGS) $(XCBPROTO_CFLAGS) $(XAU_CFLAGS) $(XDMCP_CFLAGS)
+libxcb_la_LIBADD = $(XCBPROTO_LIBS) $(XAU_LIBS) $(XDMCP_LIBS)
libxcb_la_SOURCES = \
xcb_conn.c xcb_out.c xcb_in.c xcb_ext.c xcb_xid.c \
xcb_list.c xcb_util.c xcb_xlib.c xcb_auth.c \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5926d29..77593f0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,7 +4,7 @@
SUBDIRS =
EXTRA_DIST = CheckLog.xsl
AM_MAKEFLAGS = -k
-AM_CFLAGS = -Wall -Werror $(XPROTO_CFLAGS) @CHECK_CFLAGS@ -I$(top_srcdir)/src
+AM_CFLAGS = -Wall -Werror @CHECK_CFLAGS@ -I$(top_srcdir)/src
LDADD = @CHECK_LIBS@ $(top_builddir)/src/libxcb.la
if HAVE_CHECK
diff --git a/xcb.pc.in b/xcb.pc.in
index 4d6bc30..d2b5ec6 100644
--- a/xcb.pc.in
+++ b/xcb.pc.in
@@ -6,7 +6,6 @@ includedir=@includedir@
Name: XCB
Description: X-protocol C Binding
Version: @PACKAGE_VERSION@
-Requires: xproto
Requires.private: xau
Libs: -L${libdir} -lxcb
Libs.private: @LIBS@