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 | |
| parent | d939483328489fb835bb425d36f7c7c73d52c388 (diff) | |
Integrate sdpd natively into hcid without any library tricks
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | hcid/Makefile.am | 16 | ||||
| -rw-r--r-- | hcid/sdpd-database.c (renamed from sdpd/servicedb.c) | 0 | ||||
| -rw-r--r-- | hcid/sdpd-request.c (renamed from sdpd/request.c) | 0 | ||||
| -rw-r--r-- | hcid/sdpd-server.c (renamed from sdpd/server.c) | 0 | ||||
| -rw-r--r-- | hcid/sdpd-service.c (renamed from sdpd/service.c) | 0 | ||||
| -rw-r--r-- | hcid/sdpd.h (renamed from sdpd/sdpd.h) | 0 | ||||
| -rw-r--r-- | sdpd/Makefile.am | 11 |
9 files changed, 7 insertions, 23 deletions
diff --git a/Makefile.am b/Makefile.am index b38dd1b0..2b0708bc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = include lib doc \ - sbc gdbus common sdpd hcid plugins \ + sbc gdbus common hcid plugins \ network serial input audio \ tools rfcomm dund pand hidd \ cups test scripts diff --git a/configure.in b/configure.in index d1ce1784..54e9a5f5 100644 --- a/configure.in +++ b/configure.in @@ -51,7 +51,6 @@ AC_OUTPUT([ tools/Makefile rfcomm/Makefile hcid/Makefile - sdpd/Makefile dund/Makefile pand/Makefile hidd/Makefile 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 diff --git a/sdpd/servicedb.c b/hcid/sdpd-database.c index 6cc34bd3..6cc34bd3 100644 --- a/sdpd/servicedb.c +++ b/hcid/sdpd-database.c diff --git a/sdpd/request.c b/hcid/sdpd-request.c index ece8cd54..ece8cd54 100644 --- a/sdpd/request.c +++ b/hcid/sdpd-request.c diff --git a/sdpd/server.c b/hcid/sdpd-server.c index 1524d1c0..1524d1c0 100644 --- a/sdpd/server.c +++ b/hcid/sdpd-server.c diff --git a/sdpd/service.c b/hcid/sdpd-service.c index 09459f43..09459f43 100644 --- a/sdpd/service.c +++ b/hcid/sdpd-service.c diff --git a/sdpd/sdpd.h b/hcid/sdpd.h index 332b434d..332b434d 100644 --- a/sdpd/sdpd.h +++ b/hcid/sdpd.h diff --git a/sdpd/Makefile.am b/sdpd/Makefile.am deleted file mode 100644 index 8e599f26..00000000 --- a/sdpd/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ - -noinst_LIBRARIES = libsdpserver.a - -libsdpserver_a_SOURCES = \ - sdpd.h server.c request.c service.c servicedb.c - -AM_CFLAGS = @BLUEZ_CFLAGS@ @GLIB_CFLAGS@ - -INCLUDES = -I$(top_srcdir)/common - -MAINTAINERCLEANFILES = Makefile.in |