diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-29 16:06:00 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-29 16:06:00 +0100 |
commit | 8e8512391c668fc7074f812f15eabe8f176fb01e (patch) | |
tree | f9f0862dd6eb962fe3fc4803180b431843f6c5be /package/cairo/Makefile | |
parent | c491653a1f9574a42965025805d472c3d145f699 (diff) | |
parent | ae3d4616ed9c19a29d656193254657f93d612fa2 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/cairo/Makefile')
-rw-r--r-- | package/cairo/Makefile | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/package/cairo/Makefile b/package/cairo/Makefile index 887a60425..a1015c603 100644 --- a/package/cairo/Makefile +++ b/package/cairo/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cairo PKG_VERSION:= 1.10.2 -PKG_RELEASE:= 1 +PKG_RELEASE:= 3 PKG_MD5SUM:= f101a9e88b783337b20b2e26dfd26d5f PKG_DESCR:= cairo graphics library PKG_SECTION:= libs @@ -15,21 +15,17 @@ PKG_BUILDDEP:= libpng pixman freetype fontconfig libX11 libXrender glib PKG_BUILDDEP+= libXext PKG_URL:= http://cairographics.org/ PKG_SITES:= http://cairographics.org/releases/ +PKG_OPTS:= dev #DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz -PKG_SUBPKGS:= CAIRO CAIRO_DEV -PKGSC_CAIRO_DEV:= devel -PKGSD_CAIRO_DEV:= cairo headers - ifeq ($(ADK_STATIC),y) -PKG_OPTS:= libonly +PKG_OPTS+= libonly endif include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -$(eval $(call PKG_template,CAIRO_DEV,cairo-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_CAIRO_DEV},${PKGSC_CAIRO_DEV},${PKG_OPTS})) ifeq (,$(filter arm,$(TARGET_ARCH))) TARGET_CFLAGS:= $(filter-out -Os,$(TARGET_CFLAGS)) @@ -45,10 +41,4 @@ cairo-install: ${INSTALL_DIR} ${IDIR_CAIRO}/usr/lib ${CP} ${WRKINST}/usr/lib/libcairo.so* ${IDIR_CAIRO}/usr/lib -cairo-dev-install: - ${INSTALL_DIR} ${IDIR_CAIRO_DEV}/usr/include - ${CP} ${WRKINST}/usr/include/* ${IDIR_CAIRO_DEV}/usr/include - ${INSTALL_DIR} ${IDIR_CAIRO_DEV}/usr/lib/pkgconfig - ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc ${IDIR_CAIRO_DEV}/usr/lib/pkgconfig - include ${TOPDIR}/mk/pkg-bottom.mk |