diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-21 17:25:35 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-21 17:25:35 +0200 |
commit | 98b7adfbd06f0f6bd99ca4805ca34250ee027fa1 (patch) | |
tree | a68345ba8ba7ee532e4b7426cadad31d7add24c0 /package/libpng/Makefile | |
parent | 09d28322f4828a387eeee03d303c833eab8828c5 (diff) | |
parent | 32a82e38679501da738199135b35f93ddc8aca0a (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/libpng/Makefile')
-rw-r--r-- | package/libpng/Makefile | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/package/libpng/Makefile b/package/libpng/Makefile index 9d11abd47..af067f4d2 100644 --- a/package/libpng/Makefile +++ b/package/libpng/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libpng PKG_VERSION:= 1.5.15 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= ea24254980fd820964a710e4d2a947c7 PKG_DESCR:= A library for reading/writing PNG images PKG_SECTION:= libs @@ -13,19 +13,17 @@ PKG_DEPENDS:= zlib PKG_BUILDDEP:= zlib PKG_URL:= http://www.libpng.org/pub/png/libpng.html PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libpng/} +PKG_OPTS:= dev -PKG_SUBPKGS:= LIBPNG LIBPNG_DEV -PKGSD_LIBPNG_DEV:= development files for libpng -PKGSC_LIBPNG_DEV:= devel +PKG_ARCH_DEPENDS:= !m68k ifeq ($(ADK_STATIC),y) -PKG_OPTS:= libonly +PKG_OPTS+= libonly endif include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBPNG,libpng,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -$(eval $(call PKG_template,LIBPNG_DEV,libpng-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBPNG_DEV},${PKGSC_LIBPNG_DEV},${PKG_OPTS})) TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) @@ -33,11 +31,4 @@ libpng-install: ${INSTALL_DIR} ${IDIR_LIBPNG}/usr/lib ${CP} ${WRKINST}/usr/lib/libpng*.so* ${IDIR_LIBPNG}/usr/lib -libpng-dev-install: - ${INSTALL_DIR} ${IDIR_LIBPNG_DEV}/usr/include - ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBPNG_DEV}/usr/include - ${INSTALL_DIR} ${IDIR_LIBPNG_DEV}/usr/lib/pkgconfig - ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \ - ${IDIR_LIBPNG_DEV}/usr/lib/pkgconfig - include ${TOPDIR}/mk/pkg-bottom.mk |