efl: merge edbus (v2).

SVN revision: 81825

AUTHORS

@@ -204,3 +204,12 @@ Mikael SANS <sans.mikael@gmail.com>
 Mike Blumenkrantz (zmike/discomfitor) <michael.blumenkrantz@gmail.com>
 Jérôme Pinot <ngc891@gmail.com>
 Daniel Willmann <d.willmann@samsung.com>
+
+
+EDBus
+-----
+
+Gustavo Sverzut Barbieri <barbieri@profusion.mobi>
+José Roberto de Souza <zehortigoza@profusion.mobi>
+Leandro Pereira <leandro@profusion.mobi>
+Lucas De Marchi <lucas.demarchi@profusion.mobi>

Makefile.am

@@ -94,7 +94,8 @@ pc/ecore-imf.pc \
 pc/ecore-imf-evas.pc \
 pc/ecore-evas.pc \
 pc/embryo.pc \
-pc/eio.pc
+pc/eio.pc \
+pc/edbus2.pc
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA =
@@ -122,7 +123,8 @@ pc/ecore-imf.pc \
 pc/ecore-imf-evas.pc \
 pc/ecore-evas.pc \
 pc/embryo.pc \
-pc/eio.pc
+pc/eio.pc \
+pc/edbus2.pc
 
 if BUILD_ENGINE_SOFTWARE_X11
 pkgconfig_DATA += pc/evas-software-x11.pc

configure.ac

@@ -155,9 +155,9 @@ requirements_libs_ecore_x=""
 requirements_libs_ecore_evas=""
 requirements_libs_embryo=""
 requirements_libs_eio=""
+requirements_libs_edbus=""
 #requirements_libs_edje=""
 #requirements_libs_efreet=""
-#requirements_libs_e_dbus=""
 #requirements_libs_eeze=""
 #requirements_libs_emotion=""
 #requirements_libs_ethumb=""
@@ -185,9 +185,9 @@ requirements_pc_ecore_x=""
 requirements_pc_ecore_evas=""
 requirements_pc_embryo=""
 requirements_pc_eio=""
+requirements_pc_edbus=""
 #requirements_pc_edje=""
 #requirements_pc_efreet=""
-#requirements_pc_e_dbus=""
 #requirements_pc_eeze=""
 #requirements_pc_emotion=""
 #requirements_pc_ethumb=""
@@ -204,9 +204,9 @@ requirements_pc_deps_ecore_sdl=""
 requirements_pc_deps_ecore_wayland=""
 requirements_pc_deps_ecore_evas=""
 requirements_pc_deps_embryo=""
+requirements_pc_deps_edbus=""
 #requirements_pc_deps_edje=""
 #requirements_pc_deps_efreet=""
-#requirements_pc_deps_e_dbus=""
 #requirements_pc_deps_eeze=""
 #requirements_pc_deps_emotion=""
 #requirements_pc_deps_ethumb=""
@@ -234,9 +234,9 @@ AC_SUBST([requirements_libs_ecore_x])
 AC_SUBST([requirements_libs_ecore_evas])
 AC_SUBST([requirements_libs_embryo])
 AC_SUBST([requirements_libs_eio])
+AC_SUBST([requirements_libs_edbus])
 #AC_SUBST([requirements_libs_edje])
 #AC_SUBST([requirements_libs_efreet])
-#AC_SUBST([requirements_libs_e_dbus])
 #AC_SUBST([requirements_libs_eeze])
 #AC_SUBST([requirements_libs_emotion])
 #AC_SUBST([requirements_libs_ethumb])
@@ -264,9 +264,9 @@ AC_SUBST([requirements_pc_ecore_x])
 AC_SUBST([requirements_pc_ecore_evas])
 AC_SUBST([requirements_pc_embryo])
 AC_SUBST([requirements_pc_eio])
+AC_SUBST([requirements_pc_edbus])
 #AC_SUBST([requirements_pc_edje])
 #AC_SUBST([requirements_pc_efreet])
-#AC_SUBST([requirements_pc_e_dbus])
 #AC_SUBST([requirements_pc_eeze])
 #AC_SUBST([requirements_pc_emotion])
 #AC_SUBST([requirements_pc_ethumb])
@@ -3344,6 +3344,42 @@ AC_MSG_RESULT([${have_xattr}])
 #### End of Eio
 
 
