Ryan M. Raasch wrote: > Added the enable/disable switches for e_dbus. > Syntax fixes in .in file.
Fine! Squash into the previous e_dbus patch and repost. So that I have a single e_dbus patch that applies intop if my next/efl branch. Marc > > Signed-off-by: Ryan M. Raasch <ryan.raa...@gmail.com> > --- > rules/e_dbus.in | 6 ++++-- > rules/e_dbus.make | 25 +++++++++++++++---------- > 2 files changed, 19 insertions(+), 12 deletions(-) > > diff --git a/rules/e_dbus.in b/rules/e_dbus.in > index b517ab1..e984025 100644 > --- a/rules/e_dbus.in > +++ b/rules/e_dbus.in > @@ -1,16 +1,17 @@ > ## SECTION=multimedia_efl > > -config E_DBUS > +menuconfig E_DBUS > tristate > select DBUS > select EINA > select ECORE > - prompt "e_dbus" > + prompt "e_dbus " > help > This is the start of some basic convenience wrappers around dbus > to ease integrating dbus with EFL based applications. > > if E_DBUS > + > config E_DBUS_ECONNMAN > bool > prompt "econnman" > @@ -46,4 +47,5 @@ config E_DBUS_EUKIT > prompt "eukit" > help > Efl Dbus communication wrappers to Ukit. > + > endif > diff --git a/rules/e_dbus.make b/rules/e_dbus.make > index 387d309..b87b437 100644 > --- a/rules/e_dbus.make > +++ b/rules/e_dbus.make > @@ -28,33 +28,39 @@ E_DBUS_DIR := $(BUILDDIR)/$(E_DBUS) > E_DBUS_CONF_TOOL := autoconf > E_DBUS_CONF_OPT := $(CROSS_AUTOCONF_USR) > > -# Connman > ifdef PTXCONF_E_DBUS_ECONNMAN > E_DBUS_CONF_OPT += --enable-econnman > +else > +E_DBUS_CONF_OPT += --disable-econnman > endif > > -#Ehal > -ifndef PTXCONF_E_DBUS_EHAL > +ifdef PTXCONF_E_DBUS_EHAL > +E_DBUS_CONF_OPT += --enable-ehal > +else > E_DBUS_CONF_OPT += --disable-ehal > endif > > -#ENotify > -ifndef PTXCONF_E_DBUS_ENOTIFY > +ifdef PTXCONF_E_DBUS_ENOTIFY > +E_DBUS_CONF_OPT += --enable-enotify > +else > E_DBUS_CONF_OPT += --disable-enotify > endif > > -#EBluez > ifdef PTXCONF_E_DBUS_EBLUEZ > E_DBUS_CONF_OPT += --enable-ebluez > +else > +E_DBUS_CONF_OPT += --disable-ebluez > endif > > -#EOfono > ifdef PTXCONF_E_DBUS_EOFONO > E_DBUS_CONF_OPT += --enable-eofono > +else > +E_DBUS_CONF_OPT += --disable-eofono > endif > > -#EUkit > -ifndef PTXCONF_E_DBUS_EUKIT > +ifdef PTXCONF_E_DBUS_EUKIT > +E_DBUS_CONF_OPT += --enable-eukit > +else > E_DBUS_CONF_OPT += --disable-eukit > endif > > @@ -80,7 +86,6 @@ ifdef PTXCONF_E_DBUS_EHAL > @$(call install_lib, e_dbus, 0, 0, 0644, libehal-ver-svn-06) > endif > > -# enotify not a loadable .so > #ifdef PTXCONF_E_DBUS_ENOTIFY > # @$(call install_lib, e_dbus, 0, 0, 0644, libenotify-ver-svn-06) > #endif -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
signature.asc
Description: OpenPGP digital signature
-- ptxdist mailing list ptxdist@pengutronix.de
