libwimax: remove deprecated interface

19 files changed, 19 insertions, 172 deletions

diff --git a/Makefile.am b/Makefile.am
index a959b33..9689c06 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ pkgconfigdir = ${libdir}/pkgconfig
 
 SUBDIRS = include lib src bin doc
 
-pkgconfig_DATA = libwimaxll-0.pc libwimax-0.pc
+pkgconfig_DATA = libwimaxll-0.pc
 
 MAINTAINERCLEANFILES = Makefile.in \
 	aclocal.m4 configure config.h.in config.sub config.guess \
diff --git a/Makefile.in b/Makefile.in
index 342b3f4..0e9d7de 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -34,9 +34,7 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/libwimax-0-uninstalled.pc.in \
-	$(srcdir)/libwimax-0.pc.in \
-	$(srcdir)/libwimaxll-0-uninstalled.pc.in \
+	$(srcdir)/Makefile.in $(srcdir)/libwimaxll-0-uninstalled.pc.in \
 	$(srcdir)/libwimaxll-0.pc.in $(top_srcdir)/configure INSTALL \
 	config.guess config.sub depcomp install-sh ltmain.sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -47,8 +45,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/lib/config.h
-CONFIG_CLEAN_FILES = libwimax-0.pc libwimaxll-0.pc \
-	libwimax-0-uninstalled.pc libwimaxll-0-uninstalled.pc
+CONFIG_CLEAN_FILES = libwimaxll-0.pc libwimaxll-0-uninstalled.pc
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -199,7 +196,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 pkgconfigdir = ${libdir}/pkgconfig
 SUBDIRS = include lib src bin doc
-pkgconfig_DATA = libwimaxll-0.pc libwimax-0.pc
+pkgconfig_DATA = libwimaxll-0.pc
 MAINTAINERCLEANFILES = Makefile.in \
 	aclocal.m4 configure config.h.in config.sub config.guess \
 	ltmain.sh depcomp missing install-sh mkinstalldirs
@@ -240,12 +237,8 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(srcdir) && $(AUTOCONF)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-libwimax-0.pc: $(top_builddir)/config.status $(srcdir)/libwimax-0.pc.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
 libwimaxll-0.pc: $(top_builddir)/config.status $(srcdir)/libwimaxll-0.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-libwimax-0-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/libwimax-0-uninstalled.pc.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
 libwimaxll-0-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/libwimaxll-0-uninstalled.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 
diff --git a/configure b/configure
index 49c828c..76d1724 100755
--- a/configure
+++ b/configure
@@ -20328,7 +20328,7 @@ I2400M_INCLUDES="-I${I2400M}/include"
 
 
 
-ac_config_files="$ac_config_files Makefile doc/Makefile doc/doxygen.conf libwimax-0.pc libwimaxll-0.pc libwimax-0-uninstalled.pc libwimaxll-0-uninstalled.pc bin/Makefile bin/wimax-tools-version include/Makefile include/wimax-version.h include/wimaxll-version.h lib/Makefile src/Makefile"
+ac_config_files="$ac_config_files Makefile doc/Makefile doc/doxygen.conf libwimaxll-0.pc libwimaxll-0-uninstalled.pc bin/Makefile bin/wimax-tools-version include/Makefile include/wimaxll-version.h lib/Makefile src/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -20933,14 +20933,11 @@ do
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
     "doc/doxygen.conf") CONFIG_FILES="$CONFIG_FILES doc/doxygen.conf" ;;
-    "libwimax-0.pc") CONFIG_FILES="$CONFIG_FILES libwimax-0.pc" ;;
     "libwimaxll-0.pc") CONFIG_FILES="$CONFIG_FILES libwimaxll-0.pc" ;;
-    "libwimax-0-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES libwimax-0-uninstalled.pc" ;;
     "libwimaxll-0-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES libwimaxll-0-uninstalled.pc" ;;
     "bin/Makefile") CONFIG_FILES="$CONFIG_FILES bin/Makefile" ;;
     "bin/wimax-tools-version") CONFIG_FILES="$CONFIG_FILES bin/wimax-tools-version" ;;
     "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
-    "include/wimax-version.h") CONFIG_FILES="$CONFIG_FILES include/wimax-version.h" ;;
     "include/wimaxll-version.h") CONFIG_FILES="$CONFIG_FILES include/wimaxll-version.h" ;;
     "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
diff --git a/configure.in b/configure.in
index a73cc1b..39e26e8 100644
--- a/configure.in
+++ b/configure.in
@@ -121,14 +121,11 @@ AC_SUBST(I2400M_INCLUDES,"-I${I2400M}/include")
 AC_OUTPUT(Makefile
           doc/Makefile
           doc/doxygen.conf
-          libwimax-0.pc
           libwimaxll-0.pc
-          libwimax-0-uninstalled.pc
           libwimaxll-0-uninstalled.pc
           bin/Makefile
           bin/wimax-tools-version
           include/Makefile
-          include/wimax-version.h
           include/wimaxll-version.h
           lib/Makefile
           src/Makefile)
