summaryrefslogtreecommitdiff
path: root/package/pixman/Makefile
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/pixman/Makefile
parent09d28322f4828a387eeee03d303c833eab8828c5 (diff)
parent32a82e38679501da738199135b35f93ddc8aca0a (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/pixman/Makefile')
-rw-r--r--package/pixman/Makefile18
1 files changed, 3 insertions, 15 deletions
diff --git a/package/pixman/Makefile b/package/pixman/Makefile
index ab3f39899..9ed31b20a 100644
--- a/package/pixman/Makefile
+++ b/package/pixman/Makefile
@@ -5,27 +5,23 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= pixman
PKG_VERSION:= 0.30.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= ae7ac97921dfa59086ca2231621a79c7
PKG_DESCR:= Pixel manipulation library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libpng
PKG_SITES:= http://www.cairographics.org/releases/
+PKG_OPTS:= dev
PKG_ARCH_DEPENDS:= !m68k
-PKG_SUBPKGS:= PIXMAN PIXMAN_DEV
-PKGSC_PIXMAN_DEV:= devel
-PKGSD_PIXMAN_DEV:= Pixel manipulation headers
-
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,PIXMAN,pixman,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,PIXMAN_DEV,pixman-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_PIXMAN_DEV},${PKGSC_PIXMAN_DEV},${PKG_OPTS}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
CONFIGURE_ARGS+= --disable-gtk \
@@ -35,12 +31,4 @@ pixman-install:
${INSTALL_DIR} ${IDIR_PIXMAN}/usr/lib
${CP} ${WRKINST}/usr/lib/libpixman-1.so* ${IDIR_PIXMAN}/usr/lib
-pixman-dev-install:
- ${INSTALL_DIR} ${IDIR_PIXMAN_DEV}/usr/include
- ${CP} ${WRKINST}/usr/include/* \
- ${IDIR_PIXMAN_DEV}/usr/include
- ${INSTALL_DIR} ${IDIR_PIXMAN_DEV}/usr/lib/pkgconfig
- ${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
- ${IDIR_PIXMAN_DEV}/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk