[SVN's EFL Migration] e-dbus in SLP is merged with SVN r55238.

diff --git a/configure.ac b/configure.ac
index 2a26d8d..6753957 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ m4_define([lt_age], v_min)
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 
-AC_INIT([e_dbus], [v_ver.beta2], [enlightenment-devel@lists.sourceforge.net])
+AC_INIT([e_dbus], [v_ver.beta3], [enlightenment-devel@lists.sourceforge.net])
 AC_PREREQ([2.52])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_MACRO_DIR([m4])

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 16273a2..bd3f931 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -53,23 +53,23 @@ e_dbus_test_client_LDADD = $(top_builddir)/src/lib/dbus/libedbus.la $(EDBUS_LIBS
 if BUILD_EBLUEZ
 e_dbus_bluez_test_SOURCES = e_dbus_bluez_test.c
 e_dbus_bluez_test_CPPFLAGS = $(EDBUS_CPPFLAGS)
-e_dbus_bluez_test_LDADD = $(top_builddir)/src/lib/bluez/libebluez.la $(top_builddir)/src/lib/dbus/libedbus.la $(EDBUS_LIBS)
+e_dbus_bluez_test_LDADD = $(top_builddir)/src/lib/bluez/libebluez.la $(EDBUS_LIBS)
 endif
 
 if BUILD_ECONNMAN
 e_dbus_connman_test_SOURCES = e_dbus_connman_test.c
 e_dbus_connman_test_CPPFLAGS = $(EDBUS_CPPFLAGS)
-e_dbus_connman_test_LDADD = $(top_builddir)/src/lib/connman/libeconnman.la $(top_builddir)/src/lib/dbus/libedbus.la $(EDBUS_LIBS)
+e_dbus_connman_test_LDADD = $(top_builddir)/src/lib/connman/libeconnman.la $(EDBUS_LIBS)
 
 e_dbus_connman_test_api_SOURCES = e_dbus_connman_test_api.c
 e_dbus_connman_test_api_CPPFLAGS = $(EDBUS_CPPFLAGS)
-e_dbus_connman_test_api_LDADD = $(top_builddir)/src/lib/connman/libeconnman.la $(top_builddir)/src/lib/dbus/libedbus.la $(EDBUS_LIBS)
+e_dbus_connman_test_api_LDADD = $(top_builddir)/src/lib/connman/libeconnman.la $(EDBUS_LIBS)
 endif
 
 if BUILD_ENOTIFY
 
 ENOTIFY_CPPFLAGS = $(EDBUS_CPPFLAGS) $(EVAS_CFLAGS)
-ENOTIFY_LIBS = $(top_builddir)/src/lib/notification/libenotify.la $(top_builddir)/src/lib/dbus/libedbus.la
+ENOTIFY_LIBS = $(top_builddir)/src/lib/notification/libenotify.la
 
 e_dbus_notify_SOURCES = notify.c
 e_dbus_notify_CPPFLAGS = $(ENOTIFY_CPPFLAGS)
@@ -87,11 +87,11 @@ endif
 if BUILD_EOFONO
 e_dbus_ofono_test_SOURCES = e_dbus_ofono_test.c
 e_dbus_ofono_test_CPPFLAGS = $(EDBUS_CPPFLAGS)
-e_dbus_ofono_test_LDADD = $(top_builddir)/src/lib/ofono/libeofono.la $(top_builddir)/src/lib/dbus/libedbus.la $(EDBUS_LIBS)
+e_dbus_ofono_test_LDADD = $(top_builddir)/src/lib/ofono/libeofono.la $(EDBUS_LIBS)
 endif
 
 if BUILD_EUKIT
 e_dbus_ukit_test_SOURCES = e_dbus_ukit_test.c
 e_dbus_ukit_test_CPPFLAGS = $(EDBUS_CPPFLAGS)
-e_dbus_ukit_test_LDADD = $(top_builddir)/src/lib/ukit/libeukit.la $(top_builddir)/src/lib/dbus/libedbus.la $(EDBUS_LIBS)
+e_dbus_ukit_test_LDADD = $(top_builddir)/src/lib/ukit/libeukit.la $(EDBUS_LIBS)
 endif