Merge commit 'v1.4.2'

5 files changed, 31 insertions, 11 deletions

diff --git a/CHANGELOG b/CHANGELOG
index a8ea7b2..4a432e3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,16 @@
+Changes in v1.4.2:
+
+ - Replace most commands with a single, unified one (wimaxll), plugin
+   expandable and much more consistent.
+
+ - Introduce a separate library (libwimaxll-i2400m) with helpers
+   specific to the Intel 2400 WiMAX Connection.
+
+ - Many helpers added to libwimaxll.
+
+ - Add ability to open a handle that will listen for callbacks from
+   any interface.
+
 Changes in v1.4.1:
 
  - Fail to open if the interface is not WiMAX
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 9969c0e..04fc860 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -13,6 +13,8 @@ bin_SCRIPTS = \
 	wimaxll-rfkill			\
 	wimaxll-wait-for-state-change
 
+EXTRA_DIST = $(bin_SCRIPTS)
+
 bin_PROGRAMS = 				\
 	wimaxll
 
@@ -30,6 +32,8 @@ wimaxll.ver: wimaxll.exp
 	cat $< | sed -e "s/\(.*\)/\1;/" >> $@
 	echo "local: *; };" >> $@
 
+CLEANFILES = wimaxll.exp wimaxll.ver
+
 plugindir = $(pkglibdir)/plugins
 plugin_LTLIBRARIES =		\
 	wimaxll-pl-reset.la	\
diff --git a/bin/Makefile.in b/bin/Makefile.in
index cb0df0f..edbe3a7 100644
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -240,10 +240,12 @@ bin_SCRIPTS = \
 	wimaxll-rfkill			\
 	wimaxll-wait-for-state-change
 
+EXTRA_DIST = $(bin_SCRIPTS)
 AM_CFLAGS = @GLIB_CFLAGS@ -DPLUGINDIR=\""$(plugindir)"\"
 AM_LDFLAGS = @GLIB_LIBS@ ../lib/libwimaxll.la $(LIBNL1_LIBS)
 wimaxll_LDFLAGS = $(AM_LDFLAGS) -ldl -Wl,--export-dynamic -Wl,--version-script=wimaxll.ver
 wimaxll_DEPENDENCIES = wimaxll.ver
+CLEANFILES = wimaxll.exp wimaxll.ver
 plugindir = $(pkglibdir)/plugins
 plugin_LTLIBRARIES = \
 	wimaxll-pl-reset.la	\
@@ -515,6 +517,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
diff --git a/configure b/configure
index 0665dd0..65e25d1 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for WiMAX low level tools 1.4.1.
+# Generated by GNU Autoconf 2.63 for WiMAX low level tools 1.4.2.
 #
 # Report bugs to <linux-wimax@intel.com>.
 #
@@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='WiMAX low level tools'
 PACKAGE_TARNAME='wimax-tools'
-PACKAGE_VERSION='1.4.1'
-PACKAGE_STRING='WiMAX low level tools 1.4.1'
+PACKAGE_VERSION='1.4.2'
+PACKAGE_STRING='WiMAX low level tools 1.4.2'
 PACKAGE_BUGREPORT='linux-wimax@intel.com'
 
 ac_unique_file="lib/internal.h"
@@ -1489,7 +1489,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures WiMAX low level tools 1.4.1 to adapt to many kinds of systems.
+\`configure' configures WiMAX low level tools 1.4.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1559,7 +1559,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of WiMAX low level tools 1.4.1:";;
+     short | recursive ) echo "Configuration of WiMAX low level tools 1.4.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1680,7 +1680,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-WiMAX low level tools configure 1.4.1
+WiMAX low level tools configure 1.4.2
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1694,7 +1694,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by WiMAX low level tools $as_me 1.4.1, which was
+It was created by WiMAX low level tools $as_me 1.4.2, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -2411,7 +2411,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='wimax-tools'
- VERSION='1.4.1'
+ VERSION='1.4.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12223,7 +12223,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by WiMAX low level tools $as_me 1.4.1, which was
+This file was extended by WiMAX low level tools $as_me 1.4.2, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12286,7 +12286,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-WiMAX low level tools config.status 1.4.1
+WiMAX low level tools config.status 1.4.2
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.in b/configure.in
index c32ec91..fc92997 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_PREREQ(2.50)
-AC_INIT([WiMAX low level tools], [1.4.1],
+AC_INIT([WiMAX low level tools], [1.4.2],
         [linux-wimax@intel.com], [wimax-tools])
 AC_CONFIG_SRCDIR([lib/internal.h])
 AM_INIT_AUTOMAKE