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/libvorbis | |
| parent | 220a96f9926788ed531717f78e44fdf1e7ab3b34 (diff) | |
| parent | 845317b460ee99ad633534cad4de72404af7e30b (diff) | |
resolve merge conflicts
Diffstat (limited to 'package/libvorbis')
| -rw-r--r-- | package/libvorbis/Makefile | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/package/libvorbis/Makefile b/package/libvorbis/Makefile index b9ef7eeda..484ffa867 100644 --- a/package/libvorbis/Makefile +++ b/package/libvorbis/Makefile @@ -13,23 +13,34 @@ PKG_BUILDDEP:= libogg PKG_URL:= http://www.xiph.org/vorbis/ PKG_SITES:= http://downloads.xiph.org/releases/vorbis/ -PKG_SUBPKGS:= LIBVORBIS LIBVORBISENC +PKG_SUBPKGS:= LIBVORBIS LIBVORBISENC LIBVORBIS_DEV +PKGSD_LIBVORBIS_DEV:= development files for libvorbis +PKGSC_LIBVORBIS_DEV:= devel include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBVORBIS,libvorbis,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBVORBISENC,libvorbisenc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBVORBIS_DEV,libvorbis-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBVORBIS_DEV},${PKGSC_LIBVORBIS_DEV})) + +SUB_INSTALLS-y:= +SUB_INSTALLS-m:= +SUB_INSTALLS-${ADK_PACKAGE_LIBVORBIS_DEV}+= libvorbis-dev-install CONFIGURE_ENV+= LIBS="-lm -logg" CONFIGURE_ARGS+= --with-ogg="${STAGING_TARGET_DIR}/usr" \ --with-ogg-includes="${STAGING_TARGET_DIR}/usr/include" \ --with-ogg-libraries="${STAGING_TARGET_DIR}/usr/lib" -post-install: +post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} ${INSTALL_DIR} ${IDIR_LIBVORBIS}/usr/lib - ${CP} ${WRKINST}/usr/lib/libvorbis.so.* ${IDIR_LIBVORBIS}/usr/lib/ - ${CP} ${WRKINST}/usr/lib/libvorbisfile.so.* ${IDIR_LIBVORBIS}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libvorbis.so* ${IDIR_LIBVORBIS}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libvorbisfile.so* ${IDIR_LIBVORBIS}/usr/lib/ ${INSTALL_DIR} ${IDIR_LIBVORBISENC}/usr/lib - ${CP} ${WRKINST}/usr/lib/libvorbisenc.so.* ${IDIR_LIBVORBISENC}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libvorbisenc.so* ${IDIR_LIBVORBISENC}/usr/lib/ + +libvorbis-dev-install: + ${INSTALL_DIR} ${IDIR_LIBVORBIS_DEV}/usr/include/vorbis + ${CP} ${WRKINST}/usr/include/vorbis/*.h ${IDIR_LIBVORBIS_DEV}/usr/include/vorbis include ${TOPDIR}/mk/pkg-bottom.mk |