summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2011-07-19 22:20:58 (GMT)
committerMarcel Holtmann <marcel@holtmann.org>2011-07-19 22:20:58 (GMT)
commit8e196c9a9f378385855e22073ae46e1cc5c06051 (patch)
treee34873ef85e18f9990512023abbb958e829f407a
parent25d62c6414a3e366e074bf0462b953f22a06828f (diff)
downloadconnman-8e196c9a9f378385855e22073ae46e1cc5c06051.zip
connman-8e196c9a9f378385855e22073ae46e1cc5c06051.tar.gz
connman-8e196c9a9f378385855e22073ae46e1cc5c06051.tar.bz2
build: Remove wifi-scan testing utility
-rw-r--r--.gitignore1
-rw-r--r--Makefile.am7
-rw-r--r--configure.ac5
-rw-r--r--tools/wifi-scan.c29
4 files changed, 2 insertions, 40 deletions
diff --git a/.gitignore b/.gitignore
index f2411a4..e89cffe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,7 +37,6 @@ scripts/connman
scripts/openconnect-script
client/cm
tools/wispr
-tools/wifi-scan
tools/dhcp-test
tools/dhcp-server-test
tools/addr-test
diff --git a/Makefile.am b/Makefile.am
index 42fe7d0..b55905a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -111,8 +111,7 @@ build_scriptdir = $(scriptdir)
endif
AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @CAPNG_CFLAGS@ @XTABLES_CFLAGS@ \
- @NETLINK_CFLAGS@ @GNUTLS_CFLAGS@ \
- $(builtin_cflags) \
+ @GNUTLS_CFLAGS@ $(builtin_cflags) \
-DCONNMAN_PLUGIN_BUILTIN \
-DSTATEDIR=\""$(statedir)"\" \
-DPLUGINDIR=\""$(build_plugindir)"\" \
@@ -140,7 +139,7 @@ client_cm_LDADD = @DBUS_LIBS@
endif
if TOOLS
-noinst_PROGRAMS += tools/wispr tools/wifi-scan tools/supplicant-test \
+noinst_PROGRAMS += tools/wispr tools/supplicant-test \
tools/dhcp-test tools/dhcp-server-test \
tools/addr-test tools/web-test tools/resolv-test \
tools/dbus-test tools/polkit-test \
@@ -151,8 +150,6 @@ noinst_PROGRAMS += tools/wispr tools/wifi-scan tools/supplicant-test \
tools_wispr_SOURCES = $(gweb_sources) tools/wispr.c
tools_wispr_LDADD = @GLIB_LIBS@ @GNUTLS_LIBS@ -lresolv
-tools_wifi_scan_LDADD = @GLIB_LIBS@ @NETLINK_LIBS@
-
tools_supplicant_test_SOURCES = $(gdbus_sources) tools/supplicant-test.c \
tools/supplicant-dbus.h tools/supplicant-dbus.c \
tools/supplicant.h tools/supplicant.c
diff --git a/configure.ac b/configure.ac
index 0986045..7646fe2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -386,11 +386,6 @@ AM_CONDITIONAL(CLIENT, test "${enable_client}" = "yes")
AC_ARG_ENABLE(tools, AC_HELP_STRING([--enable-tools],
[enable testing tools]), [enable_tools=${enableval}])
if (test "${enable_tools}" = "yes"); then
- PKG_CHECK_MODULES(NETLINK, libnl-1, dummy=yes,
- AC_MSG_ERROR(Netlink library is required))
- AC_SUBST(NETLINK_CFLAGS)
- AC_SUBST(NETLINK_LIBS)
-
PKG_CHECK_MODULES(GNUTLS, gnutls, dummy=yes,
AC_MSG_ERROR(GnuTLS library is required))
AC_SUBST(GNUTLS_CFLAGS)
diff --git a/tools/wifi-scan.c b/tools/wifi-scan.c
deleted file mode 100644
index 5199579..0000000
--- a/tools/wifi-scan.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *
- * Connection Manager
- *
- * Copyright (C) 2007-2010 Intel Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * 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
-
-int main(int argc, char *argv[])
-{
- return 0;
-}