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/DirectFB | |
| parent | 09d28322f4828a387eeee03d303c833eab8828c5 (diff) | |
| parent | 32a82e38679501da738199135b35f93ddc8aca0a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/DirectFB')
| -rw-r--r-- | package/DirectFB/Makefile | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/package/DirectFB/Makefile b/package/DirectFB/Makefile index 3b4654eff..14eef4e6e 100644 --- a/package/DirectFB/Makefile +++ b/package/DirectFB/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= DirectFB PKG_VERSION:= 1.6.3 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_EXTRAVER:= 1.6-0 PKG_MD5SUM:= 641e8e999c017770da647f9b5b890906 PKG_DESCR:= Thin graphic library for the Linux framebuffer devices @@ -14,15 +14,12 @@ PKG_DEPENDS:= libpng libjpeg libfreetype PKG_BUILDDEP:= libpng jpeg freetype PKG_URL:= http://www.directfb.org/ PKG_SITES:= http://directfb.org/downloads/Core/DirectFB-1.6/ - -PKG_SUBPKGS:= DIRECTFB DIRECTFB_DEV -PKGSD_DIRECTFB_DEV:= development files for DirectFB -PKGSC_DIRECTFB_DEV:= devel +PKG_LIBNAME:= directfb +PKG_OPTS:= dev include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,DIRECTFB,directfb,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,DIRECTFB_DEV,directfb-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DIRECTFB_DEV},${PKGSC_DIRECTFB_DEV})) +$(eval $(call PKG_template,DIRECTFB,directfb,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64 -L$(STAGING_DIR)/usr/lib32 CONFIGURE_ARGS+= --with-inputdrivers=linuxinput,keyboard,ps2mouse \ @@ -47,7 +44,7 @@ ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y) XAKE_FLAGS+= LDFLAGS=$(ADK_TARGET_ABI_CFLAGS) endif -post-install: +directfb-install: ${INSTALL_DIR} ${IDIR_DIRECTFB}/etc ${INSTALL_DATA} ./files/directfbrc ${IDIR_DIRECTFB}/etc $(INSTALL_DIR) $(IDIR_DIRECTFB)/usr/lib/directfb-${PKG_EXTRAVER}/{inputdrivers,systems,wm} @@ -67,11 +64,4 @@ post-install: ${CP} ${WRKINST}/usr/lib/directfb-${PKG_EXTRAVER}/interfaces/IDirectFBVideoProvider/*.so \ ${IDIR_DIRECTFB}/usr/lib/directfb-${PKG_EXTRAVER}/interfaces/IDirectFBVideoProvider -directfb-dev-install: - ${INSTALL_DIR} ${IDIR_DIRECTFB_DEV}/usr/include - ${CP} ${WRKINST}/usr/include/directfb ${IDIR_DIRECTFB_DEV}/usr/include - ${INSTALL_DIR} ${IDIR_DIRECTFB_DEV}/usr/bin - ${INSTALL_BIN} ${WRKINST}/usr/bin/directfb-config \ - ${IDIR_DIRECTFB_DEV}/usr/bin - include ${TOPDIR}/mk/pkg-bottom.mk |