summaryrefslogtreecommitdiff
path: root/package/libICE/Makefile
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-11-29 16:06:00 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2013-11-29 16:06:00 +0100
commit8e8512391c668fc7074f812f15eabe8f176fb01e (patch)
treef9f0862dd6eb962fe3fc4803180b431843f6c5be /package/libICE/Makefile
parentc491653a1f9574a42965025805d472c3d145f699 (diff)
parentae3d4616ed9c19a29d656193254657f93d612fa2 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/libICE/Makefile')
-rw-r--r--package/libICE/Makefile18
1 files changed, 4 insertions, 14 deletions
diff --git a/package/libICE/Makefile b/package/libICE/Makefile
index dc7860aa5..aab03316f 100644
--- a/package/libICE/Makefile
+++ b/package/libICE/Makefile
@@ -5,21 +5,18 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libICE
PKG_VERSION:= 1.0.8
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 4b8dae73fce37e994c3a6fa05d6db7ca
PKG_DESCR:= Inter-Client Exchange library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= xtrans xproto
PKG_SITES:= ${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:= LIBICE LIBICE_DEV
-PKGSD_LIBICE_DEV:= Inter-Client Exchange headers
-PKGSC_LIBICE_DEV:= x11/devel
+PKG_LIBNAME:= libice
+PKG_OPTS:= dev
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBICE,libice,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBICE_DEV,libice-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBICE_DEV},${PKGSC_LIBICE_DEV}))
+$(eval $(call PKG_template,LIBICE,libice,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
@@ -27,11 +24,4 @@ libice-install:
${INSTALL_DIR} ${IDIR_LIBICE}/usr/lib
${CP} ${WRKINST}/usr/lib/libICE.so* ${IDIR_LIBICE}/usr/lib
-libice-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBICE_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBICE_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_LIBICE_DEV}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- ${IDIR_LIBICE_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk