From 659190bf8d3524c0b4ebb61624cc52462a55b381 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Tue, 13 Sep 2011 16:48:58 +0200 Subject: [PATCH] build: Link all tools with local copy of Bluetooth library --- Makefile.tools | 60 +++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/Makefile.tools b/Makefile.tools index 29c1220b3..0f80c0814 100644 --- a/Makefile.tools +++ b/Makefile.tools @@ -18,9 +18,9 @@ tools_rfcomm_SOURCES = tools/rfcomm.c tools/parser.y tools/lexer.l \ tools/kword.h tools/kword.c EXTRA_tools_rfcomm_SOURCES = tools/parser.h tools/parser.c \ tools/lexer.c -tools_rfcomm_LDADD = lib/libbluetooth.la +tools_rfcomm_LDADD = lib/libbluetooth-private.la -tools_l2ping_LDADD = lib/libbluetooth.la +tools_l2ping_LDADD = lib/libbluetooth-private.la tools_hciattach_SOURCES = tools/hciattach.c tools/hciattach.h \ tools/hciattach_st.c \ @@ -28,26 +28,26 @@ tools_hciattach_SOURCES = tools/hciattach.c tools/hciattach.h \ tools/hciattach_tialt.c \ tools/hciattach_ath3k.c \ tools/hciattach_qualcomm.c -tools_hciattach_LDADD = lib/libbluetooth.la +tools_hciattach_LDADD = lib/libbluetooth-private.la tools_hciconfig_SOURCES = tools/hciconfig.c tools/csr.h tools/csr.c \ src/textfile.h src/textfile.c -tools_hciconfig_LDADD = lib/libbluetooth.la +tools_hciconfig_LDADD = lib/libbluetooth-private.la tools_hcitool_SOURCES = tools/hcitool.c src/oui.h src/oui.c \ src/textfile.h src/textfile.c -tools_hcitool_LDADD = lib/libbluetooth.la +tools_hcitool_LDADD = lib/libbluetooth-private.la tools_sdptool_SOURCES = tools/sdptool.c src/sdp-xml.h src/sdp-xml.c -tools_sdptool_LDADD = lib/libbluetooth.la +tools_sdptool_LDADD = lib/libbluetooth-private.la -tools_ciptool_LDADD = lib/libbluetooth.la +tools_ciptool_LDADD = lib/libbluetooth-private.la -tools_avinfo_LDADD = lib/libbluetooth.la +tools_avinfo_LDADD = lib/libbluetooth-private.la -tools_ppporc_LDADD = lib/libbluetooth.la +tools_ppporc_LDADD = lib/libbluetooth-private.la -tools_hcieventmask_LDADD = lib/libbluetooth.la +tools_hcieventmask_LDADD = lib/libbluetooth-private.la if READLINE bin_PROGRAMS += attrib/gatttool @@ -56,7 +56,7 @@ attrib_gatttool_SOURCES = attrib/gatttool.c attrib/att.c attrib/gatt.c \ attrib/gattrib.c btio/btio.c \ attrib/gatttool.h attrib/interactive.c \ attrib/utils.c -attrib_gatttool_LDADD = lib/libbluetooth.la @GLIB_LIBS@ @READLINE_LIBS@ +attrib_gatttool_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@ @READLINE_LIBS@ endif dist_man_MANS += tools/rfcomm.1 tools/l2ping.8 \ @@ -76,9 +76,9 @@ if TRACER sbin_PROGRAMS += tracer/hcitrace tracer_hcitrace_SOURCES = tracer/main.c -tracer_hcitrace_LDADD = lib/libbluetooth.la \ +tracer_hcitrace_LDADD = lib/libbluetooth-private.la \ @GLIB_LIBS@ @DBUS_LIBS@ @CAPNG_LIBS@ -tracer_hcitrace_DEPENDENCIES = lib/libbluetooth.la +tracer_hcitrace_DEPENDENCIES = lib/libbluetooth-private.la endif if BCCMD @@ -87,7 +87,7 @@ sbin_PROGRAMS += tools/bccmd tools_bccmd_SOURCES = tools/bccmd.c tools/csr.h tools/csr.c \ tools/csr_hci.c tools/csr_h4.c tools/csr_3wire.c \ tools/csr_bcsp.c tools/ubcsp.h tools/ubcsp.c -tools_bccmd_LDADD = lib/libbluetooth.la +tools_bccmd_LDADD = lib/libbluetooth-private.la if USB tools_bccmd_SOURCES += tools/csr_usb.c @@ -142,7 +142,7 @@ cups_PROGRAMS = cups/bluetooth cups_bluetooth_SOURCES = $(gdbus_sources) cups/main.c cups/cups.h \ cups/sdp.c cups/spp.c cups/hcrp.c -cups_bluetooth_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ lib/libbluetooth.la +cups_bluetooth_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ lib/libbluetooth-private.la endif @@ -157,39 +157,39 @@ noinst_PROGRAMS += test/gaptest test/sdptest test/scotest \ test/btiotest test/test-textfile \ test/uuidtest -test_hciemu_LDADD = @GLIB_LIBS@ lib/libbluetooth.la +test_hciemu_LDADD = @GLIB_LIBS@ lib/libbluetooth-private.la -test_l2test_LDADD = lib/libbluetooth.la +test_l2test_LDADD = lib/libbluetooth-private.la -test_rctest_LDADD = lib/libbluetooth.la +test_rctest_LDADD = lib/libbluetooth-private.la test_gaptest_LDADD = @DBUS_LIBS@ -test_sdptest_LDADD = lib/libbluetooth.la +test_sdptest_LDADD = lib/libbluetooth-private.la -test_scotest_LDADD = lib/libbluetooth.la +test_scotest_LDADD = lib/libbluetooth-private.la -test_attest_LDADD = lib/libbluetooth.la +test_attest_LDADD = lib/libbluetooth-private.la -test_hstest_LDADD = lib/libbluetooth.la +test_hstest_LDADD = lib/libbluetooth-private.la -test_avtest_LDADD = lib/libbluetooth.la +test_avtest_LDADD = lib/libbluetooth-private.la -test_lmptest_LDADD = lib/libbluetooth.la +test_lmptest_LDADD = lib/libbluetooth-private.la test_ipctest_SOURCES = test/ipctest.c audio/ipc.h audio/ipc.c test_ipctest_LDADD= @GLIB_LIBS@ sbc/libsbc.la test_bdaddr_SOURCES = test/bdaddr.c src/oui.h src/oui.c -test_bdaddr_LDADD = lib/libbluetooth.la +test_bdaddr_LDADD = lib/libbluetooth-private.la test_agent_LDADD = @DBUS_LIBS@ test_btiotest_SOURCES = test/btiotest.c btio/btio.h btio/btio.c -test_btiotest_LDADD = @GLIB_LIBS@ lib/libbluetooth.la +test_btiotest_LDADD = @GLIB_LIBS@ lib/libbluetooth-private.la test_uuidtest_SOURCES = test/uuidtest.c -test_uuidtest_LDADD = lib/libbluetooth.la +test_uuidtest_LDADD = lib/libbluetooth-private.la test_test_textfile_SOURCES = test/test-textfile.c src/textfile.h src/textfile.c @@ -218,7 +218,7 @@ bin_PROGRAMS += compat/hidd compat_hidd_SOURCES = compat/hidd.c compat/hidd.h src/uinput.h \ compat/sdp.h compat/sdp.c compat/fakehid.c \ src/textfile.h src/textfile.c -compat_hidd_LDADD = -lm lib/libbluetooth.la +compat_hidd_LDADD = -lm lib/libbluetooth-private.la dist_man_MANS += compat/hidd.1 else @@ -231,7 +231,7 @@ bin_PROGRAMS += compat/pand compat_pand_SOURCES = compat/pand.c compat/pand.h \ compat/bnep.c compat/sdp.h compat/sdp.c \ src/textfile.h src/textfile.c -compat_pand_LDADD = lib/libbluetooth.la +compat_pand_LDADD = lib/libbluetooth-private.la dist_man_MANS += compat/pand.1 else @@ -244,7 +244,7 @@ bin_PROGRAMS += compat/dund compat_dund_SOURCES = compat/dund.c compat/dund.h compat/lib.h \ compat/sdp.h compat/sdp.c compat/dun.c compat/msdun.c \ src/textfile.h src/textfile.c -compat_dund_LDADD = lib/libbluetooth.la +compat_dund_LDADD = lib/libbluetooth-private.la dist_man_MANS += compat/dund.1 else -- 2.47.3