+#### EDBus
+
+AC_MSG_NOTICE([EDBus checks])
+
+### Additional options to configure
+
+### Default values
+
+### Checks for programs
+
+### Checks for libraries
+
+## Eina, Ecore, Ecore_Input
+
+requirements_pc_edbus="ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION}"
+
+EFL_DEPEND_PKG([edbus], [DBUS], [dbus-1])
+
+PKG_CHECK_MODULES([EDBUS], [${requirements_pc_deps_edbus}])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+#### End of EDBus
+
+
+
 AC_CONFIG_FILES([
 Makefile
 data/Makefile
@@ -3360,6 +3396,7 @@ src/examples/eo/Makefile
 src/examples/evas/Makefile
 src/examples/ecore/Makefile
 src/examples/eio/Makefile
+src/examples/edbus/Makefile
 src/lib/eina/eina_config.h
 src/lib/ecore_x/ecore_x_version.h
 spec/efl.spec
@@ -3401,6 +3438,7 @@ pc/ecore-imf-evas.pc
 pc/ecore-audio.pc
 pc/embryo.pc
 pc/eio.pc
+pc/edbus2.pc
 $po_makefile_in
 ])
 

doc/Doxyfile.in

@@ -598,7 +598,8 @@ INPUT                  = @top_srcdir@/src/lib \
                          @srcdir@/eet_examples.dox \
                          @srcdir@/evas_examples.dox \
                          @srcdir@/eo_tutorial.dox \
-                         @builddir@/eio.dox
+                         @builddir@/eio.dox \
+                         @builddir@/edbus.dox
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is

doc/main.dox

@@ -14,98 +14,102 @@
  * @li @ref ecore_main
  * @li @ref escape_main
  * @li @ref evil_main
+ * @li @ref edbus_main
  *
  */
 
 /**
  * @page authors Authors
  *
- * @author Carsten Haitzler <raster@@@rasterman.com>
- * @author Tom Gilbert <tom@@linuxbrit.co.uk>
+ * @author Adam Simpkins <adam@@adamsimpkins.net>
+ * @author Albin "Lutin" Tonnerre <albin.tonnerre@@gmail.com>
+ * @author Andre Dieb <andre.dieb@@gmail.com>
+ * @author Andrew Elcock <andy@@elcock.org>
+ * @author Arnaud de Turckheim 'quarium' <quarium@@gmail.com>
+ * @author Bernhard Nemec <Bernhard.Nemec@@viasyshc.com>
+ * @author Bluezery <ohpowel@@gmail.com>
+ * @author Boris "billiob" Faure <billiob@@gmail.com>
+ * @author Brett Nash <nash@@nash.id.au>
+ * @author Brian 'rephorm' Mattern <rephorm@@rephorm.com>
  * @author Burra <burra@@colorado.edu>
+ * @author Carsten Haitzler <raster@@@rasterman.com>
+ * @author Cedric Bail <cedric.bail@@free.fr>
+ * @author Chidambar Zinnoury <illogict@@online.fr>
  * @author Chris Ross <chris@@darkrock.co.uk>
- * @author Term <term@@twistedpath.org>
- * @author Tilman Sauerbeck <tilman@@code-monkey.de>
- * @author Ibukun Olumuyiwa <ibukun@@computer.org>
- * @author Yuri <da2001@hotmail.ru>
- * @author Nicholas Curran <quasar@@bigblue.net.au>
- * @author Howell Tam <pigeon@@pigeond.net>
- * @author Nathan Ingersoll <rbdpngn@@users.sourceforge.net>
- * @author Andrew Elcock <andy@@elcock.org>
- * @author Kim Woelders <kim@@woelders.dk>
- * @author Sebastian Dransfeld <sebastid@@tango.flipp.net>
- * @author Simon Poole <simon.armlinux@@themalago.net>
- * @author Jorge Luis Zapata Muga <jorgeluis.zapata@@gmail.com>
+ * @author Christopher 'devilhorns' Michael <cpmichael1@comcast.net>
+ * @author ChunEon Park <hermet@@hermet.pe.kr>
+ * @author Corey "atmos" Donohoe <atmos@@atmos.org>
  * @author dan sinclair <zero@@everburning.com>
- * @author Michael 'Mickey' Lauer <mickey@@tm.informatik.uni-frankfurt.de>
+ * @author Daniel Juyung Seo <seojuyung2@gmail.com> <juyung.seo@@samsung.com>
+ * @author Daniel Willmann <daniel@@totalueberwachung.de>
  * @author David 'onefang' Seikel <onefang@@gmail.com>
+ * @author David Goodlad <dgoodlad@@gmail.com>
+ * @author Doyoun Kang <wayofmine@@gmail.com> <doyoun.kang@@samsung.com>
+ * @author Guillaume Friloux <guillaume.friloux@@asp64.com>
+ * @author Gustavo Chaves <glima@@profusion.mobi>
+ * @author Gustavo Sverzut Barbieri <barbieri@@profusion.mobi>
+ * @author Gwanglim Lee <gl77.lee@@samsung.com> <gwanglim@@gmail.com>
+ * @author Haifeng Deng <haifeng.deng@@samsung.com>
  * @author Hisham 'CodeWarrior' Mardam Bey <hisham@@hisham.cc>
- * @author Brian 'rephorm' Mattern <rephorm@@rephorm.com>
- * @author Tim Horton <hortont424@gmail.com>
- * @author Arnaud de Turckheim 'quarium' <quarium@@gmail.com>
- * @author Matt Barclay <mbarclay@@gmail.com>
- * @author Peter Wehrfritz <peter.wehrfritz@@web.de>
- * @author Albin "Lutin" Tonnerre <albin.tonnerre@@gmail.com>
- * @author Vincent Torri <vincent.torri@@gmail.com>
+ * @author Howell Tam <pigeon@@pigeond.net>
+ * @author Hyoyoung Chang <hyoyoung@@gmail.com>
+ * @author Ibukun Olumuyiwa <ibukun@@computer.org>
+ * @author Iván Briano <ivan@@profusion.mobi>
+ * @author Jihoon Kim <jihoon48.kim@@samsung.com> <imfine98@gmail.com>
+ * @author Jorge Luis Zapata Muga <jorgeluis.zapata@@gmail.com>
+ * @author Jose O Gonzalez <jose_ogp@@juno.com>
+ * @author José Roberto de Souza <zehortigoza@@profusion.mobi>
+ * @author Jérémy Zurcher <jeremy@@asynk.ch>
+ * @author Jérôme Pinot <ngc891@gmail.com>
+ * @author Kim Woelders <kim@@woelders.dk>
+ * @author Kim Yunhan <spbear@@gmail.com>
  * @author Lars Munch <lars@@segv.dk>
- * @author Andre Dieb <andre.dieb@@gmail.com>
+ * @author Leandro Pereira <leandro@@profusion.mobi>
+ * @author Leif Middelschulte <leif.middelschulte@@gmail.com>
+ * @author Lucas De Marchi <lucas.demarchi@@profusion.mobi>
+ * @author Luis Felipe Strano Moraes <lfelipe@@profusion.mobi>
  * @author Mathieu Taillefumier <mathieu.taillefumier@@free.fr>
- * @author Rui Miguel Silva Seabra <rms@@1407.org>
- * @author Samsung Electronics
- * @author Samsung SAIT
- * @author Nicolas Aguirre <aguirre.nicolas@@gmail.com>
- * @author Brett Nash <nash@@nash.id.au>
+ * @author Matt Barclay <mbarclay@@gmail.com>
+ * @author Michael 'Mickey' Lauer <mickey@@tm.informatik.uni-frankfurt.de>
  * @author Mike Blumenkrantz <michael.blumenkrantz@@gmail.com>
- * @author Leif Middelschulte <leif.middelschulte@@gmail.com>
  * @author Mike McCormack <mj.mccormack@@samsung.com>
- * @author Sangho Park <gouache95@gmail.com>
- * @author Jihoon Kim <jihoon48.kim@@samsung.com> <imfine98@gmail.com>
+ * @author Myoungwoon Roy Kim(roy_kim) <myoungwoon.kim@@samsung.com> <myoungwoon@@gmail.com>
+ * @author Myungjae Lee <mjae.lee@@samsung.com>
+ * @author Nathan Ingersoll <ningerso@@d.umn.edu>
+ * @author Nathan Ingersoll <rbdpngn@@users.sourceforge.net>
+ * @author Nicholas Curran <quasar@@bigblue.net.au>
+ * @author Nicolas Aguirre <aguirre.nicolas@@gmail.com>
+ * @author Peter Wehrfritz <peter.wehrfritz@@web.de>
  * @author PnB <Poor.NewBie@@gmail.com>
- * @author Daniel Juyung Seo <seojuyung2@gmail.com> <juyung.seo@@samsung.com>
- * @author Christopher 'devilhorns' Michael <cpmichael1@comcast.net>
- * @author ChunEon Park <hermet@@hermet.pe.kr>
- * @author xlopez@@igalia.com
  * @author Rafael Antognolli <antognolli@@profusion.mobi>
- * @author Kim Yunhan <spbear@@gmail.com>
- * @author Youness Alaoui <kakaroto@@kakaroto.homelinux.net>
- * @author Bluezery <ohpowel@@gmail.com>
- * @author Doyoun Kang <wayofmine@@gmail.com> <doyoun.kang@@samsung.com>
- * @author Haifeng Deng <haifeng.deng@@samsung.com>
- * @author Jérémy Zurcher <jeremy@@asynk.ch>
- * @author Vikram Narayanan <vikram186@gmail.com>
- * @author Gwanglim Lee <gl77.lee@@samsung.com> <gwanglim@@gmail.com>
- * @author Daniel Willmann <daniel@@totalueberwachung.de>
- * @author David Goodlad <dgoodlad@@gmail.com>
- * @author Cedric Bail <cedric.bail@@free.fr>
- * @author Luis Felipe Strano Moraes <lfelipe@@profusion.mobi>
- * @author Chidambar Zinnoury <illogict@@online.fr>
- * @author Vincent Torri <vtorri@@univ-evry.fr>
- * @author Gustavo Sverzut Barbieri <barbieri@@profusion.mobi>
+ * @author Rafal Krypa <r.krypa@@samsung.com>
  * @author Raphael Kubo da Costa <kubo@@profusion.mobi>
- * @author Adam Simpkins <adam@@adamsimpkins.net>
- * @author Corey "atmos" Donohoe <atmos@@atmos.org>
- * @author Gustavo Chaves <glima@@profusion.mobi>
- * @author Tom Hacohen <tom@@stosb.com>
+ * @author Rui Miguel Silva Seabra <rms@@1407.org>
+ * @author Samsung Electronics
+ * @author Samsung SAIT
+ * @author Sangho Park <gouache95@gmail.com>
  * @author Sebastian Dransfeld <sd@@tango.flipp.net>
- * @author Myungjae Lee <mjae.lee@@samsung.com>
- * @author Boris "billiob" Faure <billiob@@gmail.com>
+ * @author Sebastian Dransfeld <sebastid@@tango.flipp.net>
+ * @author Seungsoo Woo <om101.woo@@samsung.com>
+ * @author Shilpa Singh <shilpa.singh@@samsung.com> <shilpasingh.o@@gmail.com>
+ * @author Simon Poole <simon.armlinux@@themalago.net>
+ * @author Steve Ireland <sireland@@pobox.com>
  * @author Sung W. Park <sungwoo@@gmail.com>
- * @author Guillaume Friloux <guillaume.friloux@@asp64.com>
+ * @author Term <term@@twistedpath.org>
+ * @author Thierry el Borgi <thierry@@substantiel.fr>
  * @author Till Adam <till@@adam-lilienthal.de>
- * @author Steve Ireland <sireland@@pobox.com>
- * @author Yuri Hudobin <glassy_ape@@users.sourceforge.net>
- * @author Nathan Ingersoll <ningerso@@d.umn.edu>
+ * @author Tilman Sauerbeck <tilman@@code-monkey.de>
+ * @author Tim Horton <hortont424@gmail.com>
+ * @author Tom Gilbert <tom@@linuxbrit.co.uk>
+ * @author Tom Hacohen <tom@@stosb.com>
+ * @author Vikram Narayanan <vikram186@gmail.com>
+ * @author Vincent Torri <vincent.torri@@gmail.com>
+ * @author Vincent Torri <vtorri@@univ-evry.fr>
  * @author Willem Monsuwe <willem@@stack.nl>
- * @author Jose O Gonzalez <jose_ogp@@juno.com>
- * @author Bernhard Nemec <Bernhard.Nemec@@viasyshc.com>
- * @author Iván Briano <ivan@@profusion.mobi>
- * @author Myoungwoon Roy Kim(roy_kim) <myoungwoon.kim@@samsung.com> <myoungwoon@@gmail.com>
- * @author Thierry el Borgi <thierry@@substantiel.fr>
- * @author Shilpa Singh <shilpa.singh@@samsung.com> <shilpasingh.o@@gmail.com>
- * @author Seungsoo Woo <om101.woo@@samsung.com>
- * @author Rafal Krypa <r.krypa@@samsung.com>
- * @author Hyoyoung Chang <hyoyoung@@gmail.com>
- * @author Jérôme Pinot <ngc891@gmail.com>
+ * @author xlopez@@igalia.com
+ * @author Youness Alaoui <kakaroto@@kakaroto.homelinux.net>
+ * @author Yuri <da2001@hotmail.ru>
+ * @author Yuri Hudobin <glassy_ape@@users.sourceforge.net>
  *
  * Please contact <enlightenment-devel@@lists.sourceforge.net> to get in
  * contact with the developers and maintainers.
@@ -147,3 +151,9 @@
  *
  * @brief Ecore
  */
