diff options
author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-05-11 05:22:24 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-05-11 05:22:24 +0000 |
commit | 10c7149170c9123592c43909c3443b58ff71d372 (patch) | |
tree | 6f19254c9007119afccbcbb59a9c113d2cc2b8fe /packages/xfce | |
parent | 5648d5dbe9e49b2c53d0c80899370c6979b121da (diff) | |
parent | 242485f1bf19d1b1a6ba08e74afc98d160135bf3 (diff) |
merge of 'd1543bd877e6311e2749d600361efe4cd9878cac'
and 'dfdbf1d54d6ce999d055cd74a93fa254d002e119'
Diffstat (limited to 'packages/xfce')
-rw-r--r-- | packages/xfce/libxfce4util.inc | 11 | ||||
-rw-r--r-- | packages/xfce/xfce4-dev-tools.inc | 12 | ||||
-rw-r--r-- | packages/xfce/xfce4-dev-tools_4.4.0.bb | 1 |
3 files changed, 17 insertions, 7 deletions
diff --git a/packages/xfce/libxfce4util.inc b/packages/xfce/libxfce4util.inc index b30c8f9445..d5dd6d6565 100644 --- a/packages/xfce/libxfce4util.inc +++ b/packages/xfce/libxfce4util.inc @@ -5,20 +5,17 @@ DESCRIPTION = "Basic utility library for Xfce4" SECTION = "x11/libs" LICENSE = "GPL" -DEPENDS = "glib-2.0" +DEPENDS = "glib-2.0 xfce4-dev-tools" inherit xfce pkgconfig -XFCE_HEADERS="debug.h utf8.h xfce-generics.h xfce-resource.h \ - i18n.h util.h xfce-kiosk.h libxfce4util-config.h \ - xfce-desktopentry.h xfce-miscutils.h libxfce4util.h \ - xfce-fileutils.h xfce-rc.h" - MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4" do_stage() { install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/libxfce4util - for file in ${XFCE_HEADERS}; do + # The line below expands to the list of headers that native makefile + # would install. Complain and/or fix if it's not portable enough + for file in $(eval $(make -n -C libxfce4util install|grep "^list='[^.]\\+.h"|cut -d\; -f1); echo $list); do install -m 644 libxfce4util/$file ${STAGING_INCDIR}/libxfce4util done diff --git a/packages/xfce/xfce4-dev-tools.inc b/packages/xfce/xfce4-dev-tools.inc new file mode 100644 index 0000000000..03f64e39e5 --- /dev/null +++ b/packages/xfce/xfce4-dev-tools.inc @@ -0,0 +1,12 @@ +DESCRIPTION = "Xfce4 development tools" +SECTION = "x11/libs" +LICENSE = "GPL" + +inherit xfce pkgconfig + +do_stage() { + install -d ${STAGING_DATADIR}/aclocal + install -m 644 m4macros/*.m4 ${STAGING_DATADIR}/aclocal/ +} + +FILES_${PN}-dev += " ${datadir}/xfce4/dev-tools/m4macros/*.m4" diff --git a/packages/xfce/xfce4-dev-tools_4.4.0.bb b/packages/xfce/xfce4-dev-tools_4.4.0.bb new file mode 100644 index 0000000000..bd54419686 --- /dev/null +++ b/packages/xfce/xfce4-dev-tools_4.4.0.bb @@ -0,0 +1 @@ +require ${PN}.inc |