diff options
| -rw-r--r-- | common/Makefile.am | 11 | ||||
| -rw-r--r-- | common/sdp-dummy.c | 40 | ||||
| -rw-r--r-- | common/sdp-xml.c | 1 |
3 files changed, 2 insertions, 50 deletions
diff --git a/common/Makefile.am b/common/Makefile.am index d40d9d1d..f1d846a6 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -1,10 +1,4 @@ -if GLIB -sdp_sources = sdp-glib.c -else -sdp_sources = sdp-dummy.c -endif - if HAL hal_sources = hal-libhal.c else @@ -22,8 +16,7 @@ noinst_LIBRARIES = libhelper.a libhelper_a_SOURCES = oui.h oui.c dbus.h dbus.c \ textfile.h textfile.c logging.h logging.c \ dbus-helper.h dbus-helper.c \ - error.h error.c \ - sdp-xml.h sdp-xml.c $(sdp_sources) \ + error.h error.c sdp-xml.h sdp-xml.c sdp-glib.c \ hal.h $(hal_sources) notify.h $(notify_sources) noinst_PROGRAMS = test_textfile @@ -33,6 +26,6 @@ test_textfile_LDADD = libhelper.a AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ EXTRA_DIST = ppoll.h uinput.h hal-dummy.c hal-libhal.c \ - notify-dummy.c notify-inotify.c sdp-dummy.c sdp-glib.c + notify-dummy.c notify-inotify.c MAINTAINERCLEANFILES = Makefile.in diff --git a/common/sdp-dummy.c b/common/sdp-dummy.c deleted file mode 100644 index 16d1d3bd..00000000 --- a/common/sdp-dummy.c +++ /dev/null @@ -1,40 +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 <limits.h> - -#include "logging.h" -#include "sdp-xml.h" - -sdp_record_t *sdp_xml_parse_record(const char *data, int size) -{ - error("No XML parser available"); - - return NULL; -} diff --git a/common/sdp-xml.c b/common/sdp-xml.c index 664a1ff5..2cc55c2d 100644 --- a/common/sdp-xml.c +++ b/common/sdp-xml.c @@ -37,7 +37,6 @@ #include <bluetooth/sdp_lib.h> #include "logging.h" - #include "sdp-xml.h" #define STRBUFSIZE 1024 |