diff options
| -rw-r--r-- | package/libogg/Makefile | 15 | ||||
| -rw-r--r-- | package/libvorbis/Makefile | 15 |
2 files changed, 27 insertions, 3 deletions
diff --git a/package/libogg/Makefile b/package/libogg/Makefile index baebf4e9a..a672bbe3a 100644 --- a/package/libogg/Makefile +++ b/package/libogg/Makefile @@ -12,12 +12,25 @@ PKG_SECTION:= libs PKG_URL:= http://www.xiph.org/ogg PKG_SITES:= http://downloads.xiph.org/releases/ogg/ +PKG_SUBPKGS:= LIBOGG LIBOGG_DEV +PKGSD_LIBOGG_DEV:= development files for libogg +PKGSC_LIBOGG_DEV:= devel + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBOGG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBOGG_DEV,libogg-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBOGG_DEV},${PKGSC_LIBOGG_DEV})) + +SUB_INSTALLS-y:= +SUB_INSTALLS-m:= +SUB_INSTALLS-${ADK_PACKAGE_LIBOGG_DEV}+= libogg-dev-install -post-install: +post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} ${INSTALL_DIR} ${IDIR_LIBOGG}/usr/lib ${CP} ${WRKINST}/usr/lib/libogg.so* ${IDIR_LIBOGG}/usr/lib/ +libogg-dev-install: + ${INSTALL_DIR} ${IDIR_LIBOGG_DEV}/usr/include/ogg + ${CP} ${WRKINST}/usr/include/ogg/*.h ${IDIR_LIBOGG_DEV}/usr/include/ogg + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libvorbis/Makefile b/package/libvorbis/Makefile index c5ec6bdee..c5d97d973 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_DIR}/usr" \ --with-ogg-includes="${STAGING_DIR}/usr/include" \ --with-ogg-libraries="${STAGING_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/ ${INSTALL_DIR} ${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 |