+
+/**
+ * @defgroup EDBus
+ *
+ * @brief EDBus
+ */

pc/edbus2.pc.in

@@ -5,7 +5,9 @@ includedir=@includedir@
 
 Name: edbus
 Description: D-Bus access from Ecore
-Requires.private: ecore dbus-1
+Requires.private: @requirements_pc_edbus@
 Version: @VERSION@
 Libs: -L${libdir} -ledbus2
-Cflags: -I${includedir}
+Libs.private: @requirements_libs_edbus@
+Cflags: -I${includedir}/edbus-@VMAJ@
+

src/Makefile.am

@@ -58,6 +58,7 @@ include Makefile_Ecore_Audio.am
 endif
 include Makefile_Embryo.am
 include Makefile_Eio.am
+include Makefile_EDBus.am
 
 .PHONY: benchmark examples
 
@@ -88,6 +89,7 @@ clean-local:
 	rm -rf lib/evas/cserve2/*.gcno
 	rm -rf lib/evas/file/*.gcno
 	rm -rf lib/embryo/*.gcno
+	rm -rf lib/edbus/*.gcno
 	rm -rf modules/eina/mp/pass_through/*.gcno
 	rm -rf modules/eina/mp/one_big/*.gcno
 	rm -rf modules/eina/mp/chained_pool/*.gcno

src/Makefile_EDBus.am

@@ -0,0 +1,85 @@
+
+### Library
+
+lib_LTLIBRARIES += lib/edbus/libedbus2.la
+
+installed_edbusmainheadersdir = $(includedir)/edbus-@VMAJ@
+dist_installed_edbusmainheaders_DATA = \
+lib/edbus/EDBus.h \
+lib/edbus/edbus_connection.h \
+lib/edbus/edbus_freedesktop.h \
+lib/edbus/edbus_message.h \
+lib/edbus/edbus_object.h \
+lib/edbus/edbus_pending.h \
+lib/edbus/edbus_proxy.h \
+lib/edbus/edbus_service.h \
+lib/edbus/edbus_signal_handler.h \
+lib/edbus/edbus_message_helper.h \
+lib/edbus/edbus_message_eina_value.h
+
+lib_edbus_libedbus2_la_SOURCES = \
+lib/edbus/edbus_private.h \
+lib/edbus/edbus_private_types.h \
+lib/edbus/edbus_proxy.c \
+lib/edbus/edbus_core.c \
+lib/edbus/edbus_message.c \
+lib/edbus/edbus_object.c \
+lib/edbus/edbus_pending.c \
+lib/edbus/edbus_freedesktop.c \
+lib/edbus/edbus_service.c \
+lib/edbus/edbus_signal_handler.c \
+lib/edbus/edbus_message_helper.c \
+lib/edbus/edbus_message_to_eina_value.c \
+lib/edbus/edbus_message_from_eina_value.c
+
+lib_edbus_libedbus2_la_CPPFLAGS = \
+-include $(top_builddir)/config.h \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/edbus \
+-DEFL_EDBUS_BUILD \
+@EFL_CFLAGS@ \
+@EFL_COV_CFLAGS@ \
+@EDBUS_CFLAGS@
+
+lib_edbus_libedbus2_la_LIBADD = \
+lib/eina/libeina.la \
+lib/eo/libeo.la \
+lib/ecore/libecore.la \
+@EDBUS_LIBS@ \
+@EFL_COV_LIBS@
+
+lib_edbus_libedbus2_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
+
+### Binary
+
+bin_PROGRAMS += bin/edbus/edbus-codegen
+
+bin_edbus_edbus_codegen_SOURCES = \
+bin/edbus/codegen.h \
+bin/edbus/utils.c \
+bin/edbus/parser.c \
+bin/edbus/dbus.c \
+bin/edbus/source_client.c \
+bin/edbus/client.c
+
+bin_edbus_edbus_codegen_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/edbus \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+@EFL_CFLAGS@ \
+@EFL_COV_CFLAGS@
+
+bin_edbus_edbus_codegen_LDADD = \
+lib/eina/libeina.la \
+lib/eo/libeo.la \
+lib/ecore/libecore.la \
+lib/edbus/libedbus2.la \
+@EFL_COV_LIBS@

src/examples/Makefile.am

@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = eina eo eet evas ecore eio
+SUBDIRS = eina eo eet evas ecore eio edbus
 
 examples:
 	@$(MAKE) $(AM_MAKEFLAGS) -C eina examples
@@ -9,6 +9,7 @@ examples:
 	@$(MAKE) $(AM_MAKEFLAGS) -C evas examples
 	@$(MAKE) $(AM_MAKEFLAGS) -C ecore examples
 	@$(MAKE) $(AM_MAKEFLAGS) -C eio examples
+	@$(MAKE) $(AM_MAKEFLAGS) -C edbus examples
 
 install-examples:
 	@$(MAKE) $(AM_MAKEFLAGS) -C eina install-examples
@@ -17,3 +18,4 @@ install-examples:
 	@$(MAKE) $(AM_MAKEFLAGS) -C evas install-examples
 	@$(MAKE) $(AM_MAKEFLAGS) -C ecore install-examples
 	@$(MAKE) $(AM_MAKEFLAGS) -C eio install-examples
+	@$(MAKE) $(AM_MAKEFLAGS) -C edbus install-examples

src/examples/edbus/Makefile.am

@@ -0,0 +1,71 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/ecore \
+-I$(top_srcdir)/src/lib/edbus \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eo \
+-I$(top_builddir)/src/lib/ecore \
+-I$(top_builddir)/src/lib/edbus \
+@EDBUS_CFLAGS@
+
+EXAMPLES_LIBS = \
+$(top_builddir)/src/lib/ecore/libecore.la \
+$(top_builddir)/src/lib/eina/libeina.la \
+$(top_builddir)/src/lib/edbus/libedbus2.la
+
+EXTRA_PROGRAMS = \
+connman-list-services \
+ofono-dial \
+banshee \
+complex-types \
+complex-types-server \
+server \
+client \
+simple-signal-emit \
+complex-types-client-eina-value
+
+connman_list_services_SOURCES = connman-list-services.c
+connman_list_services_LDADD = $(EXAMPLES_LIBS)
+
+ofono_dial_SOURCES = ofono-dial.c
+ofono_dial_LDADD = $(EXAMPLES_LIBS)
+
+banshee_SOURCES = banshee.c
+banshee_LDADD = $(EXAMPLES_LIBS)
+
+complex_types_SOURCES = complex-types.c
+complex_types_LDADD = $(EXAMPLES_LIBS)
+
+complex_types_server_SOURCES = complex-types-server.c
+complex_types_server_LDADD = $(EXAMPLES_LIBS)
+
+server_SOURCES = server.c
+server_LDADD = $(EXAMPLES_LIBS)
+
+client_SOURCES = client.c
+client_LDADD = $(EXAMPLES_LIBS)
+
+simple_signal_emit_SOURCES = simple-signal-emit.c
+simple_signal_emit_LDADD = $(EXAMPLES_LIBS)
+
+complex_types_client_eina_value_SOURCES = complex-types-client-eina-value.c
+complex_types_client_eina_value_LDADD = $(EXAMPLES_LIBS)
+
+SRCS = $(EXTRA_PROGRAMS)
+
+examples: $(EXTRA_PROGRAMS)
+
+clean-local:
+	rm -f $(EXTRA_PROGRAMS)
+
+install-examples:
+	mkdir -p $(datadir)/edbus/examples
+	$(install_sh_DATA) -c $(SRCS) $(datadir)/edbus/examples
+
+uninstall-local:
+	for f in $(SRCS) ; do \
+	  rm -f $(datadir)/edbus/examples/$$f ; \
+	done

src/lib/edbus/EDBus.h

@@ -1,5 +1,5 @@
 /**
- * @mainpage EDBus
+ * @page edbus_main EDBus
  *
  * @section edbus_intro_sec Introduction
  *
@@ -31,20 +31,46 @@
  *
  * Here some EDBus examples:
  *
- * @li @ref banshee
- * @li @ref simple_dbus_client
- * @li @ref simple_dbus_server
- * @li @ref complex_types
- * @li @ref complex_types_server
- * @li @ref eina_value
- * @li @ref signal_emmiter
- * @li @ref connman
- * @li @ref ofono
- *
- * @author Gustavo Sverzut Barbieri <barbieri@profusion.mobi>
- * @author José Roberto de Souza <zehortigoza@profusion.mobi>
- * @author Leandro Pereira <leandro@profusion.mobi>
- * @author Lucas De Marchi <lucas.demarchi@profusion.mobi>
+ * @li @ref banshee.c
+ * @li @ref client.c
+ * @li @ref complex-types.c
+ * @li @ref complex-types-client-eina-value.c
+ * @li @ref complex-types-server.c
+ * @li @ref connman-list-services.c
+ * @li @ref ofono-dial.c
+ * @li @ref server.c
+ * @li @ref simple-signal-emit.c
+ *
+ * @example banshee.c
+ * Access Banshee music player and send commands to it.
+ *
+ * @example client.c
+ * Client to test various call message types against a provided server
+ * (@ref server.c)
+ *
+ * @example complex-types.c
+ * Client to test complex types (arrays, structs, dicts) against a
+ * provided server (@ref complex-types-server.c)
+ *
+ * @example complex-types-client-eina-value.c
+ * Client to test complex types (arrays, structs, dicts) against a
+ * provided server (@ref complex-types-server.c) returning them as
+ * @ref Eina_Value.
+ *
+ * @example complex-types-server.c
+ * Server to test complex types (arrays, structs, dicts).
+ *
+ * @example connman-list-services.c
+ * Client to list networks/services from connman.
+ *
+ * @example ofono-dial.c
+ * Client to ask oFono to dial.
+ *
+ * @example server.c
+ * Server to reply to @ref client.c requests.
+ *
+ * @example simple-signal-emit.c
+ * Server that registers a service interface and emits simple signals.
  */
 #ifndef EDBUS_H
 #define EDBUS_H
