diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2008-07-29 20:22:40 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2008-07-29 20:22:40 +0200 |
| commit | 6ff001317710e6cf629ad93db58db615a8be6eee (patch) | |
| tree | ac684f6f113493b5c11549628a75d9c8d715d403 /hcid/Makefile.am | |
| parent | d939483328489fb835bb425d36f7c7c73d52c388 (diff) | |
Integrate sdpd natively into hcid without any library tricks
Diffstat (limited to 'hcid/Makefile.am')
| -rw-r--r-- | hcid/Makefile.am | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/hcid/Makefile.am b/hcid/Makefile.am index 857fff0c..e9d93a30 100644 --- a/hcid/Makefile.am +++ b/hcid/Makefile.am @@ -13,9 +13,11 @@ statedir = $(localstatedir)/lib/bluetooth state_DATA = endif -noinst_LIBRARIES = libhciserver.a +sbin_PROGRAMS = hcid -libhciserver_a_SOURCES = hcid.h security.c storage.c \ +hcid_SOURCES = main.c hcid.h sdpd.h \ + sdpd-server.c sdpd-request.c sdpd-service.c \ + sdpd-database.c security.c storage.c \ parser.h parser.y lexer.l kword.c kword.h \ server.h server.c manager.h manager.c \ adapter.h adapter.c device.h device.c plugin.h plugin.c \ @@ -24,13 +26,7 @@ libhciserver_a_SOURCES = hcid.h security.c storage.c \ dbus-hci.h dbus-hci.c \ telephony.h telephony.c agent.h agent.c -sbin_PROGRAMS = hcid - -hcid_SOURCES = main.c - -hcid_LDADD = libhciserver.a \ - $(top_builddir)/sdpd/libsdpserver.a \ - $(top_builddir)/common/libhelper.a \ +hcid_LDADD = $(top_builddir)/common/libhelper.a \ @GDBUS_LIBS@ @GMODULE_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@ if MAINTAINER_MODE @@ -43,7 +39,7 @@ AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ \ @GLIB_CFLAGS@ @GMODULE_CFLAGS@ @GDBUS_CFLAGS@ \ -DPLUGINDIR=\""$(plugindir)"\" -INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/sdpd +INCLUDES = -I$(top_srcdir)/common BUILT_SOURCES = parser.h |