summaryrefslogtreecommitdiff
path: root/package/libxcb
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-10-21 17:25:35 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2013-10-21 17:25:35 +0200
commit98b7adfbd06f0f6bd99ca4805ca34250ee027fa1 (patch)
treea68345ba8ba7ee532e4b7426cadad31d7add24c0 /package/libxcb
parent09d28322f4828a387eeee03d303c833eab8828c5 (diff)
parent32a82e38679501da738199135b35f93ddc8aca0a (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/libxcb')
-rw-r--r--package/libxcb/Makefile18
1 files changed, 3 insertions, 15 deletions
diff --git a/package/libxcb/Makefile b/package/libxcb/Makefile
index cf292f384..91dbe7c29 100644
--- a/package/libxcb/Makefile
+++ b/package/libxcb/Makefile
@@ -5,22 +5,17 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libxcb
PKG_VERSION:= 1.7
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= f715e53c9c1b25f856d14d6123663d96
PKG_DESCR:= X11 keyboard library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= python2 libpthread-stubs libxslt libXau xcb-proto
PKG_SITES:= ${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:= LIBXCB LIBXCB_DEV
-PKGSD_LIBXCB_DEV:= XML-XCB protocol headers
-PKGSS_LIBXCB_DEV:= libxcb
-PKGSC_LIBXCB_DEV:= x11/devel
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBXCB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXCB_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBXCB_DEV},${PKGSD_LIBXCB_DEV},${PKGSC_LIBXCB_DEV}))
+$(eval $(call PKG_template,LIBXCB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
include $(TOPDIR)/mk/python.mk
@@ -31,11 +26,4 @@ libxcb-install:
${INSTALL_DIR} ${IDIR_LIBXCB}/usr/lib
${CP} ${WRKINST}/usr/lib/libxcb*.so* ${IDIR_LIBXCB}/usr/lib
-libxcb-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBXCB_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/xcb ${IDIR_LIBXCB_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_LIBXCB_DEV}/usr/lib/pkgconfig
- ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- ${IDIR_LIBXCB_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk