diff options
| -rw-r--r-- | common/Makefile.am | 4 | ||||
| -rw-r--r-- | hcid/Makefile.am | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/common/Makefile.am b/common/Makefile.am index f709ecab..182d574e 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -1,10 +1,8 @@ if EXPAT sdp_sources = sdp-expat.c -sdp_libadd = /usr/lib/libexpat.a else sdp_sources = sdp-dummy.c -sdp_libadd = endif noinst_LIBRARIES = libhelper.a @@ -14,8 +12,6 @@ libhelper_a_SOURCES = oui.h oui.c list.h list.c \ glib-ectomy.h glib-ectomy.c logging.h logging.c \ dbus.h dbus.c sdp-xml.h sdp-xml.c $(sdp_sources) -libhelper_a_LIBADD = $(sdp_libadd) - noinst_PROGRAMS = test_textfile test_textfile_LDADD = libhelper.a diff --git a/hcid/Makefile.am b/hcid/Makefile.am index 4a4f5b42..89fdc8c2 100644 --- a/hcid/Makefile.am +++ b/hcid/Makefile.am @@ -29,6 +29,10 @@ hcid_SOURCES = main.c security.c device.c storage.c \ hcid_LDADD = @DBUS_LIBS@ @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a +if EXPAT +hcid_LDADD += -lexpat +endif + passkey_agent_SOURCES = passkey-agent.c passkey_agent_LDADD = @DBUS_LIBS@ |