diff --git a/include/Makefile.am b/include/Makefile.am
index 48f13e1..3d3595e 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,3 +1,2 @@
 include_HEADERS = \
-	wimaxll.h wimaxll-version.h \
-	wimax.h wimax-version.h
+	wimaxll.h wimaxll-version.h
\ No newline at end of file
diff --git a/include/Makefile.in b/include/Makefile.in
index 81075d8..89b1943 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -34,15 +34,14 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = include
 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/wimax-version.h.in \
-	$(srcdir)/wimaxll-version.h.in
+	$(srcdir)/Makefile.in $(srcdir)/wimaxll-version.h.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/lib/config.h
-CONFIG_CLEAN_FILES = wimax-version.h wimaxll-version.h
+CONFIG_CLEAN_FILES = wimaxll-version.h
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -172,8 +171,7 @@ target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 include_HEADERS = \
-	wimaxll.h wimaxll-version.h \
-	wimax.h wimax-version.h
+	wimaxll.h wimaxll-version.h
 
 all: all-am
 
@@ -207,8 +205,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-wimax-version.h: $(top_builddir)/config.status $(srcdir)/wimax-version.h.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 wimaxll-version.h: $(top_builddir)/config.status $(srcdir)/wimaxll-version.h.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
diff --git a/include/wimax-version.h.in b/include/wimax-version.h.in
deleted file mode 100644
index aa19456..0000000
--- a/include/wimax-version.h.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#warning DEPRECATED: this file is deprecated, use wimaxll-version.h
-#define WIMAX_VERSION "@PACKAGE_VERSION@"
diff --git a/include/wimax.h b/include/wimax.h
deleted file mode 100644
index 1533a18..0000000
--- a/include/wimax.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifndef __lib_wimax_h__
-#define __lib_wimax_h__
-#warning DEPRECATED: this file is deprecated, use wimaxll.h
-#include <wimaxll.h>
-
-#define wimax_handle                                wimaxll_handle
-#define wimax_gnl_cb_context                        wimaxll_gnl_cb_context
-#define wimax_msg_to_user_cb_f                      wimaxll_msg_to_user_cb_f
-#define wimax_state_change_cb_f                     wimaxll_state_change_cb_f
-#define WIMAX_GNL_CB_CONTEXT_INIT(a)                WIMAXLL_GNL_CB_CONTEXT_INIT(a)
-#define wimax_gnl_cb_context_init(a, b)             wimaxll_gnl_cb_context_init(a, b)
-#define wimax_cb_context_set_result(a, b)           wimaxll_cb_context_set_result(a, b)
-
-#define wimax_open(a)                               wimaxll_open(a)
-#define wimax_close(a)                              wimaxll_close(a)
-#define wimax_ifname(a)                             wimaxll_ifname(a)
-
-#define wimax_mc_rx_open(a, b)                      wimaxll_mc_rx_open(a, b)
-#define wimax_mc_rx_fd(a, b)                        wimaxll_mc_rx_fd(a, b)
-#define wimax_mc_rx_close(a, b)                     wimaxll_mc_rx_close(a, b)
-#define wimax_mc_rx_read(a, b)                      wimaxll_mc_rx_read(a, b)
-
-#define wimax_pipe_open(a, b)                       wimaxll_pipe_open(a, b)
-#define wimax_pipe_fd(a, b)                         wimaxll_pipe_fd(a, b)
-#define wimax_pipe_read(a, b)                       wimaxll_pipe_read(a, b)
-#define wimax_pipe_close(a, b)                      wimaxll_pipe_close(a, b)
-
-#define wimax_pipe_msg_read(a, b, c)                wimaxll_pipe_msg_read(a, b, c)
-#define wimax_pipe_msg_free(a)                      wimaxll_pipe_msg_free(a)
-#define wimax_pipe_get_cb_msg_to_user(a, b, c, d)   wimaxll_pipe_get_cb_msg_to_user(a, b, c, d)
-#define wimax_pipe_set_cb_msg_to_user(a, b, c, d)   wimaxll_pipe_set_cb_msg_to_user(a, b, c, d)
-#define wimax_msg_fd(a)                             wimaxll_msg_fd(a)
-#define wimax_msg_read(a, b)                        wimaxll_msg_read(a, b)
-#define wimax_msg_write(a, b, c)                    wimaxll_msg_write(a, b, c)
-#define wimax_msg_free(a)                           wimaxll_msg_free(a)
-#define wimax_msg_pipe_id(a)                        wimaxll_msg_pipe_id(a)
-#define wimax_rfkill(a, b)                          wimaxll_rfkill(a, b)
-#define wimax_reset(a)                              wimaxll_reset(a)
-#define wimax_get_cb_state_change(a, b, c)          wimaxll_get_cb_state_change(a, b, c)
-#define wimax_set_cb_state_change(a, b, c)          wimaxll_set_cb_state_change(a, b, c)
-#define wimax_wait_for_state_change(a, b, c)        wimaxll_wait_for_state_change(a, b, c)
-
-#define wimax_swap_16(a)                            wimaxll_swap_16(a)
-#define wimax_swap_32(a)                            wimaxll_swap_32(a)
-#define wimax_cpu_to_le16(a)                        wimaxll_cpu_to_le16(a)
-#define wimax_le16_to_cpu(a)                        wimaxll_le16_to_cpu(a)
-#define wimax_cpu_to_le32(a)                        wimaxll_cpu_to_le32(a)
-#define wimax_le32_to_cpu(a)                        wimaxll_le32_to_cpu(a)
-
-#endif /* #ifndef __lib_wimax_h__ */
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 4523ce4..b8cb42e 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -28,11 +28,3 @@ libwimaxll_la_CFLAGS = $(AM_CFLAGS)
 # AGE: inc for removed/changed existing interfaces
 libwimaxll_la_LDFLAGS = -version-info 0:0:0 $(LIBNL1_LIBS)
 libwimaxll_a_SOURCES = $(libwimaxll_sources)
-
-# Workaround renaming of libwimax to libwimaxll
-#
-# Dirty, but works the best -- will be removed soon
-install-exec-local:
-	$(mkdir_p) $(DESTDIR)/$(libdir)
-	(cd $(DESTDIR)/$(libdir) && ln -sf libwimaxll.so.0 libwimax.so.0)
-	(cd $(DESTDIR)/$(libdir) && ln -sf libwimaxll.so libwimax.so)
diff --git a/lib/Makefile.in b/lib/Makefile.in
index f90b506..603c762 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -592,8 +592,7 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
-install-exec-am: install-exec-local install-libLIBRARIES \
-	install-libLTLIBRARIES
+install-exec-am: install-libLIBRARIES install-libLTLIBRARIES
 
 install-html: install-html-am
 
@@ -635,24 +634,15 @@ uninstall-am: uninstall-libLIBRARIES uninstall-libLTLIBRARIES
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-exec-local install-html \
-	install-html-am install-info install-info-am \
-	install-libLIBRARIES install-libLTLIBRARIES install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-libLIBRARIES uninstall-libLTLIBRARIES
-
-
-# Workaround renaming of libwimax to libwimaxll
-#
-# Dirty, but works the best -- will be removed soon
-install-exec-local:
-	$(mkdir_p) $(DESTDIR)/$(libdir)
-	(cd $(DESTDIR)/$(libdir) && ln -sf libwimaxll.so.0 libwimax.so.0)
-	(cd $(DESTDIR)/$(libdir) && ln -sf libwimaxll.so libwimax.so)
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-libLIBRARIES install-libLTLIBRARIES \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-libLIBRARIES uninstall-libLTLIBRARIES
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/lib/libwimax.so.in b/lib/libwimax.so.in
deleted file mode 100644
index 8f3f8ba..0000000
--- a/lib/libwimax.so.in
+++ /dev/null
@@ -1,3 +0,0 @@
-/* This library is deprecated!!!!
-   In the meantime, do binary compat using aliases.  */
-GROUP ( @libdir@/libwimaxll.so )
diff --git a/lib/mc_rx.c b/lib/mc_rx.c
index 58fe64f..5dc944a 100644
--- a/lib/mc_rx.c
+++ b/lib/mc_rx.c
@@ -525,8 +525,3 @@ error_bad_index:
 	d_fnend(3, wmx, "(wmx %p index %u) = %zd\n", wmx, index, result);
 	return result;
 }
-
-void wimax_mc_rx_open() __attribute__ ((weak, alias("wimaxll_mc_rx_open")));
-void wimax_mc_rx_fd() __attribute__ ((weak, alias("wimaxll_mc_rx_fd")));
-void wimax_mc_rx_close() __attribute__ ((weak, alias("wimaxll_mc_rx_close")));
-void wimax_mc_rx_read() __attribute__ ((weak, alias("wimaxll_mc_rx_read")));
diff --git a/lib/op-msg.c b/lib/op-msg.c
index 61576ef..60eb9ea 100644
--- a/lib/op-msg.c
+++ b/lib/op-msg.c
@@ -547,18 +547,3 @@ void wimaxll_pipe_set_cb_msg_to_user(
 		mch->msg_to_user_context = context;
 	}
 }
-
-
-void wimax_msg_fd() __attribute__ ((weak, alias("wimaxll_msg_fd")));
-void wimax_msg_read() __attribute__ ((weak, alias("wimaxll_msg_read")));
-void wimax_msg_write() __attribute__ ((weak, alias("wimaxll_msg_write")));
-void wimax_msg_free() __attribute__ ((weak, alias("wimaxll_msg_free")));
-void wimax_msg_pipe_id() __attribute__ ((weak, alias("wimaxll_msg_pipe_id")));
-void wimax_pipe_msg_read()
-	__attribute__ ((weak, alias("wimaxll_pipe_msg_read")));
-void wimax_pipe_msg_free()
-	__attribute__ ((weak, alias("wimaxll_pipe_msg_free")));
-void wimax_pipe_get_cb_msg_to_user()
-	__attribute__ ((weak, alias("wimaxll_pipe_get_cb_msg_to_user")));
-void wimax_pipe_set_cb_msg_to_user()
-	__attribute__ ((weak, alias("wimaxll_pipe_set_cb_msg_to_user")));
diff --git a/lib/op-open.c b/lib/op-open.c
index 64f568b..54a10e7 100644
--- a/lib/op-open.c
+++ b/lib/op-open.c
@@ -266,6 +266,3 @@ void wimaxll_close(struct wimaxll_handle *wmx)
 	wimaxll_free(wmx);
 	d_fnend(3, NULL, "(wmx %p) = void\n", wmx);
 }
-
-void wimax_open() __attribute__ ((weak, alias("wimaxll_open")));
-void wimax_close() __attribute__ ((weak, alias("wimaxll_close")));
diff --git a/lib/pipe.c b/lib/pipe.c
index 0cc710a..560b3c5 100644
--- a/lib/pipe.c
+++ b/lib/pipe.c
@@ -188,9 +188,3 @@ void wimaxll_pipe_close(struct wimaxll_handle *wmx, unsigned pipe_id)
 {
 	wimaxll_mc_rx_close(wmx, pipe_id);
 }
-
-
-void wimax_pipe_open() __attribute__ ((weak, alias("wimaxll_pipe_open")));
-void wimax_pipe_fd() __attribute__ ((weak, alias("wimaxll_pipe_fd")));
-void wimax_pipe_read() __attribute__ ((weak, alias("wimaxll_pipe_read")));
-void wimax_pipe_close() __attribute__ ((weak, alias("wimaxll_pipe_close")));
diff --git a/lib/re-state-change.c b/lib/re-state-change.c
index e0d1229..f90891a 100644
--- a/lib/re-state-change.c
+++ b/lib/re-state-change.c
@@ -308,10 +308,3 @@ ssize_t wimaxll_wait_for_state_change(struct wimaxll_handle *wmx,
 		wmx, old_state, *old_state, new_state, *new_state);
 	return result;
 }
-
-void wimax_get_cb_state_change()
-	__attribute__ ((weak, alias("wimaxll_get_cb_state_change")));
-void wimax_set_cb_state_change()
-	__attribute__ ((weak, alias("wimaxll_set_cb_state_change")));
-void wimax_wait_for_state_change()
-	__attribute__ ((weak, alias("wimaxll_wait_for_state_change")));
diff --git a/lib/wimax.c b/lib/wimax.c
index 813e0c8..91967ca 100644
--- a/lib/wimax.c
+++ b/lib/wimax.c
@@ -321,5 +321,3 @@ const char *wimaxll_ifname(const struct wimaxll_handle *wmx)
 {
 	return wmx->name;
 }
-
-void wimax_ifname() __attribute__ ((weak, alias("wimaxll_ifname")));
diff --git a/libwimax-0-uninstalled.pc.in b/libwimax-0-uninstalled.pc.in
deleted file mode 100644
index 92c2f09..0000000
--- a/libwimax-0-uninstalled.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@abs_top_builddir@
-exec_prefix=@abs_top_builddir@
-libdir=${prefix}/lib
-includedir=${prefix}/include
-
-Name: @PACKAGE_TARNAME@
-Description: @PACKAGE_NAME@
-Version: @PACKAGE_VERSION@
-Requires: libnl-1 >= 1.0
-Libs: -L${libdir} -lwimaxll @LIBNL1_LIBS@
-Cflags: -I${includedir}
diff --git a/libwimax-0.pc.in b/libwimax-0.pc.in
deleted file mode 100644
index d38551e..0000000
--- a/libwimax-0.pc.in
+++ /dev/null
@@ -1,13 +0,0 @@
-# Deprecated!!! Use libwimaxll-0.pc
-
-prefix=@prefix@
-exec_prefix=@prefix@
-libdir=@libdir@
-includedir=@prefix@/include
-
-Name: @PACKAGE_TARNAME@
-Description: @PACKAGE_NAME@
-Version: @PACKAGE_VERSION@
-Requires: libnl-1 >= 1.0
-Libs: -L${libdir} -lwimaxll @LIBNL1_LIBS@
-Cflags: -I${includedir}