diff options
| -rw-r--r-- | common/Makefile.am | 11 | ||||
| -rw-r--r-- | common/oui.c (renamed from tools/oui.c) | 0 | ||||
| -rw-r--r-- | common/oui.h (renamed from tools/oui.h) | 0 | ||||
| -rw-r--r-- | daemon/Makefile.am | 2 | ||||
| -rw-r--r-- | hcid/Makefile.am | 10 | ||||
| -rw-r--r-- | hidd/Makefile.am | 2 | ||||
| -rw-r--r-- | test/Makefile.am | 11 | ||||
| -rw-r--r-- | tools/Makefile.am | 6 |
8 files changed, 16 insertions, 26 deletions
diff --git a/common/Makefile.am b/common/Makefile.am index d2233f94..4ab7af66 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -1,14 +1,11 @@ -noinst_LIBRARIES = libtextfile.a libglib-ectomy.a liblist.a +noinst_LIBRARIES = libhelper.a -liblist_a_SOURCES = list.h list.c - -libtextfile_a_SOURCES = textfile.h textfile.c - -libglib_ectomy_a_SOURCES = glib-ectomy.h glib-ectomy.c +libhelper_a_SOURCES = oui.h oui.c list.h list.c \ + textfile.h textfile.c glib-ectomy.h glib-ectomy.c noinst_PROGRAMS = test_textfile -test_textfile_LDADD = libtextfile.a +test_textfile_LDADD = libhelper.a MAINTAINERCLEANFILES = Makefile.in diff --git a/tools/oui.c b/common/oui.c index cc695a90..cc695a90 100644 --- a/tools/oui.c +++ b/common/oui.c diff --git a/tools/oui.h b/common/oui.h index c166038f..c166038f 100644 --- a/tools/oui.h +++ b/common/oui.h diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 41875066..12ff263b 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -3,7 +3,7 @@ noinst_PROGRAMS = bluetoothd bluetoothd_SOURCES = main.c -bluetoothd_LDADD = @DBUS_LIBS@ @BLUEZ_LIBS@ $(top_builddir)/common/libtextfile.a +bluetoothd_LDADD = @DBUS_LIBS@ @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ diff --git a/hcid/Makefile.am b/hcid/Makefile.am index 0d4f3c91..8998e477 100644 --- a/hcid/Makefile.am +++ b/hcid/Makefile.am @@ -23,13 +23,9 @@ hcid_SOURCES = main.c security.c device.c logging.c storage.c \ dbus.h dbus.c dbus-common.c \ dbus-error.c dbus-manager.c dbus-adapter.c \ dbus-device.c dbus-service.c dbus-security.c \ - dbus-sdp.c dbus-rfcomm.c \ - $(top_builddir)/tools/oui.h $(top_builddir)/tools/oui.c + dbus-sdp.c dbus-rfcomm.c -hcid_LDADD = @DBUS_LIBS@ @BLUEZ_LIBS@ \ - $(top_builddir)/common/libglib-ectomy.a \ - $(top_builddir)/common/libtextfile.a \ - $(top_builddir)/common/liblist.a +hcid_LDADD = @DBUS_LIBS@ @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a passkey_agent_SOURCES = passkey-agent.c @@ -37,7 +33,7 @@ passkey_agent_LDADD = @DBUS_LIBS@ AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ -INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/tools +INCLUDES = -I$(top_srcdir)/common man_MANS = hcid.8 hcid.conf.5 diff --git a/hidd/Makefile.am b/hidd/Makefile.am index ba01caeb..9d66ceda 100644 --- a/hidd/Makefile.am +++ b/hidd/Makefile.am @@ -2,7 +2,7 @@ bin_PROGRAMS = hidd hidd_SOURCES = main.c hidd.h sdp.c uinput.h fakehid.c -hidd_LDADD = @BLUEZ_LIBS@ -lm $(top_builddir)/common/libtextfile.a +hidd_LDADD = @BLUEZ_LIBS@ -lm $(top_builddir)/common/libhelper.a AM_CFLAGS = @BLUEZ_CFLAGS@ diff --git a/test/Makefile.am b/test/Makefile.am index 32b32b33..065ebdee 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -6,10 +6,7 @@ bin_PROGRAMS = l2test rctest noinst_PROGRAMS = scotest attest hstest bdaddr -hciemu_LDADD = @BLUEZ_LIBS@ \ - $(top_builddir)/common/libglib-ectomy.a \ - $(top_builddir)/common/liblist.a - +hciemu_LDADD = @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a l2test_LDADD = @BLUEZ_LIBS@ @@ -21,16 +18,16 @@ attest_LDADD = @BLUEZ_LIBS@ hstest_LDADD = @BLUEZ_LIBS@ -bdaddr_SOURCES = bdaddr.c $(top_builddir)/tools/oui.h $(top_builddir)/tools/oui.c +bdaddr_SOURCES = bdaddr.c -bdaddr_LDADD = @BLUEZ_LIBS@ +bdaddr_LDADD = @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a noinst_MANS = bdaddr.8 AM_CFLAGS = @BLUEZ_CFLAGS@ endif -INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/tools +INCLUDES = -I$(top_srcdir)/common EXTRA_DIST = hsplay hsmicro bdaddr.8 diff --git a/tools/Makefile.am b/tools/Makefile.am index d682448c..31626523 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -40,10 +40,10 @@ noinst_PROGRAMS = hcisecfilter ppporc hciattach_SOURCES = hciattach.c hciattach_st.c hciconfig_SOURCES = hciconfig.c csr.h csr.c -hciconfig_LDADD = @BLUEZ_LIBS@ $(top_builddir)/common/libtextfile.a +hciconfig_LDADD = @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a -hcitool_SOURCES = hcitool.c oui.h oui.c -hcitool_LDADD = @BLUEZ_LIBS@ $(top_builddir)/common/libtextfile.a +hcitool_SOURCES = hcitool.c +hcitool_LDADD = @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a l2ping_LDADD = @BLUEZ_LIBS@ |