diff options
| -rw-r--r-- | daemon/Makefile.am | 10 | ||||
| -rw-r--r-- | daemon/auth-agent.c (renamed from hcid/auth-agent.c) | 2 | ||||
| -rw-r--r-- | daemon/passkey-agent.c (renamed from hcid/passkey-agent.c) | 2 | ||||
| -rw-r--r-- | hcid/Makefile.am | 10 |
4 files changed, 11 insertions, 13 deletions
diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 7bfce4a8..90fad65d 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -23,7 +23,7 @@ dbusdir = $(sysconfdir)/dbus-1/system.d dbus_DATA = bluetooth.conf endif -noinst_PROGRAMS = bluetoothd +noinst_PROGRAMS = bluetoothd passkey-agent auth-agent bluetoothd_SOURCES = main.c system.h \ manager.h manager.c database.h database.c \ @@ -38,6 +38,14 @@ if EXPAT bluetoothd_LDADD += -lexpat endif +passkey_agent_SOURCES = passkey-agent.c + +passkey_agent_LDADD = @DBUS_LIBS@ + +auth_agent_SOURCES = auth-agent.c + +auth_agent_LDADD = @DBUS_LIBS@ + AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/sdpd diff --git a/hcid/auth-agent.c b/daemon/auth-agent.c index 1b721398..6eaa7bb7 100644 --- a/hcid/auth-agent.c +++ b/daemon/auth-agent.c @@ -2,7 +2,7 @@ * * BlueZ - Bluetooth protocol stack for Linux * - * Copyright (C) 2005-2007 Marcel Holtmann <marcel@holtmann.org> + * Copyright (C) 2004-2007 Marcel Holtmann <marcel@holtmann.org> * * * This program is free software; you can redistribute it and/or modify diff --git a/hcid/passkey-agent.c b/daemon/passkey-agent.c index 430581bb..9f42d822 100644 --- a/hcid/passkey-agent.c +++ b/daemon/passkey-agent.c @@ -2,7 +2,7 @@ * * BlueZ - Bluetooth protocol stack for Linux * - * Copyright (C) 2005-2007 Marcel Holtmann <marcel@holtmann.org> + * Copyright (C) 2004-2007 Marcel Holtmann <marcel@holtmann.org> * * * This program is free software; you can redistribute it and/or modify diff --git a/hcid/Makefile.am b/hcid/Makefile.am index 973960b5..712f6360 100644 --- a/hcid/Makefile.am +++ b/hcid/Makefile.am @@ -35,16 +35,6 @@ hcid_LDADD += -lexpat endif endif -noinst_PROGRAMS = passkey-agent auth-agent - -passkey_agent_SOURCES = passkey-agent.c - -passkey_agent_LDADD = @DBUS_LIBS@ - -auth_agent_SOURCES = auth-agent.c - -auth_agent_LDADD = @DBUS_LIBS@ - AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/sdpd |