From patchwork Fri Aug 5 14:09:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Ospite X-Patchwork-Id: 1038732 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p75EGBML004663 for ; Fri, 5 Aug 2011 14:16:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754958Ab1HEOQK (ORCPT ); Fri, 5 Aug 2011 10:16:10 -0400 Received: from smtp209.alice.it ([82.57.200.105]:50262 "EHLO smtp209.alice.it" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753411Ab1HEOQK (ORCPT ); Fri, 5 Aug 2011 10:16:10 -0400 Received: from jcn (87.11.136.101) by smtp209.alice.it (8.5.124.08) id 4E2CB712010986C1; Fri, 5 Aug 2011 16:09:53 +0200 Received: from ao2 by jcn with local (Exim 4.76) (envelope-from ) id 1QpL5v-0006qe-3w; Fri, 05 Aug 2011 16:09:47 +0200 From: Antonio Ospite To: linux-bluetooth@vger.kernel.org Cc: Antonio Ospite , Bastien Nocera , linux-input@vger.kernel.org, Jim Paris , Ranulf Doswell , "Pascal A . Brisset" , Marcin Tolysz , Christian Birchinger , Filipe Lopes , Alan Ott , Mikko Virkkila , Simon Wood , Arc Riley Subject: [PATCH BlueZ 3/4] Link to udev only when needed Date: Fri, 5 Aug 2011 16:09:17 +0200 Message-Id: <1312553358-26280-4-git-send-email-ospite@studenti.unina.it> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1312553358-26280-1-git-send-email-ospite@studenti.unina.it> References: <1312553358-26280-1-git-send-email-ospite@studenti.unina.it> X-Face: z*RaLf`X<@C75u6Ig9}{oW$H; 1_\2t5)({*|jhM/Vb; ]yA5\I~93>J<_`<4)A{':UrE Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 05 Aug 2011 14:16:11 +0000 (UTC) Don't link bluetoothd to udev unconditionally, but only when it is needed. For now bluetoothd needs to be linked to udev only when the sixaxis plugin is enabled. --- Makefile.am | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/Makefile.am b/Makefile.am index dbe0170..219ca0f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -288,7 +288,11 @@ src_bluetoothd_SOURCES = $(gdbus_sources) $(builtin_sources) \ src/event.h src/event.c \ src/oob.h src/oob.c src/eir.h src/eir.c src_bluetoothd_LDADD = lib/libbluetooth.la @GLIB_LIBS@ @DBUS_LIBS@ \ - @CAPNG_LIBS@ @UDEV_LIBS@ -ldl -lrt + @CAPNG_LIBS@ -ldl -lrt +if SIXAXISPLUGIN +src_bluetoothd_LDADD += @UDEV_LIBS@ +endif + src_bluetoothd_LDFLAGS = -Wl,--export-dynamic \ -Wl,--version-script=$(srcdir)/src/bluetooth.ver