diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-07-05 16:21:53 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-07-05 16:21:53 +0000 |
| commit | 8d3f7b27e80ba08d2dc0e8167f01d27527697e06 (patch) | |
| tree | b1fa703042aa93dc9aaa90df0695211de7d9e807 /packages/libqpe | |
| parent | b0dc3a8d1dc7e79b7960ee7503d80a7d43b8793f (diff) | |
| parent | 2ed2875b6c56be3a2f2b9db557e22024d3e92dd6 (diff) | |
merge of '6ecc6574ba0db38196a290448aaaf3706bcacee3'
and '7314baf01ff720449ddb034e256e260501df588f'
Diffstat (limited to 'packages/libqpe')
| -rw-r--r-- | packages/libqpe/libqpe-opie.inc | 17 | ||||
| -rw-r--r-- | packages/libqpe/libqpe-opie_cvs.bb | 2 |
2 files changed, 3 insertions, 16 deletions
diff --git a/packages/libqpe/libqpe-opie.inc b/packages/libqpe/libqpe-opie.inc index 292a29f7bd..2218734fea 100644 --- a/packages/libqpe/libqpe-opie.inc +++ b/packages/libqpe/libqpe-opie.inc @@ -16,14 +16,6 @@ EXTRA_QMAKEVARS_PRE += "CONFIG+=LIBQPE_WITHROHFEEDBACK" EXTRA_QMAKEVARS_POST += "DESTDIR= DEFINES+=LIBQPE_NO_INLINE_IMAGES" CXXFLAGS_append = " -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC" -#CXXFLAGS_append_c7x0 = " -DOPIE_NO_WINDOWED " -#CXXFLAGS_append_tosa = " -DOPIE_NO_WINDOWED " -#CXXFLAGS_append_spitz = " -DOPIE_NO_WINDOWED " -#CXXFLAGS_append_akita = " -DOPIE_NO_WINDOWED " - -do_compile_prepend_mnci () { - ln -s custom-ramses.h custom.h -} do_compile() { mkdir -p ${STAGING_INCDIR}/qpe \ @@ -53,9 +45,9 @@ do_stage() { } do_install() { - oe_libinstall -so libqpe ${D}${palmtopdir}/lib + oe_libinstall -so libqpe ${D}${libdir} - install -d ${D}${includedir}/qpe \ + install -d ${D}${includedir}/qpe \ ${D}${includedir}/qtopia/private for i in ${S}/*.h @@ -72,8 +64,3 @@ do_install() { done rm -f ${D}${includedir}/qtopia/*_p.h # remove private stuff out of qtopia } - -FILES_${PN} = "${palmtopdir}/lib/libqpe.so.*" -FILES_${PN}-dev = "${includedir} ${palmtopdir}/lib/*.so" -FILES_${PN}-dbg = "${palmtopdir}/lib/.debug/" -#PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}" diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb index a91ccfcc01..f206529480 100644 --- a/packages/libqpe/libqpe-opie_cvs.bb +++ b/packages/libqpe/libqpe-opie_cvs.bb @@ -1,7 +1,7 @@ require ${PN}.inc PV = "1.2.2+cvs${SRCDATE}" -PR = "r9" +PR = "r10" SRC_URI = "${HANDHELDS_CVS};module=opie/library \ file://fix-titleheight.patch;patch=1 \ |