diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 22:52:51 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 22:52:51 +0100 |
| commit | 58d31896056e604185acf3606b99257cea519dd1 (patch) | |
| tree | 3a0fb34da5dbe8dc12326fcd7fbf0c3916028f41 /package/links | |
| parent | 220a96f9926788ed531717f78e44fdf1e7ab3b34 (diff) | |
| parent | 845317b460ee99ad633534cad4de72404af7e30b (diff) | |
resolve merge conflicts
Diffstat (limited to 'package/links')
| -rw-r--r-- | package/links/Makefile | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/package/links/Makefile b/package/links/Makefile index dae75bd35..33be6b148 100644 --- a/package/links/Makefile +++ b/package/links/Makefile @@ -14,6 +14,11 @@ PKG_BUILDDEP:= openssl libpng jpeg gpm PKG_URL:= http://links.twibright.com/ PKG_SITES:= http://links.twibright.com/download/ +PKG_FLAVOURS:= WITH_DIRECTFB +PKGFD_WITH_DIRECTFB:= enable DirectFB video output support +PKGFS_WITH_DIRECTFB:= directfb +PKGFB_WITH_DIRECTFB:= DirectFB + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LINKS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -21,11 +26,17 @@ $(eval $(call PKG_template,LINKS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG CONFIGURE_ARGS+= --enable-graphics \ --with-ssl \ --without-svgalib \ + --without-libtiff \ --without-x \ - --without-directfb \ --without-pmshell \ --without-atheos +ifeq (${ADK_PACKAGE_LINKS_WITH_DIRECTFB},y) +CONFIGURE_ARGS+= --with-directfb +else +CONFIGURE_ARGS+= --without-directfb +endif + post-install: ${INSTALL_DIR} ${IDIR_LINKS}/usr/bin ${CP} ${WRKINST}/usr/bin/* ${IDIR_LINKS}/usr/bin |