summaryrefslogtreecommitdiff
path: root/package/sdl-image/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/sdl-image/Makefile
parent09d28322f4828a387eeee03d303c833eab8828c5 (diff)
parent32a82e38679501da738199135b35f93ddc8aca0a (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/sdl-image/Makefile')
-rw-r--r--package/sdl-image/Makefile19
1 files changed, 4 insertions, 15 deletions
diff --git a/package/sdl-image/Makefile b/package/sdl-image/Makefile
index 00f5b5a69..b8968bd15 100644
--- a/package/sdl-image/Makefile
+++ b/package/sdl-image/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= sdl-image
PKG_VERSION:= 1.2.10
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 6c06584b31559e2b59f2b982d0d1f628
PKG_DESCR:= Simple DirectMedia Layer
PKG_SECTION:= libs
@@ -14,20 +14,17 @@ PKG_BUILDDEP:= libpng libtiff jpeg sdl
PKG_URL:= http://www.libsdl.org/
PKG_SITES:= http://www.libsdl.org/projects/SDL_image/release/
PKG_NEED_CXX:= 1
+PKG_LIBNAME:= libsdl-image
+PKG_OPTS:= dev
PKG_ARCH_DEPENDS:= !m68k
-PKG_SUBPKGS:= LIBSDL_IMAGE LIBSDL_IMAGE_DEV
-PKGSD_LIBSDL_IMAGE_DEV:=development files for sdlimage
-PKGSC_LIBSDL_IMAGE_DEV:=devel
-
DISTFILES:= SDL_image-${PKG_VERSION}.tar.gz
WRKDIST= ${WRKDIR}/SDL_image-${PKG_VERSION}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBSDL_IMAGE,libsdl-image,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBSDL_IMAGE_DEV,libsdl-image-dev,$(PKG_VERSION)-${PKG_RELEASE},libsdl-image,${PKGSD_LIBSDL_IMAGE_DEV},${PKGSC_LIBSDL_IMAGE_DEV}))
+$(eval $(call PKG_template,LIBSDL_IMAGE,libsdl-image,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIGURE_ARGS+= --enable-png \
--enable-jpg \
@@ -38,12 +35,4 @@ libsdl-image-install:
$(INSTALL_DIR) $(IDIR_LIBSDL_IMAGE)/usr/lib
$(CP) ${WRKINST}/usr/lib/libSDL*.so* $(IDIR_LIBSDL_IMAGE)/usr/lib
-libsdl-image-dev-install:
- $(INSTALL_DIR) $(IDIR_LIBSDL_IMAGE_DEV)/usr/include/SDL
- $(CP) ${WRKINST}/usr/include/SDL/*.h \
- $(IDIR_LIBSDL_IMAGE_DEV)/usr/include/SDL
- $(INSTALL_DIR) $(IDIR_LIBSDL_IMAGE_DEV)/usr/lib/pkgconfig
- $(CP) $(WRKINST)/usr/lib/pkgconfig/*.pc \
- $(IDIR_LIBSDL_IMAGE_DEV)/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk