From c97860db272807d43cba88275d38de2af4084bfa Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Wed, 3 Jul 2013 09:29:20 -0300 Subject: build-sys: Don't build gdbus several times We are currently compiling gdbus 3 times: one for tests, one for bluetoothd and another for obexd. $ ls gdbus/*watch.o gdbus/bluetoothd-watch.o gdbus/obexd-watch.o gdbus/watch.o Instead of prepending $(gdbus_sources) to several _SOURCES variable, use a convenience library. --- Makefile.obexd | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Makefile.obexd') diff --git a/Makefile.obexd b/Makefile.obexd index 0d9b4c668..d5377cb57 100644 --- a/Makefile.obexd +++ b/Makefile.obexd @@ -54,7 +54,7 @@ obexd_builtin_sources += obexd/client/mns.c obexd/src/map_ap.h \ libexec_PROGRAMS += obexd/src/obexd -obexd_src_obexd_SOURCES = $(gdbus_sources) $(btio_sources) $(gobex_sources) \ +obexd_src_obexd_SOURCES = $(btio_sources) $(gobex_sources) \ $(obexd_builtin_sources) \ obexd/src/main.c obexd/src/obexd.h \ obexd/src/plugin.h obexd/src/plugin.c \ @@ -80,7 +80,8 @@ obexd_src_obexd_SOURCES = $(gdbus_sources) $(btio_sources) $(gobex_sources) \ obexd/client/driver.h obexd/client/driver.c \ obexd/src/map_ap.h obexd_src_obexd_LDADD = lib/libbluetooth-internal.la \ - @ICAL_LIBS@ @DBUS_LIBS@ @GLIB_LIBS@ -ldl + gdbus/libgdbus-internal.la \ + @ICAL_LIBS@ @DBUS_LIBS@ @GLIB_LIBS@ -ldl obexd_src_obexd_LDFLAGS = -Wl,--export-dynamic -- cgit v1.2.1