summaryrefslogtreecommitdiff
path: root/package/libXext/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/libXext/Makefile
parentc491653a1f9574a42965025805d472c3d145f699 (diff)
parentae3d4616ed9c19a29d656193254657f93d612fa2 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/libXext/Makefile')
-rw-r--r--package/libXext/Makefile20
1 files changed, 4 insertions, 16 deletions
diff --git a/package/libXext/Makefile b/package/libXext/Makefile
index 25760a920..1d60babd8 100644
--- a/package/libXext/Makefile
+++ b/package/libXext/Makefile
@@ -5,26 +5,22 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libXext
PKG_VERSION:= 1.3.1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 249478eae5c4fab7722894cb99565405
PKG_DESCR:= X client interface to extensions of the X protocol
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libX11 xextproto
PKG_SITES:= ${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:= LIBXEXT LIBXEXT_DEV
-PKGSD_LIBXEXT_DEV:= X11 extension headers
-PKGSC_LIBXEXT_DEV:= x11/devel
-PKGSS_LIBXEXT_DEV:= xextproto
+PKG_LIBNAME:= libxext
+PKG_OPTS:= dev
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBXEXT,libxext,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBXEXT_DEV,libxext-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_LIBXEXT_DEV},${PKGSD_LIBXEXT_DEV},${PKGSC_LIBXEXT_DEV},${PKG_OPTS}))
CONFIGURE_ARGS+= --disable-malloc0returnsnull
@@ -32,12 +28,4 @@ libxext-install:
${INSTALL_DIR} ${IDIR_LIBXEXT}/usr/lib
${CP} ${WRKINST}/usr/lib/libXext.so* ${IDIR_LIBXEXT}/usr/lib/
-libxext-dev-install:
- ${INSTALL_DIR} ${IDIR_LIBXEXT_DEV}/usr/include/X11/extensions
- ${CP} ${WRKINST}/usr/include/X11/extensions/*.h \
- ${IDIR_LIBXEXT_DEV}/usr/include/X11/extensions
- ${INSTALL_DIR} ${IDIR_LIBXEXT_DEV}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/xext.pc \
- ${IDIR_LIBXEXT_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk