diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | Makefile.obexd | 82 | ||||
| -rwxr-xr-x | obexd/src/genbuiltin | 17 |
4 files changed, 105 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index b1b380f38..a30d4a49c 100644 --- a/.gitignore +++ b/.gitignore @@ -90,6 +90,9 @@ doc/html src/bluetoothd.8 src/bluetooth.service +obexd/src/builtin.h +obexd/src/obexd +obexd/client/obex-client tools/obex-client-tool tools/obex-server-tool unit/test-gobex diff --git a/Makefile.am b/Makefile.am index ae0090b18..e1048846b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,6 +11,8 @@ bin_PROGRAMS = sbin_PROGRAMS = +libexec_PROGRAMS = + noinst_PROGRAMS = dist_man_MANS = @@ -316,6 +318,7 @@ EXTRA_DIST += src/genbuiltin src/bluetooth.conf src/org.bluez.service \ profiles/sap/sap-dummy.c profiles/sap/sap-u8500.c include Makefile.tools +include Makefile.obexd if DATAFILES rulesdir = @UDEV_DIR@/rules.d diff --git a/Makefile.obexd b/Makefile.obexd new file mode 100644 index 000000000..1ed423b11 --- /dev/null +++ b/Makefile.obexd @@ -0,0 +1,82 @@ + +obex_plugindir = $(libdir)/obex/plugins + +obexd_builtin_modules = +obexd_builtin_sources = +obexd_builtin_nodist = + +libexec_PROGRAMS += obexd/src/obexd + +obexd_src_obexd_SOURCES = $(gdbus_sources) $(btio_sources) $(gobex_sources) \ + $(obexd_builtin_sources) \ + obexd/src/main.c obexd/src/obexd.h \ + obexd/src/plugin.h obexd/src/plugin.c \ + obexd/src/log.h obexd/src/log.c \ + obexd/src/manager.h obexd/src/manager.c \ + obexd/src/obex.h obexd/src/obex.c obexd/src/obex-priv.h \ + obexd/src/mimetype.h obexd/src/mimetype.c \ + obexd/src/service.h obexd/src/service.c \ + obexd/src/transport.h obexd/src/transport.c \ + obexd/src/server.h obexd/src/server.c + +obexd_src_obexd_LDADD = lib/libbluetooth-private.la \ + @DBUS_LIBS@ @GLIB_LIBS@ -ldl + +obexd_src_obexd_LDFLAGS = -Wl,--export-dynamic + +obexd_src_obexd_CFLAGS = @GLIB_CFLAGS@ @DBUS_CFLAGS@ \ + -DOBEX_PLUGIN_BUILTIN \ + -DPLUGINDIR=\""$(obex_plugindir)"\" \ + -fPIC -D_FILE_OFFSET_BITS=64 + +obexd_src_obexd_CPPFLAGS = -I$(builddir)/obexd/src \ + -I$(srcdir)/obexd/src -I$(srcdir)/btio \ + -I$(srcdir)/gobex -I$(srcdir)/gdbus + +obexd_src_obexd_SHORTNAME = obexd + +obexd_builtin_files = obexd/src/builtin.h $(obexd_builtin_nodist) + +nodist_obexd_src_obexd_SOURCES = $(obexd_builtin_files) + +BUILT_SOURCES += obexd/src/builtin.h + +obexd/src/plugin.$(OBJEXT): obexd/src/builtin.h + +obexd/src/builtin.h: obexd/src/genbuiltin $(obexd_builtin_sources) + $(AM_V_GEN)$(srcdir)/obexd/src/genbuiltin $(obexd_builtin_modules) > $@ + +CLEANFILES += obexd/src/builtin.h $(builtin_files) + +EXTRA_DIST += obexd/src/genbuiltin + + +libexec_PROGRAMS += obexd/client/obex-client + +obexd_client_obex_client_SOURCES = $(gdbus_sources) $(gobex_sources) \ + $(btio_sources) \ + obexd/client/main.c obexd/src/log.h obexd/src/log.c \ + obexd/client/manager.h obexd/client/manager.c \ + obexd/client/session.h obexd/client/session.c \ + obexd/client/bluetooth.h obexd/client/bluetooth.c \ + obexd/client/sync.h obexd/client/sync.c \ + obexd/client/pbap.h obexd/client/pbap.c \ + obexd/client/ftp.h obexd/client/ftp.c \ + obexd/client/opp.h obexd/client/opp.c \ + obexd/client/map.h obexd/client/map.c \ + obexd/client/transfer.h obexd/client/transfer.c \ + obexd/client/transport.h obexd/client/transport.c \ + obexd/client/dbus.h obexd/client/dbus.c \ + obexd/client/driver.h obexd/client/driver.c \ + obexd/src/map_ap.h + +obexd_client_obex_client_LDADD = lib/libbluetooth-private.la \ + @GLIB_LIBS@ @DBUS_LIBS@ + +obexd_client_obex_client_CFLAGS = @GLIB_CFLAGS@ @DBUS_CFLAGS@ \ + -fPIC -D_FILE_OFFSET_BITS=64 + +obexd_client_obex_client_CPPFLAGS = -I$(srcdir)/obexd/src -I$(srcdir)/btio \ + -I$(srcdir)/gobex -I$(srcdir)/gdbus + +obexd_client_obex_client_SHORTNAME = obex-client diff --git a/obexd/src/genbuiltin b/obexd/src/genbuiltin new file mode 100755 index 000000000..39f773527 --- /dev/null +++ b/obexd/src/genbuiltin @@ -0,0 +1,17 @@ +#!/bin/sh + +for i in $* +do + echo "extern struct obex_plugin_desc __obex_builtin_$i;" +done + +echo +echo "static struct obex_plugin_desc *__obex_builtin[] = {" + +for i in $* +do + echo " &__obex_builtin_$i," +done + +echo " NULL" +echo "};" |