summaryrefslogtreecommitdiff
path: root/package/sdl
diff options
context:
space:
mode:
Diffstat (limited to 'package/sdl')
-rw-r--r--package/sdl/Makefile20
1 files changed, 4 insertions, 16 deletions
diff --git a/package/sdl/Makefile b/package/sdl/Makefile
index d08555c60..08e47eaf5 100644
--- a/package/sdl/Makefile
+++ b/package/sdl/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= sdl
PKG_VERSION:= 1.2.14
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= e52086d1b508fa0b76c52ee30b55bec4
PKG_DESCR:= Simple DirectMedia Layer
PKG_SECTION:= libs
@@ -13,6 +13,8 @@ PKG_DEPENDS:= libusb alsa-lib libpthread libx11 libxext
PKG_BUILDDEP:= libusb alsa-lib libX11 libXext
PKG_URL:= http://www.libsdl.org/
PKG_SITES:= http://www.libsdl.org/release/
+PKG_LIBNAME:= libsdl
+PKG_OPTS:= dev
PKG_ARCH_DEPENDS:= !m68k
@@ -21,17 +23,12 @@ PKGFD_WITH_TSLIB:= enable touchscreen support
PKGFS_WITH_TSLIB:= tslib
PKGFB_WITH_TSLIB:= tslib
-PKG_SUBPKGS:= LIBSDL LIBSDL_DEV
-PKGSD_LIBSDL_DEV:= development files for libsdl
-PKGSC_LIBSDL_DEV:= devel
-
DISTFILES:= SDL-${PKG_VERSION}.tar.gz
WRKDIST= ${WRKDIR}/SDL-${PKG_VERSION}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBSDL_DEV,libsdl-dev,$(PKG_VERSION)-${PKG_RELEASE},libsdl,${PKGSD_LIBSDL_DEV},${PKGSC_LIBSDL_DEV}))
+$(eval $(call PKG_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
ifeq ($(ADK_PACKAGE_SDL_WITH_TSLIB),y)
CONFIGURE_ARGS+= --enable-input-tslib
@@ -50,13 +47,4 @@ libsdl-install:
$(INSTALL_DIR) $(IDIR_LIBSDL)/usr/lib
$(CP) ${WRKINST}/usr/lib/libSDL*.so* $(IDIR_LIBSDL)/usr/lib
-libsdl-dev-install:
- $(INSTALL_DIR) $(IDIR_LIBSDL_DEV)/usr/bin
- ${INSTALL_BIN} ${WRKINST}/usr/bin/sdl-config \
- $(IDIR_LIBSDL_DEV)/usr/bin
- $(INSTALL_DIR) $(IDIR_LIBSDL_DEV)/usr/include/SDL
- $(CP) ${WRKINST}/usr/include/SDL/* $(IDIR_LIBSDL_DEV)/usr/include/SDL
- $(INSTALL_DIR) $(IDIR_LIBSDL_DEV)/usr/lib/pkgconfig
- $(CP) ${WRKINST}/usr/lib/pkgconfig/*.pc $(IDIR_LIBSDL_DEV)/usr/lib/pkgconfig
-
include ${TOPDIR}/mk/pkg-bottom.mk