diff options
-rw-r--r-- | atk/atk_1.2.0.oe | 2 | ||||
-rw-r--r-- | atk/atk_1.6.0.oe | 8 | ||||
-rw-r--r-- | glib-2.0/glib-2.0-native_2.2.3.oe | 8 | ||||
-rw-r--r-- | glib-2.0/glib-2.0-native_2.4.1.oe | 19 | ||||
-rw-r--r-- | glib-2.0/glib-2.0_2.2.3.oe | 8 | ||||
-rw-r--r-- | glib-2.0/glib-2.0_2.4.1.oe | 17 | ||||
-rw-r--r-- | gtk+/gtk+_2.2.4.oe | 8 | ||||
-rw-r--r-- | gtk+/gtk+_2.4.1.oe | 20 | ||||
-rw-r--r-- | libmimedir/libmimedir_0.0-20040307.oe | 1 | ||||
-rw-r--r-- | openobex/openobex_1.0.1.oe | 4 | ||||
-rw-r--r-- | pango/pango_1.2.5.oe | 2 | ||||
-rw-r--r-- | pango/pango_1.4.0.oe | 5 |
12 files changed, 33 insertions, 69 deletions
diff --git a/atk/atk_1.2.0.oe b/atk/atk_1.2.0.oe index c451b1585d..e52e3778b6 100644 --- a/atk/atk_1.2.0.oe +++ b/atk/atk_1.2.0.oe @@ -13,7 +13,7 @@ CFLAGS_append = " -I${STAGING_INCDIR}/glib-2.0 \ -I${STAGING_INCDIR}/glib-2.0/gobject" do_stage () { - oe_libinstall -so -a -C atk libatk-1.0 ${STAGING_LIBDIR} + oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR} install -d ${STAGING_INCDIR}/atk install -m 0644 atk/atkaction.h ${STAGING_INCDIR}/atk/atkaction.h install -m 0644 atk/atkcomponent.h ${STAGING_INCDIR}/atk/atkcomponent.h diff --git a/atk/atk_1.6.0.oe b/atk/atk_1.6.0.oe index fb12c4dc25..73231935f1 100644 --- a/atk/atk_1.6.0.oe +++ b/atk/atk_1.6.0.oe @@ -13,14 +13,10 @@ EXTRA_OECONF = "--disable-glibtest" CFLAGS_append = " -I${STAGING_INCDIR}/glib-2.0 \ -I${STAGING_INCDIR}/glib-2.0/glib \ - -I${STAGING_INCDIR}/glib-2.0/gobject" - -SOV = "0.600.0" + -I${STAGING_INCDIR}/glib-2.0/gobject" do_stage () { - oe_soinstall atk/.libs/libatk-1.0.so.${SOV} ${STAGING_LIBDIR}/ - install -m 0755 atk/.libs/libatk-1.0.lai ${STAGING_LIBDIR}/libatk-1.0.la - install -m 0755 atk/.libs/libatk-1.0.a ${STAGING_LIBDIR}/ + oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR} install -d ${STAGING_INCDIR}/atk install -m 0644 atk/atkaction.h ${STAGING_INCDIR}/atk/atkaction.h install -m 0644 atk/atkcomponent.h ${STAGING_INCDIR}/atk/atkcomponent.h diff --git a/glib-2.0/glib-2.0-native_2.2.3.oe b/glib-2.0/glib-2.0-native_2.2.3.oe index bc8b8177a5..0fc642cb37 100644 --- a/glib-2.0/glib-2.0-native_2.2.3.oe +++ b/glib-2.0/glib-2.0-native_2.2.3.oe @@ -15,10 +15,10 @@ do_configure_prepend () { do_stage () { install -m 0755 gobject/glib-mkenums ${STAGING_BINDIR}/ install -m 0755 gobject/glib-genmarshal ${STAGING_BINDIR}/ - oe_libinstall -so -a -C glib libglib-2.0 ${STAGING_LIBDIR} - oe_libinstall -so -a -C gmodule libgmodule-2.0 ${STAGING_LIBDIR} - oe_libinstall -so -a -C gthread libgthread-2.0 ${STAGING_LIBDIR} - oe_libinstall -so -a -C gobject libgobject-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR} install -d ${STAGING_INCDIR}/glib-2.0/glib install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h install -m 0644 ${S}/glib/glib-object.h ${STAGING_INCDIR}/glib-2.0/glib-object.h diff --git a/glib-2.0/glib-2.0-native_2.4.1.oe b/glib-2.0/glib-2.0-native_2.4.1.oe index 2d3546afb1..2e424cdd02 100644 --- a/glib-2.0/glib-2.0-native_2.4.1.oe +++ b/glib-2.0/glib-2.0-native_2.4.1.oe @@ -17,27 +17,18 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/glib-${PV}.tar.bz2 \ S = "${WORKDIR}/glib-${PV}" -inherit autotools pkgconfig native +inherit autotools pkgconfig native acpaths = "" do_configure_prepend () { install -m 0644 ${FILESDIR}/glibconfig-sysdefs.h . } -SOV = "0.400.1" do_stage () { - oe_soinstall glib/.libs/libglib-2.0.so.${SOV} ${STAGING_LIBDIR}/ - oe_soinstall gmodule/.libs/libgmodule-2.0.so.${SOV} ${STAGING_LIBDIR}/ - oe_soinstall gthread/.libs/libgthread-2.0.so.${SOV} ${STAGING_LIBDIR}/ - oe_soinstall gobject/.libs/libgobject-2.0.so.${SOV} ${STAGING_LIBDIR}/ - install -m 0644 glib/.libs/libglib-2.0.lai ${STAGING_LIBDIR}/libglib-2.0.la - #install -m 0644 glib/.libs/libglib-2.0.a ${STAGING_LIBDIR}/libglib-2.0.a - install -m 0644 gmodule/.libs/libgmodule-2.0.lai ${STAGING_LIBDIR}/libgmodule-2.0.la - #install -m 0644 gmodule/.libs/libgmodule-2.0.a ${STAGING_LIBDIR}/libgmodule-2.0.a - install -m 0644 gthread/.libs/libgthread-2.0.lai ${STAGING_LIBDIR}/libgthread-2.0.la - #install -m 0644 gthread/.libs/libgthread-2.0.a ${STAGING_LIBDIR}/libgthread-2.0.a - install -m 0644 gobject/.libs/libgobject-2.0.lai ${STAGING_LIBDIR}/libgobject-2.0.la - #install -m 0644 gobject/.libs/libgobject-2.0.a ${STAGING_LIBDIR}/libgobject-2.0.a + oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR} install -d ${STAGING_INCDIR}/glib-2.0/glib install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h install -m 0644 ${S}/glib/glib-object.h ${STAGING_INCDIR}/glib-2.0/glib-object.h diff --git a/glib-2.0/glib-2.0_2.2.3.oe b/glib-2.0/glib-2.0_2.2.3.oe index e98409bd71..5b2af4a571 100644 --- a/glib-2.0/glib-2.0_2.2.3.oe +++ b/glib-2.0/glib-2.0_2.2.3.oe @@ -21,10 +21,10 @@ do_configure_prepend () { } do_stage () { - oe_libinstall -so -a -C glib libglib-2.0 ${STAGING_LIBDIR} - oe_libinstall -so -a -C gmodule libgmodule-2.0 ${STAGING_LIBDIR} - oe_libinstall -so -a -C gthread libgthread-2.0 ${STAGING_LIBDIR} - oe_libinstall -so -a -C gobject libgobject-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR} install -d ${STAGING_INCDIR}/glib-2.0/glib install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h install -m 0644 ${S}/glib/glib-object.h ${STAGING_INCDIR}/glib-2.0/glib-object.h diff --git a/glib-2.0/glib-2.0_2.4.1.oe b/glib-2.0/glib-2.0_2.4.1.oe index 219e89a1f8..cba1903851 100644 --- a/glib-2.0/glib-2.0_2.4.1.oe +++ b/glib-2.0/glib-2.0_2.4.1.oe @@ -23,20 +23,11 @@ do_configure_prepend () { install -m 0644 ${FILESDIR}/glibconfig-sysdefs.h . } -SOV = "0.400.1" do_stage () { - oe_soinstall glib/.libs/libglib-2.0.so.${SOV} ${STAGING_LIBDIR}/ - oe_soinstall gmodule/.libs/libgmodule-2.0.so.${SOV} ${STAGING_LIBDIR}/ - oe_soinstall gthread/.libs/libgthread-2.0.so.${SOV} ${STAGING_LIBDIR}/ - oe_soinstall gobject/.libs/libgobject-2.0.so.${SOV} ${STAGING_LIBDIR}/ - install -m 0644 glib/.libs/libglib-2.0.lai ${STAGING_LIBDIR}/libglib-2.0.la - #install -m 0644 glib/.libs/libglib-2.0.a ${STAGING_LIBDIR}/libglib-2.0.a - install -m 0644 gmodule/.libs/libgmodule-2.0.lai ${STAGING_LIBDIR}/libgmodule-2.0.la - #install -m 0644 gmodule/.libs/libgmodule-2.0.a ${STAGING_LIBDIR}/libgmodule-2.0.a - install -m 0644 gthread/.libs/libgthread-2.0.lai ${STAGING_LIBDIR}/libgthread-2.0.la - #install -m 0644 gthread/.libs/libgthread-2.0.a ${STAGING_LIBDIR}/libgthread-2.0.a - install -m 0644 gobject/.libs/libgobject-2.0.lai ${STAGING_LIBDIR}/libgobject-2.0.la - #install -m 0644 gobject/.libs/libgobject-2.0.a ${STAGING_LIBDIR}/libgobject-2.0.a + oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR} install -d ${STAGING_INCDIR}/glib-2.0/glib install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h install -m 0644 ${S}/glib/glib-object.h ${STAGING_INCDIR}/glib-2.0/glib-object.h diff --git a/gtk+/gtk+_2.2.4.oe b/gtk+/gtk+_2.2.4.oe index 4cc114e83a..182527e546 100644 --- a/gtk+/gtk+_2.2.4.oe +++ b/gtk+/gtk+_2.2.4.oe @@ -31,10 +31,10 @@ gdk_include = "gdk.h gdkcolor.h gdkcursor.h gdkdisplay.h gdkdisplaymanager.h gdk gdk_pixbuf_include = "gdk-pixbuf-animation.h gdk-pixbuf-enum-types.h gdk-pixbuf-features.h gdk-pixbuf-io.h gdk-pixbuf-loader.h gdk-pixbuf-marshal.h gdk-pixbuf.h gdk-pixdata.h" do_stage () { - oe_libinstall -a -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR} - oe_libinstall -a -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR} - oe_libinstall -a -so -C contrib/gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0 ${STAGING_LIBDIR} - oe_libinstall -a -so -C gdk-pixbuf libgdk_pixbuf-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C contrib/gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gdk-pixbuf libgdk_pixbuf-2.0 ${STAGING_LIBDIR} mkdir -p ${STAGING_INCDIR}/gtk-2.0/gtk for i in ${gtk_include}; do diff --git a/gtk+/gtk+_2.4.1.oe b/gtk+/gtk+_2.4.1.oe index f73c533d3c..39a9676773 100644 --- a/gtk+/gtk+_2.4.1.oe +++ b/gtk+/gtk+_2.4.1.oe @@ -25,7 +25,6 @@ CFLAGS := "${@'${CFLAGS}'.replace('-frename-registers', '')}" EXTRA_OECONF = "--without-libtiff --enable-debug=no" # --disable-cruft -SOV = "0.400.1" LIBV = "2.4.0" gtk_include = "gtk.h gtkaccelgroup.h gtkaccellabel.h gtkaccelmap.h gtkaccessible.h gtkadjustment.h gtkalignment.h gtkarrow.h gtkaspectframe.h gtkbbox.h gtkbin.h gtkbindings.h gtkbox.h gtkbutton.h gtkcalendar.h gtkcelleditable.h gtkcellrenderer.h gtkcellrendererpixbuf.h gtkcellrenderertext.h gtkcellrenderertoggle.h gtkcheckbutton.h gtkcheckmenuitem.h gtkclipboard.h gtkclist.h gtkcolorsel.h gtkcolorseldialog.h gtkcombo.h gtkcontainer.h gtkctree.h gtkcurve.h gtkdebug.h gtkdialog.h gtkdnd.h gtkdrawingarea.h gtkeditable.h gtkentry.h gtkenums.h gtkeventbox.h gtkfilesel.h gtkfixed.h gtkfontsel.h gtkframe.h gtkgamma.h gtkgc.h gtkhandlebox.h gtkhbbox.h gtkhbox.h gtkhpaned.h gtkhruler.h gtkhscale.h gtkhscrollbar.h gtkhseparator.h gtkiconfactory.h gtkimage.h gtkimagemenuitem.h gtkimcontext.h gtkimcontextsimple.h gtkimmodule.h gtkimmulticontext.h gtkinputdialog.h gtkinvisible.h gtkitem.h gtkitemfactory.h gtklabel.h gtklayout.h gtklist.h gtklistitem.h gtkliststore.h gtkmain.h gtkmarshal.h gtkmenu.h gtkmenubar.h gtkmenuitem.h gtkmenushell.h gtkmessagedialog.h gtkmisc.h gtknotebook.h gtkobject.h gtkoldeditable.h gtkoptionmenu.h gtkpaned.h gtkpixmap.h gtkplug.h gtkpreview.h gtkprivate.h gtkprogress.h gtkprogressbar.h gtkradiobutton.h gtkradiomenuitem.h gtkrange.h gtkrc.h gtkruler.h gtkscale.h gtkscrollbar.h gtkscrolledwindow.h gtkselection.h gtkseparator.h gtkseparatormenuitem.h gtksettings.h gtksignal.h gtksizegroup.h gtksocket.h gtkspinbutton.h gtkstatusbar.h gtkstock.h gtkstyle.h gtktable.h gtktearoffmenuitem.h gtktext.h gtktextbuffer.h gtktextchild.h gtktextdisplay.h gtktextiter.h gtktextlayout.h gtktextmark.h gtktexttag.h gtktexttagtable.h gtktextview.h gtktipsquery.h gtktogglebutton.h gtktoolbar.h gtktooltips.h gtktree.h gtktreednd.h gtktreeitem.h gtktreemodel.h gtktreemodelsort.h gtktreeselection.h gtktreesortable.h gtktreestore.h gtktreeview.h gtktreeviewcolumn.h gtktypebuiltins.h gtktypeutils.h gtkvbbox.h gtkvbox.h gtkversion.h gtkviewport.h gtkvpaned.h gtkvruler.h gtkvscale.h gtkvscrollbar.h gtkvseparator.h gtkwidget.h gtkwindow.h gtkentrycompletion.h gtkcomboboxentry.h gtkcolorbutton.h gtkcombobox.h gtkcelllayout.h gtkactiongroup.h gtkaction.h gtkexpander.h gtkfilechooserdialog.h gtkfilechooserwidget.h gtkfontbutton.h gtkicontheme.h gtkradioaction.h gtkradiotoolbutton.h gtkseparatortoolitem.h gtktoggleaction.h gtktoggletoolbutton.h gtktoolitem.h gtkuimanager.h gtktreemodelfilter.h gtktoolbutton.h gtkfilechooser.h gtkfilefilter.h" @@ -33,21 +32,10 @@ gdk_include = "gdk.h gdkcolor.h gdkcursor.h gdkdisplay.h gdkdisplaymanager.h gdk gdk_pixbuf_include = "gdk-pixbuf-animation.h gdk-pixbuf-enum-types.h gdk-pixbuf-features.h gdk-pixbuf-io.h gdk-pixbuf-loader.h gdk-pixbuf-marshal.h gdk-pixbuf.h gdk-pixdata.h" do_stage () { - oe_soinstall gtk/.libs/libgtk-x11-2.0.so.${SOV} ${STAGING_LIBDIR}/ - install -m 0644 gtk/.libs/libgtk-x11-2.0.lai ${STAGING_LIBDIR}/libgtk-x11-2.0.la - install -m 0644 gtk/.libs/libgtk-x11-2.0.a ${STAGING_LIBDIR}/libgtk-x11-2.0.a - - oe_soinstall gdk/.libs/libgdk-x11-2.0.so.${SOV} ${STAGING_LIBDIR}/ - install -m 0644 gdk/.libs/libgdk-x11-2.0.lai ${STAGING_LIBDIR}/libgdk-x11-2.0.la - install -m 0644 gdk/.libs/libgdk-x11-2.0.a ${STAGING_LIBDIR}/libgdk-x11-2.0.a - - oe_soinstall contrib/gdk-pixbuf-xlib/.libs/libgdk_pixbuf_xlib-2.0.so.${SOV} ${STAGING_LIBDIR}/ - install -m 0644 contrib/gdk-pixbuf-xlib/.libs/libgdk_pixbuf_xlib-2.0.lai ${STAGING_LIBDIR}/ - install -m 0644 contrib/gdk-pixbuf-xlib/.libs/libgdk_pixbuf_xlib-2.0.a ${STAGING_LIBDIR}/ - - oe_soinstall gdk-pixbuf/.libs/libgdk_pixbuf-2.0.so.${SOV} ${STAGING_LIBDIR}/ - install -m 0644 gdk-pixbuf/.libs/libgdk_pixbuf-2.0.lai ${STAGING_LIBDIR}/libgdk_pixbuf-2.0.la - install -m 0644 gdk-pixbuf/.libs/libgdk_pixbuf-2.0.a ${STAGING_LIBDIR}/libgdk_pixbuf-2.0.a + oe_libinstall -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C contrib/gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gdk-pixbuf libgdk_pixbuf-2.0 ${STAGING_LIBDIR} mkdir -p ${STAGING_INCDIR}/gtk-2.0/gtk for i in ${gtk_include}; do diff --git a/libmimedir/libmimedir_0.0-20040307.oe b/libmimedir/libmimedir_0.0-20040307.oe index f4d9962e9d..f9fd48851e 100644 --- a/libmimedir/libmimedir_0.0-20040307.oe +++ b/libmimedir/libmimedir_0.0-20040307.oe @@ -18,4 +18,5 @@ do_stage() { done oe_libinstall -so -C mimedir libmimedir-0.2 ${STAGING_LIBDIR} + ln -sf libmimedir-0.2.so ${STAGING_LIBDIR}/libmimedir.so } diff --git a/openobex/openobex_1.0.1.oe b/openobex/openobex_1.0.1.oe index f3cb00364a..923a998437 100644 --- a/openobex/openobex_1.0.1.oe +++ b/openobex/openobex_1.0.1.oe @@ -8,8 +8,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz" inherit autotools do_stage () { - oe_libinstall -a -so -C src libopenobex-1.0 ${STAGING_LIBDIR} - ln -sf libopenobex-1.0.so ${STAGING_LIBDIR}/libopenobex.so + oe_libinstall -so -C src libopenobex ${STAGING_LIBDIR} + ln -sf libopenobex.so ${STAGING_LIBDIR}/libopenobex-1.0.so install -d ${STAGING_INCDIR}/openobex install -m 0644 src/obex_const.h src/obex.h ${STAGING_INCDIR}/openobex/ cat openobex-config | sed -e 's,/usr/include,${STAGING_INCDIR},g; \ diff --git a/pango/pango_1.2.5.oe b/pango/pango_1.2.5.oe index ea5931f694..9435bbebf3 100644 --- a/pango/pango_1.2.5.oe +++ b/pango/pango_1.2.5.oe @@ -19,7 +19,7 @@ LIBV = "1.2.0" do_stage () { for lib in pango pangox pangoft2 pangoxft; do - oe_libinstall -a -so -C pango $lib-1.0 ${STAGING_LIBDIR} + oe_libinstall -so -C pango lib$lib-1.0 ${STAGING_LIBDIR}/ done install -d ${STAGING_INCDIR}/pango install -m 0644 ${S}/pango/pango*.h ${STAGING_INCDIR}/pango/ diff --git a/pango/pango_1.4.0.oe b/pango/pango_1.4.0.oe index 602ebfc7aa..6e7b95a6b5 100644 --- a/pango/pango_1.4.0.oe +++ b/pango/pango_1.4.0.oe @@ -16,14 +16,11 @@ EXTRA_OECONF = "--disable-glibtest \ FILES_${PN} = "/etc ${bindir} ${libdir}/libpango*.so.*" -SOV = "0.399.1" LIBV = "1.4.0" do_stage () { for lib in pango pangox pangoft2 pangoxft; do - oe_soinstall pango/.libs/lib$lib-1.0.so.${SOV} ${STAGING_LIBDIR}/ - install -m 0644 pango/.libs/lib$lib-1.0.lai ${STAGING_LIBDIR}/lib$lib-1.0.la - install -m 0644 pango/.libs/lib$lib-1.0.a ${STAGING_LIBDIR}/ + oe_libinstall -so -C pango lib$lib-1.0 ${STAGING_LIBDIR}/ done install -d ${STAGING_INCDIR}/pango install -m 0644 ${S}/pango/pango*.h ${STAGING_INCDIR}/pango/ |