We no longer need xproto: do not list it as a dependency.
authorJamey Sharp <jamey@minilop.net>
Mon, 25 Sep 2006 09:00:23 +0000 (02:00 -0700)
committerJamey Sharp <jamey@minilop.net>
Mon, 25 Sep 2006 09:00:23 +0000 (02:00 -0700)
configure.ac
src/Makefile.am
tests/Makefile.am
xcb.pc.in

index 022b617..d72677c 100644 (file)
@@ -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,
index 41c6e0e..f49cc38 100644 (file)
@@ -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 \
index 5926d29..77593f0 100644 (file)
@@ -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
index 4d6bc30..d2b5ec6 100644 (file)
--- 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@