diff options
| author | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2011-11-29 11:09:05 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2011-11-29 11:17:42 +0200 |
| commit | 9a9f2376b59c451fa48d0fad3e6bbb448f57705c (patch) | |
| tree | 5f395ed48cadbe5a43751e456a95aa1253ec8b0a | |
| parent | 63fbfd2440ee08136c4b0d787bdda1e8cb88c80c (diff) | |
| download | obexd-9a9f2376b59c451fa48d0fad3e6bbb448f57705c.tar.gz | |
Remove dependency on OpenOBEX
Now that the server also uses gobex there is no need to depend on
OpenOBEX anymore.
| -rw-r--r-- | Makefile.am | 14 | ||||
| -rw-r--r-- | configure.ac | 5 |
2 files changed, 6 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index 2582651..af03f2e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -85,9 +85,8 @@ src_obexd_SOURCES = $(gdbus_sources) $(builtin_sources) $(btio_sources) \ src/server.h src/server.c src_obexd_LDADD = @DBUS_LIBS@ @GLIB_LIBS@ @GTHREAD_LIBS@ \ - @EBOOK_LIBS@ @OPENOBEX_LIBS@ \ - @BLUEZ_LIBS@ @LIBICAL_LIBS@ \ - @TRACKER_LIBS@ -ldl + @EBOOK_LIBS@ @BLUEZ_LIBS@ \ + @LIBICAL_LIBS@ @TRACKER_LIBS@ -ldl src_obexd_LDFLAGS = -Wl,--export-dynamic @@ -129,11 +128,10 @@ endif service_DATA = $(service_in_files:.service.in=.service) -AM_CFLAGS = @OPENOBEX_CFLAGS@ @BLUEZ_CFLAGS@ @EBOOK_CFLAGS@ \ - @GTHREAD_CFLAGS@ @GLIB_CFLAGS@ @DBUS_CFLAGS@ \ - @LIBICAL_CFLAGS@ -D_FILE_OFFSET_BITS=64 \ - @TRACKER_CFLAGS@ \ - -DOBEX_PLUGIN_BUILTIN -DPLUGINDIR=\""$(plugindir)"\" +AM_CFLAGS = @BLUEZ_CFLAGS@ @EBOOK_CFLAGS@ @GTHREAD_CFLAGS@ @GLIB_CFLAGS@ \ + @DBUS_CFLAGS@ @LIBICAL_CFLAGS@ @TRACKER_CFLAGS@ \ + -DOBEX_PLUGIN_BUILTIN -DPLUGINDIR=\""$(plugindir)"\" \ + -D_FILE_OFFSET_BITS=64 INCLUDES = -I$(builddir)/src -I$(srcdir)/src -I$(srcdir)/plugins \ -I$(srcdir)/gdbus \ diff --git a/configure.ac b/configure.ac index 962e2e7..fca284e 100644 --- a/configure.ac +++ b/configure.ac @@ -89,11 +89,6 @@ AC_CHECK_LIB(dbus-1, dbus_connection_can_send_type, dummy=yes, AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_LIBS) -PKG_CHECK_MODULES(OPENOBEX, openobex, dummy=yes, - AC_MSG_ERROR(libopenobex is required)) -AC_SUBST(OPENOBEX_CFLAGS) -AC_SUBST(OPENOBEX_LIBS) - PKG_CHECK_MODULES(BLUEZ, bluez, dummy=yes, AC_MSG_ERROR(libbluetooth is required)) AC_SUBST(BLUEZ_CFLAGS) |