diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2006-04-28 14:53:01 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2006-04-28 14:53:01 +0000 |
| commit | 7a2ad6681fd5892577fe7d9c80d13eca96e99541 (patch) | |
| tree | 8c9336afb948bdf0807fe45746ead93db9964a6e /hcid/Makefile.am | |
| parent | 403066f6cd6f4df68f68178acc2db0926370e95c (diff) | |
Make D-Bus a mandatory requirement
Diffstat (limited to 'hcid/Makefile.am')
| -rw-r--r-- | hcid/Makefile.am | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/hcid/Makefile.am b/hcid/Makefile.am index 385e2e5b..0d4f3c91 100644 --- a/hcid/Makefile.am +++ b/hcid/Makefile.am @@ -7,48 +7,35 @@ statedir = $(localstatedir)/lib/bluetooth state_DATA = -if DBUS dbusdir = $(sysconfdir)/dbus-1/system.d dbus_DATA = bluez-hcid.conf -endif sbin_PROGRAMS = hcid -noinst_SCRIPTS = dbus-test +noinst_PROGRAMS = passkey-agent -if DBUS -dbus_hcid_sources = 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 -dbus_hcid_libs = @DBUS_LIBS@ -dbus_hcid_cflags = -DENABLE_DBUS -DDBUS_API_SUBJECT_TO_CHANGE -else -dbus_hcid_sources = -dbus_hcid_libs = -dbus_hcid_cflags = -endif +noinst_SCRIPTS = dbus-test hcid_SOURCES = main.c security.c device.c logging.c storage.c \ sdp.c sdp.h hcid.h parser.h parser.y \ - lexer.l kword.c kword.h $(dbus_hcid_sources) \ + lexer.l kword.c kword.h \ + 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 -hcid_LDADD = $(dbus_hcid_libs) @BLUEZ_LIBS@ \ +hcid_LDADD = @DBUS_LIBS@ @BLUEZ_LIBS@ \ $(top_builddir)/common/libglib-ectomy.a \ $(top_builddir)/common/libtextfile.a \ $(top_builddir)/common/liblist.a -if DBUS -noinst_PROGRAMS = passkey-agent - passkey_agent_SOURCES = passkey-agent.c passkey_agent_LDADD = @DBUS_LIBS@ -endif -AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ $(dbus_hcid_cflags) +AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/tools @@ -58,7 +45,6 @@ AM_YFLAGS = -d CLEANFILES = lexer.c parser.c parser.h -EXTRA_DIST = $(man_MANS) $(conf_DATA) bluez-hcid.conf dbus-test \ - dbus.h dbus.c dbus-error.c dbus-manager.c dbus-device.c +EXTRA_DIST = $(man_MANS) $(conf_DATA) bluez-hcid.conf dbus-test MAINTAINERCLEANFILES = Makefile.in |