diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | acinclude.m4 | 12 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | sync/Makefile.am | 17 | ||||
| -rw-r--r-- | sync/main.c | 56 |
5 files changed, 1 insertions, 87 deletions
diff --git a/Makefile.am b/Makefile.am index 4a91fb8a..39b42087 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = doc sbc eglib common sdpd hcid daemon plugins \ - network serial input audio print sync \ + network serial input audio print \ tools rfcomm dund pand hidd \ cups test scripts diff --git a/acinclude.m4 b/acinclude.m4 index 79c72825..09c14db2 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -107,12 +107,6 @@ AC_DEFUN([AC_PATH_GMODULE], [ AC_SUBST(GMODULE_LIBS) ]) -AC_DEFUN([AC_PATH_OPENSYNC], [ - PKG_CHECK_MODULES(OPENSYNC, glib-2.0 opensync-1.0 osengine-1.0, opensync_found=yes, opensync_found=no) - AC_SUBST(OPENSYNC_CFLAGS) - AC_SUBST(OPENSYNC_LIBS) -]) - AC_DEFUN([AC_PATH_GSTREAMER], [ PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10 gstreamer-plugins-base-0.10, gstreamer_found=yes, gstreamer_found=no) AC_SUBST(GSTREAMER_CFLAGS) @@ -176,7 +170,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [ input_enable=yes serial_enable=yes network_enable=yes - sync_enable=no hcid_enable=yes sdpd_enable=no hidd_enable=no @@ -269,10 +262,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [ network_enable=${enableval} ]) - AC_ARG_ENABLE(sync, AC_HELP_STRING([--enable-sync], [enable synchronization service]), [ - sync_enable=${enableval} - ]) - AC_ARG_ENABLE(hcid, AC_HELP_STRING([--enable-hcid], [install HCI daemon]), [ hcid_enable=${enableval} ]) @@ -388,7 +377,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [ AM_CONDITIONAL(INPUTSERVICE, test "${input_enable}" = "yes") AM_CONDITIONAL(SERIALSERVICE, test "${serial_enable}" = "yes") AM_CONDITIONAL(NETWORKSERVICE, test "${network_enable}" = "yes") - AM_CONDITIONAL(SYNCSERVICE, test "${sync_enable}" = "yes" && test "${opensync_found}" = "yes") AM_CONDITIONAL(HCID, test "${hcid_enable}" = "yes") AM_CONDITIONAL(SDPD, test "${sdpd_enable}" = "yes") AM_CONDITIONAL(HIDD, test "${hidd_enable}" = "yes") diff --git a/configure.in b/configure.in index d8a7aaf0..a7cfa283 100644 --- a/configure.in +++ b/configure.in @@ -50,7 +50,6 @@ AC_OUTPUT([ input/Makefile audio/Makefile print/Makefile - sync/Makefile tools/Makefile rfcomm/Makefile hcid/Makefile diff --git a/sync/Makefile.am b/sync/Makefile.am deleted file mode 100644 index 85de8993..00000000 --- a/sync/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ - -if SYNCSERVICE -servicedir = $(libdir)/bluetooth - -noinst_PROGRAMS = bluetoothd-service-sync - -bluetoothd_service_sync_SOURCES = main.c - -LDADD = $(top_builddir)/common/libhelper.a \ - @OPENSYNC_LIBS@ @BLUEZ_LIBS@ -endif - -AM_CFLAGS = @BLUEZ_CFLAGS@ @OPENSYNC_CFLAGS@ - -INCLUDES = -I$(top_srcdir)/common - -MAINTAINERCLEANFILES = Makefile.in diff --git a/sync/main.c b/sync/main.c deleted file mode 100644 index 23705abc..00000000 --- a/sync/main.c +++ /dev/null @@ -1,56 +0,0 @@ -/* - * - * BlueZ - Bluetooth protocol stack for Linux - * - * Copyright (C) 2005-2008 Marcel Holtmann <marcel@holtmann.org> - * - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <stdio.h> -#include <errno.h> -#include <unistd.h> -#include <stdlib.h> - -#include <glib.h> - -#include <opensync/opensync.h> -#include <osengine/engine.h> - -int main(int argc, char *argv[]) -{ - GMainLoop *mainloop; - OSyncEnv *env; - - mainloop = g_main_loop_new(NULL, FALSE); - - env = osync_env_new(); - - osync_env_initialize(env, NULL); - - g_main_loop_run(mainloop); - - osync_env_finalize(env, NULL); - - osync_env_free(env); - - return 0; -} |