diff options
author | David Karlstrom <daka@thg.se> | 2005-08-03 07:29:11 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-03 07:29:11 +0000 |
commit | 97e9c3d88d439b8c43683345320f02b35ec4be36 (patch) | |
tree | 4093fda17198e95ba7a00b37f1b6e6ac68218775 /packages/xfce4-panel | |
parent | bdedcb2aefea95ea9b1bbf87ed63348455605c88 (diff) | |
parent | 2e021572c0f09ee5e23d67c1110226b4998e7171 (diff) |
merge of 0241e7bd233c727dc013a20bd6cbfadd4a2a04dc
and 9b92b607ea4961e9ebb9ee801dfb76e3bf258ed4
Diffstat (limited to 'packages/xfce4-panel')
-rw-r--r-- | packages/xfce4-panel/xfce4-panel.inc | 16 | ||||
-rw-r--r-- | packages/xfce4-panel/xfce4-panel_4.2.0.bb | 25 |
2 files changed, 10 insertions, 31 deletions
diff --git a/packages/xfce4-panel/xfce4-panel.inc b/packages/xfce4-panel/xfce4-panel.inc index 4950da6f68..30473eea06 100644 --- a/packages/xfce4-panel/xfce4-panel.inc +++ b/packages/xfce4-panel/xfce4-panel.inc @@ -2,17 +2,14 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -DESCRIPTION="XFCE4 Panel" +DESCRIPTION = "XFCE4 Panel" SECTION = "x11" -DEPENDS="startup-notification x11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2" +DEPENDS = "startup-notification x11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2" + inherit pkgconfig xfce EXTRA_OECONF += " --enable-startup-notification" -do_install() { - oe_runmake DESTDIR=${D} install -} - HEADERS="controls.h global.h icons.h main.h panel.h item.h \ item_dialog.h plugins.h xfce_support.h xfce.h" @@ -23,3 +20,10 @@ do_stage() { install -m 644 ${S}/panel/$file ${STAGING_INCDIR}/xfce4/panel/$file done } + +do_install() { + oe_runmake DESTDIR=${D} install +} + +PACKAGES += "${PN}-plugins" +FILES_${PN}-plugins += "${libdir}/xfce4/panel-plugins/*.so*" diff --git a/packages/xfce4-panel/xfce4-panel_4.2.0.bb b/packages/xfce4-panel/xfce4-panel_4.2.0.bb deleted file mode 100644 index 4950da6f68..0000000000 --- a/packages/xfce4-panel/xfce4-panel_4.2.0.bb +++ /dev/null @@ -1,25 +0,0 @@ -# xfce4-panel OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION="XFCE4 Panel" -SECTION = "x11" -DEPENDS="startup-notification x11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2" -inherit pkgconfig xfce - -EXTRA_OECONF += " --enable-startup-notification" - -do_install() { - oe_runmake DESTDIR=${D} install -} - -HEADERS="controls.h global.h icons.h main.h panel.h item.h \ - item_dialog.h plugins.h xfce_support.h xfce.h" - -do_stage() { - install -d ${STAGING_INCDIR}/xfce4/panel - - for file in ${HEADERS}; do - install -m 644 ${S}/panel/$file ${STAGING_INCDIR}/xfce4/panel/$file - done -} |