We no longer need xproto: do not list it as a dependency.
This commit is contained in:
parent
cf80bab8e6
commit
46b7dbdd93
|
@ -35,7 +35,6 @@ AC_SUBST(HTML_CHECK_RESULT)
|
||||||
|
|
||||||
# Checks for pkg-config packages
|
# Checks for pkg-config packages
|
||||||
PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 0.9)
|
PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 0.9)
|
||||||
PKG_CHECK_MODULES(XPROTO, xproto)
|
|
||||||
PKG_CHECK_MODULES(XAU, xau)
|
PKG_CHECK_MODULES(XAU, xau)
|
||||||
|
|
||||||
PKG_CHECK_MODULES(XDMCP, xdmcp,
|
PKG_CHECK_MODULES(XDMCP, xdmcp,
|
||||||
|
|
|
@ -101,8 +101,8 @@ COREPROTO = $(CORESOURCES) $(COREHEADERS)
|
||||||
xcbinclude_HEADERS = xcb.h xcbext.h xcbxlib.h $(COREHEADERS) $(EXTHEADERS)
|
xcbinclude_HEADERS = xcb.h xcbext.h xcbxlib.h $(COREHEADERS) $(EXTHEADERS)
|
||||||
noinst_HEADERS = xcbint.h
|
noinst_HEADERS = xcbint.h
|
||||||
|
|
||||||
AM_CFLAGS = $(COPTFLAGS) $(CWARNFLAGS) $(CDEBUGFLAGS) $(XCBPROTO_CFLAGS) $(XPROTO_CFLAGS) $(XAU_CFLAGS) $(XDMCP_CFLAGS)
|
AM_CFLAGS = $(COPTFLAGS) $(CWARNFLAGS) $(CDEBUGFLAGS) $(XCBPROTO_CFLAGS) $(XAU_CFLAGS) $(XDMCP_CFLAGS)
|
||||||
libxcb_la_LIBADD = $(XCBPROTO_LIBS) $(XPROTO_LIBS) $(XAU_LIBS) $(XDMCP_LIBS)
|
libxcb_la_LIBADD = $(XCBPROTO_LIBS) $(XAU_LIBS) $(XDMCP_LIBS)
|
||||||
libxcb_la_SOURCES = \
|
libxcb_la_SOURCES = \
|
||||||
xcb_conn.c xcb_out.c xcb_in.c xcb_ext.c xcb_xid.c \
|
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 \
|
xcb_list.c xcb_util.c xcb_xlib.c xcb_auth.c \
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
SUBDIRS =
|
SUBDIRS =
|
||||||
EXTRA_DIST = CheckLog.xsl
|
EXTRA_DIST = CheckLog.xsl
|
||||||
AM_MAKEFLAGS = -k
|
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
|
LDADD = @CHECK_LIBS@ $(top_builddir)/src/libxcb.la
|
||||||
|
|
||||||
if HAVE_CHECK
|
if HAVE_CHECK
|
||||||
|
|
|
@ -6,7 +6,6 @@ includedir=@includedir@
|
||||||
Name: XCB
|
Name: XCB
|
||||||
Description: X-protocol C Binding
|
Description: X-protocol C Binding
|
||||||
Version: @PACKAGE_VERSION@
|
Version: @PACKAGE_VERSION@
|
||||||
Requires: xproto
|
|
||||||
Requires.private: xau
|
Requires.private: xau
|
||||||
Libs: -L${libdir} -lxcb
|
Libs: -L${libdir} -lxcb
|
||||||
Libs.private: @LIBS@
|
Libs.private: @LIBS@
|
||||||
|
|
Loading…
Reference in New Issue