@@ -84,6 +110,7 @@ extern "C" {
 
 /**
  * @defgroup EDBus_Core Core
+ * @ingroup EDBus
  *
  * @{
  */

src/lib/edbus/edbus_connection.h

@@ -3,6 +3,7 @@
 
 /**
  * @defgroup EDBus_Conneciton Connection
+ * @ingroup EDBus
  *
  * @{
  */

src/lib/edbus/edbus_freedesktop.h

@@ -2,7 +2,8 @@
 #define EDBUS_FREEDESKTOP_H 1
 
 /**
- * @defgroup EDBus_Basic Basic Methods
+ * @defgroup EDBus_Basic Basic FreeDesktop.Org Methods
+ * @ingroup EDBus
  *
  * @{
  */

src/lib/edbus/edbus_message.h

@@ -3,6 +3,7 @@
 
 /**
  * @defgroup EDBus_Message Message
+ * @ingroup EDBus
  *
  * @{
  */

src/lib/edbus/edbus_object.h

@@ -3,6 +3,7 @@
 
 /**
  * @defgroup EDBus_Object_Mapper Object Mapper
+ * @ingroup EDBus
  *
  * @{
  */

src/lib/edbus/edbus_pending.h

@@ -3,6 +3,7 @@
 
 /**
  * @defgroup EDBus_Pending Pending
+ * @ingroup EDBus
  *
  * @{
  */

src/lib/edbus/edbus_proxy.h

@@ -3,6 +3,7 @@
 
 /**
  * @defgroup EDBus_Proxy Proxy
+ * @ingroup EDBus
  *
  * @{
  */

src/lib/edbus/edbus_service.h

@@ -3,6 +3,7 @@
 
 /**
  * @defgroup EDBus_Service Service
+ * @ingroup EDBus
  *
  * @{
  */

src/lib/edbus/edbus_signal_handler.h

@@ -3,6 +3,7 @@
 
 /**
  * @defgroup EDBus_Signal_Handler Signal Handler
+ * @ingroup EDBus
  *
  * @{
  */