From 67f74afe96df667a71b76b9122b003283e98d20b Mon Sep 17 00:00:00 2001 From: Rafal Krypa Date: Sun, 28 Nov 2010 14:37:12 +0900 Subject: [PATCH] Re-apply fixes for linking against libedbus previously done in commit 001d3c2. --- src/bin/Makefile.am | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index bd3f931..16273a2 100644 --- 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 $(EDBUS_LIBS) +e_dbus_bluez_test_LDADD = $(top_builddir)/src/lib/bluez/libebluez.la $(top_builddir)/src/lib/dbus/libedbus.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 $(EDBUS_LIBS) +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_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 $(EDBUS_LIBS) +e_dbus_connman_test_api_LDADD = $(top_builddir)/src/lib/connman/libeconnman.la $(top_builddir)/src/lib/dbus/libedbus.la $(EDBUS_LIBS) endif if BUILD_ENOTIFY ENOTIFY_CPPFLAGS = $(EDBUS_CPPFLAGS) $(EVAS_CFLAGS) -ENOTIFY_LIBS = $(top_builddir)/src/lib/notification/libenotify.la +ENOTIFY_LIBS = $(top_builddir)/src/lib/notification/libenotify.la $(top_builddir)/src/lib/dbus/libedbus.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 $(EDBUS_LIBS) +e_dbus_ofono_test_LDADD = $(top_builddir)/src/lib/ofono/libeofono.la $(top_builddir)/src/lib/dbus/libedbus.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 $(EDBUS_LIBS) +e_dbus_ukit_test_LDADD = $(top_builddir)/src/lib/ukit/libeukit.la $(top_builddir)/src/lib/dbus/libedbus.la $(EDBUS_LIBS) endif -- 2.7.4