summaryrefslogtreecommitdiff
path: root/package/libXi
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/libXi
parentc491653a1f9574a42965025805d472c3d145f699 (diff)
parentae3d4616ed9c19a29d656193254657f93d612fa2 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/libXi')
-rw-r--r--package/libXi/Makefile18
1 files changed, 5 insertions, 13 deletions
diff --git a/package/libXi/Makefile b/package/libXi/Makefile
index 54ddb1f86..0e204f07c 100644
--- a/package/libXi/Makefile
+++ b/package/libXi/Makefile
@@ -5,37 +5,29 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libXi
PKG_VERSION:= 1.6.1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= d024a9de73191628f9772893f02054d8
PKG_DESCR:= X Window System client interface to the XINPUT extension to the X protocol.
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= xproto xextproto libXext
PKG_URL:= http://xorg.freedesktop.org/
PKG_SITES:= ${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:= LIBXI LIBXI_DEV
-PKGSS_LIBXI_DEV:= inputproto
-PKGSC_LIBXI_DEV:= x11/devel
+PKG_LIBNAME:= libxi
+PKG_OPTS:= dev
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBXI,libxi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},$(PKG_OPTS)))
-$(eval $(call PKG_template,LIBXI_DEV,libxi-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_LIBXI_DEV},${PKG_DESCR},${PKGSC_LIBXI_DEV},$(PKG_OPTS)))
CONFIGURE_ARGS+= --disable-malloc0returnsnull
-post-install:
+libxi-install:
$(INSTALL_DIR) $(IDIR_LIBXI)/usr/lib
$(CP) $(WRKINST)/usr/lib/libXi*.so* \
$(IDIR_LIBXI)/usr/lib
-libxi-dev-install:
- $(INSTALL_DIR) $(IDIR_LIBXI_DEV)/usr/include
- $(CP) $(WRKINST)/usr/include/* \
- $(IDIR_LIBXI_DEV)/usr/include
-
include ${TOPDIR}/mk/pkg-bottom.mk