Rework LuCI build system

 * Rename subdirectories to their repective OpenWrt package names
 * Make each LuCI module its own standalone package
 * Deploy a shared luci.mk which is used by each module Makefile

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

298 files changed, 118 insertions, 97 deletions

diff --git a/libs/httpclient/Makefile b/libs/httpclient/Makefile
deleted file mode 100644
index f7fac7740..000000000
--- a/libs/httpclient/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/libs/json/Makefile b/libs/json/Makefile
deleted file mode 100644
index f7fac7740..000000000
--- a/libs/json/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/libs/luaneightbl/Makefile b/libs/luaneightbl/Makefile
deleted file mode 100644
index dc2db6740..000000000
--- a/libs/luaneightbl/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-ifneq (,$(wildcard ../../build/config.mk))
-include ../../build/config.mk
-include ../../build/module.mk
-include ../../build/gccconfig.mk
-else
-include standalone.mk
-endif
-
-NEIGHTBL_CFLAGS = $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $(WFLAGS)
-
-NEIGHTBL_OBJ = src/neightbl.o
-NEIGHTBL_LIB = src/neightbl.so
-
-%.o: %.c
-	$(CC) $(NEIGHTBL_CFLAGS) $(LUA_CFLAGS) $(FPIC) -c -o $@ $<
-
-compile: $(NEIGHTBL_OBJ)
-	$(LINK) $(SHLIB_FLAGS) -o $(NEIGHTBL_LIB) $(NEIGHTBL_OBJ)
-	mkdir -p dist$(LUA_LIBRARYDIR)
-	cp $(NEIGHTBL_LIB) dist$(LUA_LIBRARYDIR)/
-
-clean: luaclean
-	rm -f src/*.o src/*.so src/*.a src/*.dll
-
diff --git a/libs/luci-lib-httpclient/Makefile b/libs/luci-lib-httpclient/Makefile
new file mode 100644
index 000000000..1e7fd1bc8
--- /dev/null
+++ b/libs/luci-lib-httpclient/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=HTTP(S) client library
+LUCI_DEPENDS:=+luci-base +luci-lib-nixio
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/libs/httpclient/luasrc/httpclient.lua b/libs/luci-lib-httpclient/luasrc/httpclient.lua
index e9fec5dbb..e9fec5dbb 100644
--- a/libs/httpclient/luasrc/httpclient.lua
+++ b/libs/luci-lib-httpclient/luasrc/httpclient.lua
diff --git a/libs/httpclient/luasrc/httpclient/receiver.lua b/libs/luci-lib-httpclient/luasrc/httpclient/receiver.lua
index 4f08e93fe..4f08e93fe 100644
--- a/libs/httpclient/luasrc/httpclient/receiver.lua
+++ b/libs/luci-lib-httpclient/luasrc/httpclient/receiver.lua
diff --git a/libs/luci-lib-json/Makefile b/libs/luci-lib-json/Makefile
new file mode 100644
index 000000000..069886d5c
--- /dev/null
+++ b/libs/luci-lib-json/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI JSON library
+LUCI_DEPENDS:=
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/libs/json/luasrc/json.lua b/libs/luci-lib-json/luasrc/json.lua
index 8dbaf9183..8dbaf9183 100644
--- a/libs/json/luasrc/json.lua
+++ b/libs/luci-lib-json/luasrc/json.lua
diff --git a/libs/luci-lib-luaneightbl/Makefile b/libs/luci-lib-luaneightbl/Makefile
new file mode 100644
index 000000000..d9ab98079
--- /dev/null
+++ b/libs/luci-lib-luaneightbl/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=neightbl - Lua lib for IPv6 neighbors
+LUCI_DEPENDS:=+luci-base
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/libs/luaneightbl/src/neightbl.c b/libs/luci-lib-luaneightbl/src/neightbl.c
index 987ec5e32..987ec5e32 100644
--- a/libs/luaneightbl/src/neightbl.c
+++ b/libs/luci-lib-luaneightbl/src/neightbl.c
diff --git a/libs/nixio/.gitignore b/libs/luci-lib-nixio/.gitignore
index a21f2a2d7..a21f2a2d7 100644
--- a/libs/nixio/.gitignore
+++ b/libs/luci-lib-nixio/.gitignore
diff --git a/libs/nixio/LICENSE b/libs/luci-lib-nixio/LICENSE
index f49a4e16e..f49a4e16e 100644
--- a/libs/nixio/LICENSE
+++ b/libs/luci-lib-nixio/LICENSE
diff --git a/libs/luci-lib-nixio/Makefile b/libs/luci-lib-nixio/Makefile
new file mode 100644
index 000000000..41800fe54
--- /dev/null
+++ b/libs/luci-lib-nixio/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=NIXIO POSIX library
+LUCI_DEPENDS:=+PACKAGE_luci-lib-nixio_openssl:libopenssl +PACKAGE_luci-lib-nixio_cyassl:libcyassl +liblua
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/libs/nixio/NOTICE b/libs/luci-lib-nixio/NOTICE
index f557831e8..f557831e8 100644
--- a/libs/nixio/NOTICE
+++ b/libs/luci-lib-nixio/NOTICE
diff --git a/libs/nixio/README b/libs/luci-lib-nixio/README
index ba9b36b30..ba9b36b30 100644
--- a/libs/nixio/README
+++ b/libs/luci-lib-nixio/README
diff --git a/libs/nixio/axTLS/Makefile b/libs/luci-lib-nixio/axTLS/Makefile
index 02c33d248..02c33d248 100644
--- a/libs/nixio/axTLS/Makefile
+++ b/libs/luci-lib-nixio/axTLS/Makefile
diff --git a/libs/nixio/axTLS/README b/libs/luci-lib-nixio/axTLS/README
index c8926d9bf..c8926d9bf 100644
--- a/libs/nixio/axTLS/README
+++ b/libs/luci-lib-nixio/axTLS/README
diff --git a/libs/nixio/axTLS/bindings/Config.in b/libs/luci-lib-nixio/axTLS/bindings/Config.in
index 12a696ba8..12a696ba8 100644
--- a/libs/nixio/axTLS/bindings/Config.in
+++ b/libs/luci-lib-nixio/axTLS/bindings/Config.in
diff --git a/libs/nixio/axTLS/bindings/Makefile b/libs/luci-lib-nixio/axTLS/bindings/Makefile
index 7654fbba5..7654fbba5 100644
--- a/libs/nixio/axTLS/bindings/Makefile
+++ b/libs/luci-lib-nixio/axTLS/bindings/Makefile
diff --git a/libs/nixio/axTLS/bindings/README b/libs/luci-lib-nixio/axTLS/bindings/README
index 8bc3109c1..8bc3109c1 100644
--- a/libs/nixio/axTLS/bindings/README
+++ b/libs/luci-lib-nixio/axTLS/bindings/README
diff --git a/libs/nixio/axTLS/bindings/csharp/Makefile b/libs/luci-lib-nixio/axTLS/bindings/csharp/Makefile
index 3414f8562..3414f8562 100644
--- a/libs/nixio/axTLS/bindings/csharp/Makefile
+++ b/libs/luci-lib-nixio/axTLS/bindings/csharp/Makefile
diff --git a/libs/nixio/axTLS/bindings/csharp/axTLS.cs b/libs/luci-lib-nixio/axTLS/bindings/csharp/axTLS.cs
index cf64a256e..cf64a256e 100644
--- a/libs/nixio/axTLS/bindings/csharp/axTLS.cs
+++ b/libs/luci-lib-nixio/axTLS/bindings/csharp/axTLS.cs
diff --git a/libs/nixio/axTLS/bindings/generate_SWIG_interface.pl b/libs/luci-lib-nixio/axTLS/bindings/generate_SWIG_interface.pl
index 4b2517988..4b2517988 100755
--- a/libs/nixio/axTLS/bindings/generate_SWIG_interface.pl
+++ b/libs/luci-lib-nixio/axTLS/bindings/generate_SWIG_interface.pl
diff --git a/libs/nixio/axTLS/bindings/generate_interface.pl b/libs/luci-lib-nixio/axTLS/bindings/generate_interface.pl
index c24bff9f4..c24bff9f4 100755
--- a/libs/nixio/axTLS/bindings/generate_interface.pl
+++ b/libs/luci-lib-nixio/axTLS/bindings/generate_interface.pl
diff --git a/libs/nixio/axTLS/bindings/java/Makefile b/libs/luci-lib-nixio/axTLS/bindings/java/Makefile
index 8df1d0aa8..8df1d0aa8 100644
--- a/libs/nixio/axTLS/bindings/java/Makefile
+++ b/libs/luci-lib-nixio/axTLS/bindings/java/Makefile
diff --git a/libs/nixio/axTLS/bindings/java/SSL.java b/libs/luci-lib-nixio/axTLS/bindings/java/SSL.java
index b53a6da06..b53a6da06 100644
--- a/libs/nixio/axTLS/bindings/java/SSL.java
+++ b/libs/luci-lib-nixio/axTLS/bindings/java/SSL.java
diff --git a/libs/nixio/axTLS/bindings/java/SSLCTX.java b/libs/luci-lib-nixio/axTLS/bindings/java/SSLCTX.java
index 1cd3e032f..1cd3e032f 100644
--- a/libs/nixio/axTLS/bindings/java/SSLCTX.java
+++ b/libs/luci-lib-nixio/axTLS/bindings/java/SSLCTX.java
diff --git a/libs/nixio/axTLS/bindings/java/SSLClient.java b/libs/luci-lib-nixio/axTLS/bindings/java/SSLClient.java
index f65fe9c53..f65fe9c53 100644
--- a/libs/nixio/axTLS/bindings/java/SSLClient.java
+++ b/libs/luci-lib-nixio/axTLS/bindings/java/SSLClient.java
diff --git a/libs/nixio/axTLS/bindings/java/SSLReadHolder.java b/libs/luci-lib-nixio/axTLS/bindings/java/SSLReadHolder.java
index 91fd76b23..91fd76b23 100644
--- a/libs/nixio/axTLS/bindings/java/SSLReadHolder.java
+++ b/libs/luci-lib-nixio/axTLS/bindings/java/SSLReadHolder.java
diff --git a/libs/nixio/axTLS/bindings/java/SSLServer.java b/libs/luci-lib-nixio/axTLS/bindings/java/SSLServer.java
index 514ccb034..514ccb034 100644
--- a/libs/nixio/axTLS/bindings/java/SSLServer.java
+++ b/libs/luci-lib-nixio/axTLS/bindings/java/SSLServer.java
diff --git a/libs/nixio/axTLS/bindings/java/SSLUtil.java b/libs/luci-lib-nixio/axTLS/bindings/java/SSLUtil.java
index 3d53de51c..3d53de51c 100644
--- a/libs/nixio/axTLS/bindings/java/SSLUtil.java
+++ b/libs/luci-lib-nixio/axTLS/bindings/java/SSLUtil.java
diff --git a/libs/nixio/axTLS/bindings/lua/Makefile b/libs/luci-lib-nixio/axTLS/bindings/lua/Makefile
index daacf9215..daacf9215 100644
--- a/libs/nixio/axTLS/bindings/lua/Makefile
+++ b/libs/luci-lib-nixio/axTLS/bindings/lua/Makefile
diff --git a/libs/nixio/axTLS/bindings/perl/Makefile b/libs/luci-lib-nixio/axTLS/bindings/perl/Makefile
index 92fd3c50f..92fd3c50f 100644
--- a/libs/nixio/axTLS/bindings/perl/Makefile
+++ b/libs/luci-lib-nixio/axTLS/bindings/perl/Makefile
diff --git a/libs/nixio/axTLS/bindings/vbnet/Makefile b/libs/luci-lib-nixio/axTLS/bindings/vbnet/Makefile
index 7da60d02e..7da60d02e 100644
--- a/libs/nixio/axTLS/bindings/vbnet/Makefile
+++ b/libs/luci-lib-nixio/axTLS/bindings/vbnet/Makefile
diff --git a/libs/nixio/axTLS/bindings/vbnet/axTLSvb.vb b/libs/luci-lib-nixio/axTLS/bindings/vbnet/axTLSvb.vb
index 9388273ce..9388273ce 100644
--- a/libs/nixio/axTLS/bindings/vbnet/axTLSvb.vb
+++ b/libs/luci-lib-nixio/axTLS/bindings/vbnet/axTLSvb.vb
diff --git a/libs/nixio/axTLS/config/.config b/libs/luci-lib-nixio/axTLS/config/.config
index 46cd061b4..46cd061b4 100644
--- a/libs/nixio/axTLS/config/.config
+++ b/libs/luci-lib-nixio/axTLS/config/.config
diff --git a/libs/nixio/axTLS/config/Config.in b/libs/luci-lib-nixio/axTLS/config/Config.in
index dc4075646..dc4075646 100644
--- a/libs/nixio/axTLS/config/Config.in
+++ b/libs/luci-lib-nixio/axTLS/config/Config.in
diff --git a/libs/nixio/axTLS/config/JMeter.jmx b/libs/luci-lib-nixio/axTLS/config/JMeter.jmx
index f62c03f0e..f62c03f0e 100755
--- a/libs/nixio/axTLS/config/JMeter.jmx
+++ b/libs/luci-lib-nixio/axTLS/config/JMeter.jmx
diff --git a/libs/nixio/axTLS/config/Rules.mak b/libs/luci-lib-nixio/axTLS/config/Rules.mak
index c0308da05..c0308da05 100644
--- a/libs/nixio/axTLS/config/Rules.mak
+++ b/libs/luci-lib-nixio/axTLS/config/Rules.mak
diff --git a/libs/nixio/axTLS/config/axhttpd.aip b/libs/luci-lib-nixio/axTLS/config/axhttpd.aip
index 412fe3b4d..412fe3b4d 100755
--- a/libs/nixio/axTLS/config/axhttpd.aip
+++ b/libs/luci-lib-nixio/axTLS/config/axhttpd.aip
diff --git a/libs/nixio/axTLS/config/axtls.RES b/libs/luci-lib-nixio/axTLS/config/axtls.RES
index 2929b3b67..2929b3b67 100644
--- a/libs/nixio/axTLS/config/axtls.RES
+++ b/libs/luci-lib-nixio/axTLS/config/axtls.RES
diff --git a/libs/nixio/axTLS/config/axtls.rc b/libs/luci-lib-nixio/axTLS/config/axtls.rc
index 0f288aa91..0f288aa91 100644
--- a/libs/nixio/axTLS/config/axtls.rc
+++ b/libs/luci-lib-nixio/axTLS/config/axtls.rc
diff --git a/libs/nixio/axTLS/config/config.h b/libs/luci-lib-nixio/axTLS/config/config.h
index 0f861f34b..0f861f34b 100644
--- a/libs/nixio/axTLS/config/config.h
+++ b/libs/luci-lib-nixio/axTLS/config/config.h
diff --git a/libs/nixio/axTLS/config/linuxconfig b/libs/luci-lib-nixio/axTLS/config/linuxconfig
index 614fdd80e..614fdd80e 100644
--- a/libs/nixio/axTLS/config/linuxconfig
+++ b/libs/luci-lib-nixio/axTLS/config/linuxconfig
diff --git a/libs/nixio/axTLS/config/makefile.conf b/libs/luci-lib-nixio/axTLS/config/makefile.conf
index 9f9db1330..9f9db1330 100644
--- a/libs/nixio/axTLS/config/makefile.conf
+++ b/libs/luci-lib-nixio/axTLS/config/makefile.conf
diff --git a/libs/nixio/axTLS/config/makefile.dotnet.conf b/libs/luci-lib-nixio/axTLS/config/makefile.dotnet.conf
index 9cff4fddf..9cff4fddf 100644
--- a/libs/nixio/axTLS/config/makefile.dotnet.conf
+++ b/libs/luci-lib-nixio/axTLS/config/makefile.dotnet.conf
diff --git a/libs/nixio/axTLS/config/makefile.java.conf b/libs/luci-lib-nixio/axTLS/config/makefile.java.conf
index 9b2246290..9b2246290 100644
--- a/libs/nixio/axTLS/config/makefile.java.conf
+++ b/libs/luci-lib-nixio/axTLS/config/makefile.java.conf
diff --git a/libs/nixio/axTLS/config/makefile.post b/libs/luci-lib-nixio/axTLS/config/makefile.post
index 033981c4d..033981c4d 100644
--- a/libs/nixio/axTLS/config/makefile.post
+++ b/libs/luci-lib-nixio/axTLS/config/makefile.post
diff --git a/libs/nixio/axTLS/config/scripts/config/Kconfig-language.txt b/libs/luci-lib-nixio/axTLS/config/scripts/config/Kconfig-language.txt
index 493749b32..493749b32 100644
--- a/libs/nixio/axTLS/config/scripts/config/Kconfig-language.txt
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/Kconfig-language.txt
diff --git a/libs/nixio/axTLS/config/scripts/config/Makefile b/libs/luci-lib-nixio/axTLS/config/scripts/config/Makefile
index 739950163..739950163 100644
--- a/libs/nixio/axTLS/config/scripts/config/Makefile
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/Makefile
diff --git a/libs/nixio/axTLS/config/scripts/config/conf.c b/libs/luci-lib-nixio/axTLS/config/scripts/config/conf.c
index 15244678e..15244678e 100644
--- a/libs/nixio/axTLS/config/scripts/config/conf.c
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/conf.c
diff --git a/libs/nixio/axTLS/config/scripts/config/confdata.c b/libs/luci-lib-nixio/axTLS/config/scripts/config/confdata.c
index a59e24550..a59e24550 100644
--- a/libs/nixio/axTLS/config/scripts/config/confdata.c
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/confdata.c
diff --git a/libs/nixio/axTLS/config/scripts/config/expr.c b/libs/luci-lib-nixio/axTLS/config/scripts/config/expr.c
index 30e4f9d69..30e4f9d69 100644
--- a/libs/nixio/axTLS/config/scripts/config/expr.c
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/expr.c
diff --git a/libs/nixio/axTLS/config/scripts/config/expr.h b/libs/luci-lib-nixio/axTLS/config/scripts/config/expr.h
index 7d39ff43e..7d39ff43e 100644
--- a/libs/nixio/axTLS/config/scripts/config/expr.h
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/expr.h
diff --git a/libs/nixio/axTLS/config/scripts/config/lex.zconf.c_shipped b/libs/luci-lib-nixio/axTLS/config/scripts/config/lex.zconf.c_shipped
index b877bb6b3..b877bb6b3 100644
--- a/libs/nixio/axTLS/config/scripts/config/lex.zconf.c_shipped
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/lex.zconf.c_shipped
diff --git a/libs/nixio/axTLS/config/scripts/config/lkc.h b/libs/luci-lib-nixio/axTLS/config/scripts/config/lkc.h
index b8a67fc9d..b8a67fc9d 100644
--- a/libs/nixio/axTLS/config/scripts/config/lkc.h
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/lkc.h
diff --git a/libs/nixio/axTLS/config/scripts/config/lkc_proto.h b/libs/luci-lib-nixio/axTLS/config/scripts/config/lkc_proto.h
index 6dc6d0c48..6dc6d0c48 100644
--- a/libs/nixio/axTLS/config/scripts/config/lkc_proto.h
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/lkc_proto.h
diff --git a/libs/nixio/axTLS/config/scripts/config/lxdialog/BIG.FAT.WARNING b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/BIG.FAT.WARNING
index a8999d82b..a8999d82b 100644
--- a/libs/nixio/axTLS/config/scripts/config/lxdialog/BIG.FAT.WARNING
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/BIG.FAT.WARNING
diff --git a/libs/nixio/axTLS/config/scripts/config/lxdialog/checklist.c b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/checklist.c
index 71de4a191..71de4a191 100644
--- a/libs/nixio/axTLS/config/scripts/config/lxdialog/checklist.c
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/checklist.c
diff --git a/libs/nixio/axTLS/config/scripts/config/lxdialog/colors.h b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/colors.h
index d34dd37c6..d34dd37c6 100644
--- a/libs/nixio/axTLS/config/scripts/config/lxdialog/colors.h
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/colors.h
diff --git a/libs/nixio/axTLS/config/scripts/config/lxdialog/dialog.h b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/dialog.h
index 7bab3ad0e..7bab3ad0e 100644
--- a/libs/nixio/axTLS/config/scripts/config/lxdialog/dialog.h
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/dialog.h
diff --git a/libs/nixio/axTLS/config/scripts/config/lxdialog/inputbox.c b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/inputbox.c
index fa7bebc69..fa7bebc69 100644
--- a/libs/nixio/axTLS/config/scripts/config/lxdialog/inputbox.c
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/inputbox.c
diff --git a/libs/nixio/axTLS/config/scripts/config/lxdialog/menubox.c b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/menubox.c
index 873dc587b..873dc587b 100644
--- a/libs/nixio/axTLS/config/scripts/config/lxdialog/menubox.c
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/menubox.c
diff --git a/libs/nixio/axTLS/config/scripts/config/lxdialog/msgbox.c b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/msgbox.c
index 93692e1fb..93692e1fb 100644
--- a/libs/nixio/axTLS/config/scripts/config/lxdialog/msgbox.c
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/msgbox.c
diff --git a/libs/nixio/axTLS/config/scripts/config/lxdialog/textbox.c b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/textbox.c
index a5a460b5c..a5a460b5c 100644
--- a/libs/nixio/axTLS/config/scripts/config/lxdialog/textbox.c
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/textbox.c
diff --git a/libs/nixio/axTLS/config/scripts/config/lxdialog/util.c b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/util.c
index 6f83951b9..6f83951b9 100644
--- a/libs/nixio/axTLS/config/scripts/config/lxdialog/util.c
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/util.c
diff --git a/libs/nixio/axTLS/config/scripts/config/lxdialog/yesno.c b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/yesno.c
index 11fcc25f5..11fcc25f5 100644
--- a/libs/nixio/axTLS/config/scripts/config/lxdialog/yesno.c
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/lxdialog/yesno.c
diff --git a/libs/nixio/axTLS/config/scripts/config/mconf.c b/libs/luci-lib-nixio/axTLS/config/scripts/config/mconf.c
index 406eb29c3..406eb29c3 100644
--- a/libs/nixio/axTLS/config/scripts/config/mconf.c
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/mconf.c
diff --git a/libs/nixio/axTLS/config/scripts/config/menu.c b/libs/luci-lib-nixio/axTLS/config/scripts/config/menu.c
index 0c13156f3..0c13156f3 100644
--- a/libs/nixio/axTLS/config/scripts/config/menu.c
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/menu.c
diff --git a/libs/nixio/axTLS/config/scripts/config/mkconfigs b/libs/luci-lib-nixio/axTLS/config/scripts/config/mkconfigs
index 3cb7bb175..3cb7bb175 100755
--- a/libs/nixio/axTLS/config/scripts/config/mkconfigs
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/mkconfigs
diff --git a/libs/nixio/axTLS/config/scripts/config/symbol.c b/libs/luci-lib-nixio/axTLS/config/scripts/config/symbol.c
index ea629728a..ea629728a 100644
--- a/libs/nixio/axTLS/config/scripts/config/symbol.c
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/symbol.c
diff --git a/libs/nixio/axTLS/config/scripts/config/util.c b/libs/luci-lib-nixio/axTLS/config/scripts/config/util.c
index 8fc95a2a7..8fc95a2a7 100644
--- a/libs/nixio/axTLS/config/scripts/config/util.c
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/util.c
diff --git a/libs/nixio/axTLS/config/scripts/config/zconf.l b/libs/luci-lib-nixio/axTLS/config/scripts/config/zconf.l
index 55517b287..55517b287 100644
--- a/libs/nixio/axTLS/config/scripts/config/zconf.l
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/zconf.l
diff --git a/libs/nixio/axTLS/config/scripts/config/zconf.tab.c_shipped b/libs/luci-lib-nixio/axTLS/config/scripts/config/zconf.tab.c_shipped
index cc68dcb9a..cc68dcb9a 100644
--- a/libs/nixio/axTLS/config/scripts/config/zconf.tab.c_shipped
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/zconf.tab.c_shipped
diff --git a/libs/nixio/axTLS/config/scripts/config/zconf.tab.h_shipped b/libs/luci-lib-nixio/axTLS/config/scripts/config/zconf.tab.h_shipped
index 3b191ef59..3b191ef59 100644
--- a/libs/nixio/axTLS/config/scripts/config/zconf.tab.h_shipped
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/zconf.tab.h_shipped
diff --git a/libs/nixio/axTLS/config/scripts/config/zconf.y b/libs/luci-lib-nixio/axTLS/config/scripts/config/zconf.y
index cf45da0b2..cf45da0b2 100644
--- a/libs/nixio/axTLS/config/scripts/config/zconf.y
+++ b/libs/luci-lib-nixio/axTLS/config/scripts/config/zconf.y
diff --git a/libs/nixio/axTLS/config/win32config b/libs/luci-lib-nixio/axTLS/config/win32config
index 6c8d60712..6c8d60712 100644
--- a/libs/nixio/axTLS/config/win32config
+++ b/libs/luci-lib-nixio/axTLS/config/win32config
diff --git a/libs/nixio/axTLS/crypto/Makefile b/libs/luci-lib-nixio/axTLS/crypto/Makefile
index 3ea8bdde0..3ea8bdde0 100644
--- a/libs/nixio/axTLS/crypto/Makefile
+++ b/libs/luci-lib-nixio/axTLS/crypto/Makefile
diff --git a/libs/nixio/axTLS/crypto/aes.c b/libs/luci-lib-nixio/axTLS/crypto/aes.c
index 038a45bd8..038a45bd8 100644
--- a/libs/nixio/axTLS/crypto/aes.c
+++ b/libs/luci-lib-nixio/axTLS/crypto/aes.c
diff --git a/libs/nixio/axTLS/crypto/bigint.c b/libs/luci-lib-nixio/axTLS/crypto/bigint.c
index 53a583929..53a583929 100644
--- a/libs/nixio/axTLS/crypto/bigint.c
+++ b/libs/luci-lib-nixio/axTLS/crypto/bigint.c
diff --git a/libs/nixio/axTLS/crypto/bigint.h b/libs/luci-lib-nixio/axTLS/crypto/bigint.h
index 2966a3edb..2966a3edb 100644
--- a/libs/nixio/axTLS/crypto/bigint.h
+++ b/libs/luci-lib-nixio/axTLS/crypto/bigint.h
diff --git a/libs/nixio/axTLS/crypto/bigint_impl.h b/libs/luci-lib-nixio/axTLS/crypto/bigint_impl.h
index 1483154a4..1483154a4 100644
--- a/libs/nixio/axTLS/crypto/bigint_impl.h
+++ b/libs/luci-lib-nixio/axTLS/crypto/bigint_impl.h
diff --git a/libs/nixio/axTLS/crypto/crypto.h b/libs/luci-lib-nixio/axTLS/crypto/crypto.h
index 5c95f2159..5c95f2159 100644
--- a/libs/nixio/axTLS/crypto/crypto.h
+++ b/libs/luci-lib-nixio/axTLS/crypto/crypto.h
diff --git a/libs/nixio/axTLS/crypto/crypto_misc.c b/libs/luci-lib-nixio/axTLS/crypto/crypto_misc.c
index 59b72ec08..59b72ec08 100644
--- a/libs/nixio/axTLS/crypto/crypto_misc.c
+++ b/libs/luci-lib-nixio/axTLS/crypto/crypto_misc.c
diff --git a/libs/nixio/axTLS/crypto/hmac.c b/libs/luci-lib-nixio/axTLS/crypto/hmac.c
index 9199ff220..9199ff220 100644
--- a/libs/nixio/axTLS/crypto/hmac.c
+++ b/libs/luci-lib-nixio/axTLS/crypto/hmac.c
diff --git a/libs/nixio/axTLS/crypto/md2.c b/libs/luci-lib-nixio/axTLS/crypto/md2.c
index bfcbd24bb..bfcbd24bb 100644
--- a/libs/nixio/axTLS/crypto/md2.c
+++ b/libs/luci-lib-nixio/axTLS/crypto/md2.c
diff --git a/libs/nixio/axTLS/crypto/md5.c b/libs/luci-lib-nixio/axTLS/crypto/md5.c
index b4f86cab5..b4f86cab5 100644
--- a/libs/nixio/axTLS/crypto/md5.c
+++ b/libs/luci-lib-nixio/axTLS/crypto/md5.c
diff --git a/libs/nixio/axTLS/crypto/rc4.c b/libs/luci-lib-nixio/axTLS/crypto/rc4.c
index 57136b82b..57136b82b 100644
--- a/libs/nixio/axTLS/crypto/rc4.c
+++ b/libs/luci-lib-nixio/axTLS/crypto/rc4.c
diff --git a/libs/nixio/axTLS/crypto/rsa.c b/libs/luci-lib-nixio/axTLS/crypto/rsa.c
index 31627bb31..31627bb31 100644
--- a/libs/nixio/axTLS/crypto/rsa.c
+++ b/libs/luci-lib-nixio/axTLS/crypto/rsa.c
diff --git a/libs/nixio/axTLS/crypto/sha1.c b/libs/luci-lib-nixio/axTLS/crypto/sha1.c
index be1910079..be1910079 100644
--- a/libs/nixio/axTLS/crypto/sha1.c
+++ b/libs/luci-lib-nixio/axTLS/crypto/sha1.c
diff --git a/libs/nixio/axTLS/docsrc/Makefile b/libs/luci-lib-nixio/axTLS/docsrc/Makefile
index 28266869b..28266869b 100644
--- a/libs/nixio/axTLS/docsrc/Makefile
+++ b/libs/luci-lib-nixio/axTLS/docsrc/Makefile
diff --git a/libs/nixio/axTLS/docsrc/axTLS.dox b/libs/luci-lib-nixio/axTLS/docsrc/axTLS.dox
index d9959b21d..d9959b21d 100644
--- a/libs/nixio/axTLS/docsrc/axTLS.dox
+++ b/libs/luci-lib-nixio/axTLS/docsrc/axTLS.dox
diff --git a/libs/nixio/axTLS/docsrc/doco_footer.html b/libs/luci-lib-nixio/axTLS/docsrc/doco_footer.html
index 20c4e70b7..20c4e70b7 100644
--- a/libs/nixio/axTLS/docsrc/doco_footer.html
+++ b/libs/luci-lib-nixio/axTLS/docsrc/doco_footer.html
diff --git a/libs/nixio/axTLS/docsrc/images/axolotl.jpg b/libs/luci-lib-nixio/axTLS/docsrc/images/axolotl.jpg
index 7352bbae8..7352bbae8 100644
--- a/libs/nixio/axTLS/docsrc/images/axolotl.jpg
+++ b/libs/luci-lib-nixio/axTLS/docsrc/images/axolotl.jpg
diff --git a/libs/nixio/axTLS/docsrc/images/tsbasbw.gif b/libs/luci-lib-nixio/axTLS/docsrc/images/tsbasbw.gif
index cf03b121b..cf03b121b 100644
--- a/libs/nixio/axTLS/docsrc/images/tsbasbw.gif
+++ b/libs/luci-lib-nixio/axTLS/docsrc/images/tsbasbw.gif
diff --git a/libs/nixio/axTLS/httpd/Config.in b/libs/luci-lib-nixio/axTLS/httpd/Config.in
index 513d57ae3..513d57ae3 100644
--- a/libs/nixio/axTLS/httpd/Config.in
+++ b/libs/luci-lib-nixio/axTLS/httpd/Config.in
diff --git a/libs/nixio/axTLS/httpd/Makefile b/libs/luci-lib-nixio/axTLS/httpd/Makefile
index b8c18d244..b8c18d244 100644
--- a/libs/nixio/axTLS/httpd/Makefile
+++ b/libs/luci-lib-nixio/axTLS/httpd/Makefile
diff --git a/libs/nixio/axTLS/httpd/axhttp.h b/libs/luci-lib-nixio/axTLS/httpd/axhttp.h
index 73c299fb1..73c299fb1 100644
--- a/libs/nixio/axTLS/httpd/axhttp.h
+++ b/libs/luci-lib-nixio/axTLS/httpd/axhttp.h
diff --git a/libs/nixio/axTLS/httpd/axhttpd.c b/libs/luci-lib-nixio/axTLS/httpd/axhttpd.c
index 35d36f64c..35d36f64c 100644
--- a/libs/nixio/axTLS/httpd/axhttpd.c
+++ b/libs/luci-lib-nixio/axTLS/httpd/axhttpd.c
diff --git a/libs/nixio/axTLS/httpd/htpasswd.c b/libs/luci-lib-nixio/axTLS/httpd/htpasswd.c
index 1a7a2311f..1a7a2311f 100644
--- a/libs/nixio/axTLS/httpd/htpasswd.c
+++ b/libs/luci-lib-nixio/axTLS/httpd/htpasswd.c
diff --git a/libs/nixio/axTLS/httpd/kepler-1.1-snapshot-20070521-1825.tar.gz b/libs/luci-lib-nixio/axTLS/httpd/kepler-1.1-snapshot-20070521-1825.tar.gz
index d1caec5a5..d1caec5a5 100755
--- a/libs/nixio/axTLS/httpd/kepler-1.1-snapshot-20070521-1825.tar.gz
+++ b/libs/luci-lib-nixio/axTLS/httpd/kepler-1.1-snapshot-20070521-1825.tar.gz
diff --git a/libs/nixio/axTLS/httpd/kepler.patch b/libs/luci-lib-nixio/axTLS/httpd/kepler.patch
index dbab7e501..dbab7e501 100644
--- a/libs/nixio/axTLS/httpd/kepler.patch
+++ b/libs/luci-lib-nixio/axTLS/httpd/kepler.patch
diff --git a/libs/nixio/axTLS/httpd/proc.c b/libs/luci-lib-nixio/axTLS/httpd/proc.c
index 3c897c98b..3c897c98b 100644
--- a/libs/nixio/axTLS/httpd/proc.c
+++ b/libs/luci-lib-nixio/axTLS/httpd/proc.c
diff --git a/libs/nixio/axTLS/httpd/tdate_parse.c b/libs/luci-lib-nixio/axTLS/httpd/tdate_parse.c
index 813bdc578..813bdc578 100644
--- a/libs/nixio/axTLS/httpd/tdate_parse.c
+++ b/libs/luci-lib-nixio/axTLS/httpd/tdate_parse.c
diff --git a/libs/nixio/axTLS/samples/Config.in b/libs/luci-lib-nixio/axTLS/samples/Config.in
index ecad25eeb..ecad25eeb 100644
--- a/libs/nixio/axTLS/samples/Config.in
+++ b/libs/luci-lib-nixio/axTLS/samples/Config.in
diff --git a/libs/nixio/axTLS/samples/Makefile b/libs/luci-lib-nixio/axTLS/samples/Makefile
index afbdd43d1..afbdd43d1 100644
--- a/libs/nixio/axTLS/samples/Makefile
+++ b/libs/luci-lib-nixio/axTLS/samples/Makefile
diff --git a/libs/nixio/axTLS/samples/c/Makefile b/libs/luci-lib-nixio/axTLS/samples/c/Makefile
index 17cf9e7c1..17cf9e7c1 100644
--- a/libs/nixio/axTLS/samples/c/Makefile
+++ b/libs/luci-lib-nixio/axTLS/samples/c/Makefile
diff --git a/libs/nixio/axTLS/samples/c/axssl.c b/libs/luci-lib-nixio/axTLS/samples/c/axssl.c
index 6892ee452..6892ee452 100644
--- a/libs/nixio/axTLS/samples/c/axssl.c
+++ b/libs/luci-lib-nixio/axTLS/samples/c/axssl.c
diff --git a/libs/nixio/axTLS/samples/csharp/Makefile b/libs/luci-lib-nixio/axTLS/samples/csharp/Makefile
index 46c2421dc..46c2421dc 100644
--- a/libs/nixio/axTLS/samples/csharp/Makefile
+++ b/libs/luci-lib-nixio/axTLS/samples/csharp/Makefile
diff --git a/libs/nixio/axTLS/samples/csharp/axssl.cs b/libs/luci-lib-nixio/axTLS/samples/csharp/axssl.cs
index dae2b8a41..dae2b8a41 100644
--- a/libs/nixio/axTLS/samples/csharp/axssl.cs
+++ b/libs/luci-lib-nixio/axTLS/samples/csharp/axssl.cs
diff --git a/libs/nixio/axTLS/samples/java/Makefile b/libs/luci-lib-nixio/axTLS/samples/java/Makefile
index b10a79f37..b10a79f37 100644
--- a/libs/nixio/axTLS/samples/java/Makefile
+++ b/libs/luci-lib-nixio/axTLS/samples/java/Makefile
diff --git a/libs/nixio/axTLS/samples/java/axssl.java b/libs/luci-lib-nixio/axTLS/samples/java/axssl.java
index 2057f2966..2057f2966 100644
--- a/libs/nixio/axTLS/samples/java/axssl.java
+++ b/libs/luci-lib-nixio/axTLS/samples/java/axssl.java
diff --git a/libs/nixio/axTLS/samples/java/manifest.mf b/libs/luci-lib-nixio/axTLS/samples/java/manifest.mf
index b906ed29e..b906ed29e 100644
--- a/libs/nixio/axTLS/samples/java/manifest.mf
+++ b/libs/luci-lib-nixio/axTLS/samples/java/manifest.mf
diff --git a/libs/nixio/axTLS/samples/lua/Makefile b/libs/luci-lib-nixio/axTLS/samples/lua/Makefile
index a460da3c5..a460da3c5 100644
--- a/libs/nixio/axTLS/samples/lua/Makefile
+++ b/libs/luci-lib-nixio/axTLS/samples/lua/Makefile
diff --git a/libs/nixio/axTLS/samples/lua/axssl.lua b/libs/luci-lib-nixio/axTLS/samples/lua/axssl.lua
index 6ea26b69d..6ea26b69d 100755
--- a/libs/nixio/axTLS/samples/lua/axssl.lua
+++ b/libs/luci-lib-nixio/axTLS/samples/lua/axssl.lua
diff --git a/libs/nixio/axTLS/samples/perl/Makefile b/libs/luci-lib-nixio/axTLS/samples/perl/Makefile
index 5200c4302..5200c4302 100644
--- a/libs/nixio/axTLS/samples/perl/Makefile
+++ b/libs/luci-lib-nixio/axTLS/samples/perl/Makefile
diff --git a/libs/nixio/axTLS/samples/perl/axssl.pl b/libs/luci-lib-nixio/axTLS/samples/perl/axssl.pl
index e49d52270..e49d52270 100755
--- a/libs/nixio/axTLS/samples/perl/axssl.pl
+++ b/libs/luci-lib-nixio/axTLS/samples/perl/axssl.pl
diff --git a/libs/nixio/axTLS/samples/vbnet/Makefile b/libs/luci-lib-nixio/axTLS/samples/vbnet/Makefile
index 0984d4e02..0984d4e02 100644
--- a/libs/nixio/axTLS/samples/vbnet/Makefile
+++ b/libs/luci-lib-nixio/axTLS/samples/vbnet/Makefile
diff --git a/libs/nixio/axTLS/samples/vbnet/axssl.vb b/libs/luci-lib-nixio/axTLS/samples/vbnet/axssl.vb
index 1b423c865..1b423c865 100644
--- a/libs/nixio/axTLS/samples/vbnet/axssl.vb
+++ b/libs/luci-lib-nixio/axTLS/samples/vbnet/axssl.vb
diff --git a/libs/nixio/axTLS/ssl/BigIntConfig.in b/libs/luci-lib-nixio/axTLS/ssl/BigIntConfig.in
index 04c7438c0..04c7438c0 100644
--- a/libs/nixio/axTLS/ssl/BigIntConfig.in
+++ b/libs/luci-lib-nixio/axTLS/ssl/BigIntConfig.in
diff --git a/libs/nixio/axTLS/ssl/Config.in b/libs/luci-lib-nixio/axTLS/ssl/Config.in
index d047d420e..d047d420e 100644
--- a/libs/nixio/axTLS/ssl/Config.in
+++ b/libs/luci-lib-nixio/axTLS/ssl/Config.in
diff --git a/libs/nixio/axTLS/ssl/Makefile b/libs/luci-lib-nixio/axTLS/ssl/Makefile
index 704d90a9b..704d90a9b 100644
--- a/libs/nixio/axTLS/ssl/Makefile
+++ b/libs/luci-lib-nixio/axTLS/ssl/Makefile
diff --git a/libs/nixio/axTLS/ssl/asn1.c b/libs/luci-lib-nixio/axTLS/ssl/asn1.c
index 4f2e6db24..4f2e6db24 100644
--- a/libs/nixio/axTLS/ssl/asn1.c
+++ b/libs/luci-lib-nixio/axTLS/ssl/asn1.c
diff --git a/libs/nixio/axTLS/ssl/cert.h b/libs/luci-lib-nixio/axTLS/ssl/cert.h
index 7a85d2d84..7a85d2d84 100644
--- a/libs/nixio/axTLS/ssl/cert.h
+++ b/libs/luci-lib-nixio/axTLS/ssl/cert.h
diff --git a/libs/nixio/axTLS/ssl/crypto_misc.h b/libs/luci-lib-nixio/axTLS/ssl/crypto_misc.h
index 97cb0f2d2..97cb0f2d2 100644
--- a/libs/nixio/axTLS/ssl/crypto_misc.h
+++ b/libs/luci-lib-nixio/axTLS/ssl/crypto_misc.h
diff --git a/libs/nixio/axTLS/ssl/gen_cert.c b/libs/luci-lib-nixio/axTLS/ssl/gen_cert.c
index 94b74903c..94b74903c 100644
--- a/libs/nixio/axTLS/ssl/gen_cert.c
+++ b/libs/luci-lib-nixio/axTLS/ssl/gen_cert.c
diff --git a/libs/nixio/axTLS/ssl/loader.c b/libs/luci-lib-nixio/axTLS/ssl/loader.c
index 4232f7eec..4232f7eec 100644
--- a/libs/nixio/axTLS/ssl/loader.c
+++ b/libs/luci-lib-nixio/axTLS/ssl/loader.c
diff --git a/libs/nixio/axTLS/ssl/openssl.c b/libs/luci-lib-nixio/axTLS/ssl/openssl.c
index b6b955008..b6b955008 100644
--- a/libs/nixio/axTLS/ssl/openssl.c
+++ b/libs/luci-lib-nixio/axTLS/ssl/openssl.c
diff --git a/libs/nixio/axTLS/ssl/os_port.c b/libs/luci-lib-nixio/axTLS/ssl/os_port.c
index 6a71000b4..6a71000b4 100644
--- a/libs/nixio/axTLS/ssl/os_port.c
+++ b/libs/luci-lib-nixio/axTLS/ssl/os_port.c
diff --git a/libs/nixio/axTLS/ssl/os_port.h b/libs/luci-lib-nixio/axTLS/ssl/os_port.h
index 262c4dd70..262c4dd70 100644
--- a/libs/nixio/axTLS/ssl/os_port.h
+++ b/libs/luci-lib-nixio/axTLS/ssl/os_port.h
diff --git a/libs/nixio/axTLS/ssl/p12.c b/libs/luci-lib-nixio/axTLS/ssl/p12.c
index 6ed92e431..6ed92e431 100644
--- a/libs/nixio/axTLS/ssl/p12.c
+++ b/libs/luci-lib-nixio/axTLS/ssl/p12.c
diff --git a/libs/nixio/axTLS/ssl/private_key.h b/libs/luci-lib-nixio/axTLS/ssl/private_key.h
index 96a525331..96a525331 100644
--- a/libs/nixio/axTLS/ssl/private_key.h
+++ b/libs/luci-lib-nixio/axTLS/ssl/private_key.h
diff --git a/libs/nixio/axTLS/ssl/ssl.h b/libs/luci-lib-nixio/axTLS/ssl/ssl.h
index 539d0a305..539d0a305 100644
--- a/libs/nixio/axTLS/ssl/ssl.h
+++ b/libs/luci-lib-nixio/axTLS/ssl/ssl.h
diff --git a/libs/nixio/axTLS/ssl/test/Makefile b/libs/luci-lib-nixio/axTLS/ssl/test/Makefile
index 56c711f19..56c711f19 100644
--- a/libs/nixio/axTLS/ssl/test/Makefile
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/Makefile
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.ca_key.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.ca_key.pem
index 7c8ac8af2..7c8ac8af2 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.ca_key.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.ca_key.pem
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.ca_x509.cer b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.ca_x509.cer
index 9c9936b8e..9c9936b8e 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.ca_x509.cer
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.ca_x509.cer
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.ca_x509.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.ca_x509.pem
index 86f659710..86f659710 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.ca_x509.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.ca_x509.pem
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.device_key b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.device_key
index 4e981d143..4e981d143 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.device_key
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.device_key
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.device_key.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.device_key.pem
index 2bcf5e37b..2bcf5e37b 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.device_key.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.device_key.pem
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.encrypted.p8 b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.encrypted.p8
index 8b0a7eb41..8b0a7eb41 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.encrypted.p8
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.encrypted.p8
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.encrypted_pem.p8 b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.encrypted_pem.p8
index 19ca3c5ea..19ca3c5ea 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.encrypted_pem.p8
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.encrypted_pem.p8
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.key_1024 b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_1024
index 5b6ba1d03..5b6ba1d03 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.key_1024
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_1024
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.key_1024.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_1024.pem
index 4f5ad4ece..4f5ad4ece 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.key_1024.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_1024.pem
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.key_2048 b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_2048
index 0af642de2..0af642de2 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.key_2048
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_2048
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.key_2048.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_2048.pem
index beddb721b..beddb721b 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.key_2048.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_2048.pem
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.key_4096 b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_4096
index c205382ab..c205382ab 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.key_4096
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_4096
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.key_4096.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_4096.pem
index 9929467f4..9929467f4 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.key_4096.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_4096.pem
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.key_512 b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_512
index 7ae50f23b..7ae50f23b 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.key_512
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_512
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.key_512.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_512.pem
index 1e2fb41f8..1e2fb41f8 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.key_512.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_512.pem
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.key_aes128.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_aes128.pem
index 8961bd9a5..8961bd9a5 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.key_aes128.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_aes128.pem
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.key_aes256.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_aes256.pem
index 7671a302f..7671a302f 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.key_aes256.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.key_aes256.pem
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.noname.p12 b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.noname.p12
index 9d27999fa..9d27999fa 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.noname.p12
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.noname.p12
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.unencrypted.p8 b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.unencrypted.p8
index d04694b1f..d04694b1f 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.unencrypted.p8
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.unencrypted.p8
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.unencrypted_pem.p8 b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.unencrypted_pem.p8
index e07375a84..e07375a84 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.unencrypted_pem.p8
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.unencrypted_pem.p8
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.withCA.p12 b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.withCA.p12
index ae029dee0..ae029dee0 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.withCA.p12
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.withCA.p12
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.withoutCA.p12 b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.withoutCA.p12
index c4eb54c44..c4eb54c44 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.withoutCA.p12
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.withoutCA.p12
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.x509_1024.cer b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_1024.cer
index fc92d0564..fc92d0564 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.x509_1024.cer
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_1024.cer
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.x509_1024.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_1024.pem
index 81f3eaf1c..81f3eaf1c 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.x509_1024.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_1024.pem
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.x509_2048.cer b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_2048.cer
index c0badf728..c0badf728 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.x509_2048.cer
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_2048.cer
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.x509_2048.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_2048.pem
index 1ed0141af..1ed0141af 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.x509_2048.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_2048.pem
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.x509_4096.cer b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_4096.cer
index 40bbe94fd..40bbe94fd 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.x509_4096.cer
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_4096.cer
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.x509_4096.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_4096.pem
index b7aed1cab..b7aed1cab 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.x509_4096.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_4096.pem
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.x509_512.cer b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_512.cer
index 48c6e13aa..48c6e13aa 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.x509_512.cer
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_512.cer
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.x509_512.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_512.pem
index 8191e489f..8191e489f 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.x509_512.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_512.pem
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.x509_aes128.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_aes128.pem
index 9a75fe960..9a75fe960 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.x509_aes128.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_aes128.pem
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.x509_aes256.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_aes256.pem
index 4f3074e01..4f3074e01 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.x509_aes256.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_aes256.pem
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.x509_bad_after.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_bad_after.pem
index 79eb9ccd6..79eb9ccd6 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.x509_bad_after.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_bad_after.pem
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.x509_bad_before.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_bad_before.pem
index fe72b541b..fe72b541b 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.x509_bad_before.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_bad_before.pem
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.x509_device.cer b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_device.cer
index c966743c9..c966743c9 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.x509_device.cer
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_device.cer
diff --git a/libs/nixio/axTLS/ssl/test/axTLS.x509_device.pem b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_device.pem
index e9cbaaf31..e9cbaaf31 100644
--- a/libs/nixio/axTLS/ssl/test/axTLS.x509_device.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/axTLS.x509_device.pem
diff --git a/libs/nixio/axTLS/ssl/test/datatest.c b/libs/luci-lib-nixio/axTLS/ssl/test/datatest.c
index 2a5e836e5..2a5e836e5 100644
--- a/libs/nixio/axTLS/ssl/test/datatest.c
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/datatest.c
diff --git a/libs/nixio/axTLS/ssl/test/datatest.c.old b/libs/luci-lib-nixio/axTLS/ssl/test/datatest.c.old
index a5703fb9e..a5703fb9e 100644
--- a/libs/nixio/axTLS/ssl/test/datatest.c.old
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/datatest.c.old
diff --git a/libs/nixio/axTLS/ssl/test/deutsche_telecom.x509_ca b/libs/luci-lib-nixio/axTLS/ssl/test/deutsche_telecom.x509_ca
index 0f4b96a0d..0f4b96a0d 100644
--- a/libs/nixio/axTLS/ssl/test/deutsche_telecom.x509_ca
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/deutsche_telecom.x509_ca
diff --git a/libs/nixio/axTLS/ssl/test/equifax.x509_ca b/libs/luci-lib-nixio/axTLS/ssl/test/equifax.x509_ca
index 79b0a3f98..79b0a3f98 100644
--- a/libs/nixio/axTLS/ssl/test/equifax.x509_ca
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/equifax.x509_ca
diff --git a/libs/nixio/axTLS/ssl/test/gnutls.cer b/libs/luci-lib-nixio/axTLS/ssl/test/gnutls.cer
index 312e36540..312e36540 100755
--- a/libs/nixio/axTLS/ssl/test/gnutls.cer
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/gnutls.cer
diff --git a/libs/nixio/axTLS/ssl/test/header_issue.dat b/libs/luci-lib-nixio/axTLS/ssl/test/header_issue.dat
index a48d23d2b..a48d23d2b 100755
--- a/libs/nixio/axTLS/ssl/test/header_issue.dat
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/header_issue.dat
diff --git a/libs/nixio/axTLS/ssl/test/killopenssl.sh b/libs/luci-lib-nixio/axTLS/ssl/test/killopenssl.sh
index 17950fbae..17950fbae 100755
--- a/libs/nixio/axTLS/ssl/test/killopenssl.sh
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/killopenssl.sh
diff --git a/libs/nixio/axTLS/ssl/test/make_certs.sh b/libs/luci-lib-nixio/axTLS/ssl/test/make_certs.sh
index dfc39d4f5..dfc39d4f5 100755
--- a/libs/nixio/axTLS/ssl/test/make_certs.sh
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/make_certs.sh
diff --git a/libs/nixio/axTLS/ssl/test/microsoft.x509_ca b/libs/luci-lib-nixio/axTLS/ssl/test/microsoft.x509_ca
index b90803452..b90803452 100644
--- a/libs/nixio/axTLS/ssl/test/microsoft.x509_ca
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/microsoft.x509_ca
diff --git a/libs/nixio/axTLS/ssl/test/microsoft.x509_ca.pem b/libs/luci-lib-nixio/axTLS/ssl/test/microsoft.x509_ca.pem
index 478e60b07..478e60b07 100644
--- a/libs/nixio/axTLS/ssl/test/microsoft.x509_ca.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/microsoft.x509_ca.pem
diff --git a/libs/nixio/axTLS/ssl/test/ms_iis.cer b/libs/luci-lib-nixio/axTLS/ssl/test/ms_iis.cer
index 250b926d6..250b926d6 100755
--- a/libs/nixio/axTLS/ssl/test/ms_iis.cer
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/ms_iis.cer
diff --git a/libs/nixio/axTLS/ssl/test/perf_bigint.c b/libs/luci-lib-nixio/axTLS/ssl/test/perf_bigint.c
index a4ffab6a3..a4ffab6a3 100644
--- a/libs/nixio/axTLS/ssl/test/perf_bigint.c
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/perf_bigint.c
diff --git a/libs/nixio/axTLS/ssl/test/socgen.cer b/libs/luci-lib-nixio/axTLS/ssl/test/socgen.cer
index a4278705b..a4278705b 100755
--- a/libs/nixio/axTLS/ssl/test/socgen.cer
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/socgen.cer
diff --git a/libs/nixio/axTLS/ssl/test/ssltest.c b/libs/luci-lib-nixio/axTLS/ssl/test/ssltest.c
index d525e1a68..d525e1a68 100644
--- a/libs/nixio/axTLS/ssl/test/ssltest.c
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/ssltest.c
diff --git a/libs/nixio/axTLS/ssl/test/ssltest.c.bak b/libs/luci-lib-nixio/axTLS/ssl/test/ssltest.c.bak
index ca9637f9a..ca9637f9a 100644
--- a/libs/nixio/axTLS/ssl/test/ssltest.c.bak
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/ssltest.c.bak
diff --git a/libs/nixio/axTLS/ssl/test/test_axssl.sh b/libs/luci-lib-nixio/axTLS/ssl/test/test_axssl.sh
index acf11a630..acf11a630 100755
--- a/libs/nixio/axTLS/ssl/test/test_axssl.sh
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/test_axssl.sh
diff --git a/libs/nixio/axTLS/ssl/test/thawte.x509_ca b/libs/luci-lib-nixio/axTLS/ssl/test/thawte.x509_ca
index 59b1059f8..59b1059f8 100644
--- a/libs/nixio/axTLS/ssl/test/thawte.x509_ca
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/thawte.x509_ca
diff --git a/libs/nixio/axTLS/ssl/test/verisign.x509_ca b/libs/luci-lib-nixio/axTLS/ssl/test/verisign.x509_ca
index d2ea1289d..d2ea1289d 100644
--- a/libs/nixio/axTLS/ssl/test/verisign.x509_ca
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/verisign.x509_ca
diff --git a/libs/nixio/axTLS/ssl/test/verisign.x509_ca.pem b/libs/luci-lib-nixio/axTLS/ssl/test/verisign.x509_ca.pem
index d5ef5d241..d5ef5d241 100644
--- a/libs/nixio/axTLS/ssl/test/verisign.x509_ca.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/verisign.x509_ca.pem
diff --git a/libs/nixio/axTLS/ssl/test/verisign.x509_my_cert b/libs/luci-lib-nixio/axTLS/ssl/test/verisign.x509_my_cert
index 426c9ff7f..426c9ff7f 100644
--- a/libs/nixio/axTLS/ssl/test/verisign.x509_my_cert
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/verisign.x509_my_cert
diff --git a/libs/nixio/axTLS/ssl/test/verisign.x509_my_cert.pem b/libs/luci-lib-nixio/axTLS/ssl/test/verisign.x509_my_cert.pem
index 5b6c1ffed..5b6c1ffed 100644
--- a/libs/nixio/axTLS/ssl/test/verisign.x509_my_cert.pem
+++ b/libs/luci-lib-nixio/axTLS/ssl/test/verisign.x509_my_cert.pem
diff --git a/libs/nixio/axTLS/ssl/tls1.c b/libs/luci-lib-nixio/axTLS/ssl/tls1.c
index 658c2c15d..658c2c15d 100755
--- a/libs/nixio/axTLS/ssl/tls1.c
+++ b/libs/luci-lib-nixio/axTLS/ssl/tls1.c
diff --git a/libs/nixio/axTLS/ssl/tls1.h b/libs/luci-lib-nixio/axTLS/ssl/tls1.h
index b64b4fda6..b64b4fda6 100755
--- a/libs/nixio/axTLS/ssl/tls1.h
+++ b/libs/luci-lib-nixio/axTLS/ssl/tls1.h
diff --git a/libs/nixio/axTLS/ssl/tls1_clnt.c b/libs/luci-lib-nixio/axTLS/ssl/tls1_clnt.c
index 91314333c..91314333c 100644
--- a/libs/nixio/axTLS/ssl/tls1_clnt.c
+++ b/libs/luci-lib-nixio/axTLS/ssl/tls1_clnt.c
diff --git a/libs/nixio/axTLS/ssl/tls1_svr.c b/libs/luci-lib-nixio/axTLS/ssl/tls1_svr.c
index 45b9bec6a..45b9bec6a 100644
--- a/libs/nixio/axTLS/ssl/tls1_svr.c
+++ b/libs/luci-lib-nixio/axTLS/ssl/tls1_svr.c
diff --git a/libs/nixio/axTLS/ssl/version.h b/libs/luci-lib-nixio/axTLS/ssl/version.h
index 72260bf19..72260bf19 100644
--- a/libs/nixio/axTLS/ssl/version.h
+++ b/libs/luci-lib-nixio/axTLS/ssl/version.h
diff --git a/libs/nixio/axTLS/ssl/x509.c b/libs/luci-lib-nixio/axTLS/ssl/x509.c
index 37db7f4e8..37db7f4e8 100644
--- a/libs/nixio/axTLS/ssl/x509.c
+++ b/libs/luci-lib-nixio/axTLS/ssl/x509.c
diff --git a/libs/nixio/axTLS/www/bin/.htaccess b/libs/luci-lib-nixio/axTLS/www/bin/.htaccess
index 4496fa9ed..4496fa9ed 100644
--- a/libs/nixio/axTLS/www/bin/.htaccess
+++ b/libs/luci-lib-nixio/axTLS/www/bin/.htaccess
diff --git a/libs/nixio/axTLS/www/favicon.ico b/libs/luci-lib-nixio/axTLS/www/favicon.ico
index 9f6f30e4c..9f6f30e4c 100644
--- a/libs/nixio/axTLS/www/favicon.ico
+++ b/libs/luci-lib-nixio/axTLS/www/favicon.ico
diff --git a/libs/nixio/axTLS/www/index.html b/libs/luci-lib-nixio/axTLS/www/index.html
index 25cd2e69b..25cd2e69b 100755
--- a/libs/nixio/axTLS/www/index.html
+++ b/libs/luci-lib-nixio/axTLS/www/index.html
diff --git a/libs/nixio/axTLS/www/lua/download.lua b/libs/luci-lib-nixio/axTLS/www/lua/download.lua
index 2ee1a71e9..2ee1a71e9 100644
--- a/libs/nixio/axTLS/www/lua/download.lua
+++ b/libs/luci-lib-nixio/axTLS/www/lua/download.lua
diff --git a/libs/nixio/axTLS/www/lua/env.lua b/libs/luci-lib-nixio/axTLS/www/lua/env.lua
index c4298477b..c4298477b 100644
--- a/libs/nixio/axTLS/www/lua/env.lua
+++ b/libs/luci-lib-nixio/axTLS/www/lua/env.lua
diff --git a/libs/nixio/axTLS/www/lua/overview.lp b/libs/luci-lib-nixio/axTLS/www/lua/overview.lp
index 4d17002a0..4d17002a0 100644
--- a/libs/nixio/axTLS/www/lua/overview.lp
+++ b/libs/luci-lib-nixio/axTLS/www/lua/overview.lp
diff --git a/libs/nixio/axTLS/www/lua/prepara_sql2.lua b/libs/luci-lib-nixio/axTLS/www/lua/prepara_sql2.lua
index 6a37c2fef..6a37c2fef 100644
--- a/libs/nixio/axTLS/www/lua/prepara_sql2.lua
+++ b/libs/luci-lib-nixio/axTLS/www/lua/prepara_sql2.lua
diff --git a/libs/nixio/axTLS/www/lua/test_conc.lua b/libs/luci-lib-nixio/axTLS/www/lua/test_conc.lua
index bbb9be784..bbb9be784 100644
--- a/libs/nixio/axTLS/www/lua/test_conc.lua
+++ b/libs/luci-lib-nixio/axTLS/www/lua/test_conc.lua
diff --git a/libs/nixio/axTLS/www/lua/test_cookies.lp b/libs/luci-lib-nixio/axTLS/www/lua/test_cookies.lp
index 932b9c5e9..932b9c5e9 100644
--- a/libs/nixio/axTLS/www/lua/test_cookies.lp
+++ b/libs/luci-lib-nixio/axTLS/www/lua/test_cookies.lp
diff --git a/libs/nixio/axTLS/www/lua/test_cookies.lua b/libs/luci-lib-nixio/axTLS/www/lua/test_cookies.lua
index 6af935e89..6af935e89 100644
--- a/libs/nixio/axTLS/www/lua/test_cookies.lua
+++ b/libs/luci-lib-nixio/axTLS/www/lua/test_cookies.lua
diff --git a/libs/nixio/axTLS/www/lua/test_err.lua b/libs/luci-lib-nixio/axTLS/www/lua/test_err.lua
index 4d6ffc970..4d6ffc970 100644
--- a/libs/nixio/axTLS/www/lua/test_err.lua
+++ b/libs/luci-lib-nixio/axTLS/www/lua/test_err.lua
diff --git a/libs/nixio/axTLS/www/lua/test_fs.lua b/libs/luci-lib-nixio/axTLS/www/lua/test_fs.lua
index 566ed8b20..566ed8b20 100644
--- a/libs/nixio/axTLS/www/lua/test_fs.lua
+++ b/libs/luci-lib-nixio/axTLS/www/lua/test_fs.lua
diff --git a/libs/nixio/axTLS/www/lua/test_htk.lua b/libs/luci-lib-nixio/axTLS/www/lua/test_htk.lua
index ac1de6c31..ac1de6c31 100644
--- a/libs/nixio/axTLS/www/lua/test_htk.lua
+++ b/libs/luci-lib-nixio/axTLS/www/lua/test_htk.lua
diff --git a/libs/nixio/axTLS/www/lua/test_lib.lua b/libs/luci-lib-nixio/axTLS/www/lua/test_lib.lua
index 504125372..504125372 100644
--- a/libs/nixio/axTLS/www/lua/test_lib.lua
+++ b/libs/luci-lib-nixio/axTLS/www/lua/test_lib.lua
diff --git a/libs/nixio/axTLS/www/lua/test_main.html b/libs/luci-lib-nixio/axTLS/www/lua/test_main.html
index a50dd639c..a50dd639c 100644
--- a/libs/nixio/axTLS/www/lua/test_main.html
+++ b/libs/luci-lib-nixio/axTLS/www/lua/test_main.html
diff --git a/libs/nixio/axTLS/www/lua/test_main.lp b/libs/luci-lib-nixio/axTLS/www/lua/test_main.lp
index 917ee1e53..917ee1e53 100644
--- a/libs/nixio/axTLS/www/lua/test_main.lp
+++ b/libs/luci-lib-nixio/axTLS/www/lua/test_main.lp
diff --git a/libs/nixio/axTLS/www/lua/test_main.lua b/libs/luci-lib-nixio/axTLS/www/lua/test_main.lua
index 0e997a2d5..0e997a2d5 100644
--- a/libs/nixio/axTLS/www/lua/test_main.lua
+++ b/libs/luci-lib-nixio/axTLS/www/lua/test_main.lua
diff --git a/libs/nixio/axTLS/www/lua/test_session.lua b/libs/luci-lib-nixio/axTLS/www/lua/test_session.lua
index d97cc4520..d97cc4520 100644
--- a/libs/nixio/axTLS/www/lua/test_session.lua
+++ b/libs/luci-lib-nixio/axTLS/www/lua/test_session.lua
diff --git a/libs/nixio/axTLS/www/lua/test_sql.lua b/libs/luci-lib-nixio/axTLS/www/lua/test_sql.lua
index 085ce978c..085ce978c 100644
--- a/libs/nixio/axTLS/www/lua/test_sql.lua
+++ b/libs/luci-lib-nixio/axTLS/www/lua/test_sql.lua
diff --git a/libs/nixio/axTLS/www/lua/test_sql2.lua b/libs/luci-lib-nixio/axTLS/www/lua/test_sql2.lua
index a2f6ee12d..a2f6ee12d 100644
--- a/libs/nixio/axTLS/www/lua/test_sql2.lua
+++ b/libs/luci-lib-nixio/axTLS/www/lua/test_sql2.lua
diff --git a/libs/nixio/axTLS/www/lua/test_variables.lp b/libs/luci-lib-nixio/axTLS/www/lua/test_variables.lp
index c1ac332f0..c1ac332f0 100644
--- a/libs/nixio/axTLS/www/lua/test_variables.lp
+++ b/libs/luci-lib-nixio/axTLS/www/lua/test_variables.lp
diff --git a/libs/nixio/axTLS/www/test_dir/bin/.htaccess b/libs/luci-lib-nixio/axTLS/www/test_dir/bin/.htaccess
index 8fd8c463a..8fd8c463a 100644
--- a/libs/nixio/axTLS/www/test_dir/bin/.htaccess
+++ b/libs/luci-lib-nixio/axTLS/www/test_dir/bin/.htaccess
diff --git a/libs/nixio/axTLS/www/test_dir/no_http/.htaccess b/libs/luci-lib-nixio/axTLS/www/test_dir/no_http/.htaccess
index 3e20076a2..3e20076a2 100644
--- a/libs/nixio/axTLS/www/test_dir/no_http/.htaccess
+++ b/libs/luci-lib-nixio/axTLS/www/test_dir/no_http/.htaccess
diff --git a/libs/nixio/axTLS/www/test_dir/no_http/.htpasswd b/libs/luci-lib-nixio/axTLS/www/test_dir/no_http/.htpasswd
index 0471b0140..0471b0140 100644
--- a/libs/nixio/axTLS/www/test_dir/no_http/.htpasswd
+++ b/libs/luci-lib-nixio/axTLS/www/test_dir/no_http/.htpasswd
diff --git a/libs/nixio/axTLS/www/test_dir/no_http/index.html b/libs/luci-lib-nixio/axTLS/www/test_dir/no_http/index.html
index 8b86eba8e..8b86eba8e 100644
--- a/libs/nixio/axTLS/www/test_dir/no_http/index.html
+++ b/libs/luci-lib-nixio/axTLS/www/test_dir/no_http/index.html
diff --git a/libs/nixio/axTLS/www/test_dir/no_ssl/.htaccess b/libs/luci-lib-nixio/axTLS/www/test_dir/no_ssl/.htaccess
index d980d265a..d980d265a 100644
--- a/libs/nixio/axTLS/www/test_dir/no_ssl/.htaccess
+++ b/libs/luci-lib-nixio/axTLS/www/test_dir/no_ssl/.htaccess
diff --git a/libs/nixio/axTLS/www/test_dir/no_ssl/index.html b/libs/luci-lib-nixio/axTLS/www/test_dir/no_ssl/index.html
index 8b86eba8e..8b86eba8e 100644
--- a/libs/nixio/axTLS/www/test_dir/no_ssl/index.html
+++ b/libs/luci-lib-nixio/axTLS/www/test_dir/no_ssl/index.html
diff --git a/libs/nixio/axtls-config/.config b/libs/luci-lib-nixio/axtls-config/.config
index 46cd061b4..46cd061b4 100644
--- a/libs/nixio/axtls-config/.config
+++ b/libs/luci-lib-nixio/axtls-config/.config
diff --git a/libs/nixio/axtls-config/config.h b/libs/luci-lib-nixio/axtls-config/config.h
index 0f861f34b..0f861f34b 100644
--- a/libs/nixio/axtls-config/config.h
+++ b/libs/luci-lib-nixio/axtls-config/config.h
diff --git a/libs/nixio/axtls-root/etc/nixio/rsa_main.der b/libs/luci-lib-nixio/axtls-root/etc/nixio/rsa_main.der
index e17fdc0a0..e17fdc0a0 100644
--- a/libs/nixio/axtls-root/etc/nixio/rsa_main.der
+++ b/libs/luci-lib-nixio/axtls-root/etc/nixio/rsa_main.der
diff --git a/libs/nixio/docsrc/CHANGELOG.lua b/libs/luci-lib-nixio/docsrc/CHANGELOG.lua
index fb1cf160b..fb1cf160b 100644
--- a/libs/nixio/docsrc/CHANGELOG.lua
+++ b/libs/luci-lib-nixio/docsrc/CHANGELOG.lua
diff --git a/libs/nixio/docsrc/README.lua b/libs/luci-lib-nixio/docsrc/README.lua
index b957a6990..b957a6990 100644
--- a/libs/nixio/docsrc/README.lua
+++ b/libs/luci-lib-nixio/docsrc/README.lua
diff --git a/libs/nixio/docsrc/nixio.CryptoHash.lua b/libs/luci-lib-nixio/docsrc/nixio.CryptoHash.lua
index a08b48d68..a08b48d68 100644
--- a/libs/nixio/docsrc/nixio.CryptoHash.lua
+++ b/libs/luci-lib-nixio/docsrc/nixio.CryptoHash.lua
diff --git a/libs/nixio/docsrc/nixio.File.lua b/libs/luci-lib-nixio/docsrc/nixio.File.lua
index 368562a2a..368562a2a 100644
--- a/libs/nixio/docsrc/nixio.File.lua
+++ b/libs/luci-lib-nixio/docsrc/nixio.File.lua
diff --git a/libs/nixio/docsrc/nixio.Socket.lua b/libs/luci-lib-nixio/docsrc/nixio.Socket.lua
index 7123393bf..7123393bf 100644
--- a/libs/nixio/docsrc/nixio.Socket.lua
+++ b/libs/luci-lib-nixio/docsrc/nixio.Socket.lua
diff --git a/libs/nixio/docsrc/nixio.TLSContext.lua b/libs/luci-lib-nixio/docsrc/nixio.TLSContext.lua
index 7cc071195..7cc071195 100644
--- a/libs/nixio/docsrc/nixio.TLSContext.lua
+++ b/libs/luci-lib-nixio/docsrc/nixio.TLSContext.lua
diff --git a/libs/nixio/docsrc/nixio.TLSSocket.lua b/libs/luci-lib-nixio/docsrc/nixio.TLSSocket.lua
index b932cde0d..b932cde0d 100644
--- a/libs/nixio/docsrc/nixio.TLSSocket.lua
+++ b/libs/luci-lib-nixio/docsrc/nixio.TLSSocket.lua
diff --git a/libs/nixio/docsrc/nixio.UnifiedIO.lua b/libs/luci-lib-nixio/docsrc/nixio.UnifiedIO.lua
index 6e407ff2c..6e407ff2c 100644
--- a/libs/nixio/docsrc/nixio.UnifiedIO.lua
+++ b/libs/luci-lib-nixio/docsrc/nixio.UnifiedIO.lua
diff --git a/libs/nixio/docsrc/nixio.bin.lua b/libs/luci-lib-nixio/docsrc/nixio.bin.lua
index 13e125d3c..13e125d3c 100644
--- a/libs/nixio/docsrc/nixio.bin.lua
+++ b/libs/luci-lib-nixio/docsrc/nixio.bin.lua
diff --git a/libs/nixio/docsrc/nixio.bit.lua b/libs/luci-lib-nixio/docsrc/nixio.bit.lua
index 6951dd532..6951dd532 100644
--- a/libs/nixio/docsrc/nixio.bit.lua
+++ b/libs/luci-lib-nixio/docsrc/nixio.bit.lua
diff --git a/libs/nixio/docsrc/nixio.crypto.lua b/libs/luci-lib-nixio/docsrc/nixio.crypto.lua
index 158d0fc0b..158d0fc0b 100644
--- a/libs/nixio/docsrc/nixio.crypto.lua
+++ b/libs/luci-lib-nixio/docsrc/nixio.crypto.lua
diff --git a/libs/nixio/docsrc/nixio.fs.lua b/libs/luci-lib-nixio/docsrc/nixio.fs.lua
index 5d08719e9..5d08719e9 100644
--- a/libs/nixio/docsrc/nixio.fs.lua
+++ b/libs/luci-lib-nixio/docsrc/nixio.fs.lua
diff --git a/libs/nixio/docsrc/nixio.lua b/libs/luci-lib-nixio/docsrc/nixio.lua
index 1b434d76d..1b434d76d 100644
--- a/libs/nixio/docsrc/nixio.lua
+++ b/libs/luci-lib-nixio/docsrc/nixio.lua
diff --git a/libs/nixio/nixio-0.3-1.rockspec b/libs/luci-lib-nixio/nixio-0.3-1.rockspec
index 755cf815d..755cf815d 100644
--- a/libs/nixio/nixio-0.3-1.rockspec
+++ b/libs/luci-lib-nixio/nixio-0.3-1.rockspec
diff --git a/libs/nixio/root/lib/upgrade/luci-add-conffiles.sh b/libs/luci-lib-nixio/root/lib/upgrade/luci-add-conffiles.sh
index 77399b987..77399b987 100644
--- a/libs/nixio/root/lib/upgrade/luci-add-conffiles.sh
+++ b/libs/luci-lib-nixio/root/lib/upgrade/luci-add-conffiles.sh
diff --git a/libs/nixio/lua/bit.lua b/libs/luci-lib-nixio/root/usr/lib/lua/bit.lua
index cdfecb1a4..cdfecb1a4 100644
--- a/libs/nixio/lua/bit.lua
+++ b/libs/luci-lib-nixio/root/usr/lib/lua/bit.lua
diff --git a/libs/nixio/lua/nixio/fs.lua b/libs/luci-lib-nixio/root/usr/lib/lua/nixio/fs.lua
index 8883835f3..8883835f3 100644
--- a/libs/nixio/lua/nixio/fs.lua
+++ b/libs/luci-lib-nixio/root/usr/lib/lua/nixio/fs.lua
diff --git a/libs/nixio/lua/nixio/util.lua b/libs/luci-lib-nixio/root/usr/lib/lua/nixio/util.lua
index 63d2f6214..63d2f6214 100644
--- a/libs/nixio/lua/nixio/util.lua
+++ b/libs/luci-lib-nixio/root/usr/lib/lua/nixio/util.lua
diff --git a/libs/nixio/Makefile b/libs/luci-lib-nixio/src/Makefile
index 49ba3ff22..aaa4292bd 100644
--- a/libs/nixio/Makefile
+++ b/libs/luci-lib-nixio/src/Makefile
@@ -1,34 +1,29 @@
-ifneq (,$(wildcard ../../build/config.mk))
-include ../../build/config.mk
-include ../../build/module.mk
-include ../../build/gccconfig.mk
-else
-include standalone.mk
-endif
-
+OS            = $(shell uname)
 AXTLS_VERSION = 1.2.1
 AXTLS_DIR     = axTLS
 AXTLS_FILE    = $(AXTLS_DIR)-$(AXTLS_VERSION).tar.gz
 #NIXIO_TLS    ?= openssl
 NIXIO_SHADOW ?= $(shell echo 'int main(void){ return !getspnam("root"); }' | $(CC) $(CFLAGS) -include shadow.h -xc -o/dev/null - 2>/dev/null && echo yes)
 NIXIO_SO      = nixio.so
-NIXIO_LDFLAGS =
+NIXIO_LDFLAGS = -llua -lm -ldl
+CFLAGS       += -std=gnu99
 
 ifeq (,$(findstring Darwin,$(OS)))
-	NIXIO_LDFLAGS += -lcrypt
+	NIXIO_LDFLAGS += -lcrypt -shared
 else
+        NIXIO_LDFLAGS += -bundle -undefined dynamic_lookup
 	EXTRA_CFLAGS += -D__DARWIN__
 endif
 
-NIXIO_OBJ = src/nixio.o src/socket.o src/sockopt.o src/bind.o src/address.o \
-	    src/protoent.o src/poll.o src/io.o src/file.o src/splice.o src/process.o \
-	    src/syslog.o src/bit.o src/binary.o src/fs.o src/user.o \
-	    $(if $(NIXIO_TLS),src/tls-crypto.o src/tls-context.o src/tls-socket.o,)
+NIXIO_OBJ = nixio.o socket.o sockopt.o bind.o address.o \
+	    protoent.o poll.o io.o file.o splice.o process.o \
+	    syslog.o bit.o binary.o fs.o user.o \
+	    $(if $(NIXIO_TLS),tls-crypto.o tls-context.o tls-socket.o,)
 
 ifeq ($(NIXIO_TLS),axtls)
-	TLS_CFLAGS = -IaxTLS/ssl -IaxTLS/crypto -IaxTLS/config -include src/axtls-compat.h
-	TLS_DEPENDS = src/axtls-compat.o
-	NIXIO_OBJ += src/axtls-compat.o src/libaxtls.a
+	TLS_CFLAGS = -IaxTLS/ssl -IaxTLS/crypto -IaxTLS/config -include axtls-compat.h
+	TLS_DEPENDS = axtls-compat.o
+	NIXIO_OBJ += axtls-compat.o libaxtls.a
 endif
 
 ifeq ($(NIXIO_TLS),openssl)
@@ -37,9 +32,9 @@ endif
 
 ifeq ($(NIXIO_TLS),cyassl)
 	NIXIO_LDFLAGS += -lcyassl
-	TLS_DEPENDS = src/cyassl-compat.o
-	TLS_CFLAGS = -include src/cyassl-compat.h
-	NIXIO_OBJ += src/cyassl-compat.o
+	TLS_DEPENDS = cyassl-compat.o
+	TLS_CFLAGS = -include cyassl-compat.h
+	NIXIO_OBJ += cyassl-compat.o
 endif
 
 ifeq ($(NIXIO_TLS),)
@@ -60,7 +55,7 @@ ifneq (,$(findstring MINGW,$(OS))$(findstring mingw,$(OS))$(findstring Windows,$
 ifneq (,$(NIXIO_CROSS_CC))
 	CC:=$(NIXIO_CROSS_CC)
 endif
-	NIXIO_OBJ += src/mingw-compat.o
+	NIXIO_OBJ += mingw-compat.o
 	NIXIO_LDFLAGS_POST:=-llua -lssl -lcrypto -lws2_32 -lgdi32
 	FPIC:=
 	EXTRA_CFLAGS += -D_WIN32_WINNT=0x0501
@@ -71,28 +66,28 @@ endif
 
 
 %.o: %.c
-	$(COMPILE) $(NIXIO_CFLAGS) $(LUA_CFLAGS) $(FPIC) -c -o $@ $< 
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(NIXIO_CFLAGS) $(LUA_CFLAGS) $(FPIC) -c -o $@ $< 
 
 ifneq ($(NIXIO_TLS),)
-src/tls-crypto.o: $(TLS_DEPENDS) src/tls-crypto.c
-	$(COMPILE) $(NIXIO_CFLAGS) $(LUA_CFLAGS) $(FPIC) $(TLS_CFLAGS) -c -o $@ src/tls-crypto.c
+tls-crypto.o: $(TLS_DEPENDS) tls-crypto.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(NIXIO_CFLAGS) $(LUA_CFLAGS) $(FPIC) $(TLS_CFLAGS) -c -o $@ tls-crypto.c
 
-src/tls-context.o: $(TLS_DEPENDS) src/tls-context.c
-	$(COMPILE) $(NIXIO_CFLAGS) $(LUA_CFLAGS) $(FPIC) $(TLS_CFLAGS) -c -o $@ src/tls-context.c
+tls-context.o: $(TLS_DEPENDS) tls-context.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(NIXIO_CFLAGS) $(LUA_CFLAGS) $(FPIC) $(TLS_CFLAGS) -c -o $@ tls-context.c
 	
-src/tls-socket.o: $(TLS_DEPENDS) src/tls-socket.c
-	$(COMPILE) $(NIXIO_CFLAGS) $(LUA_CFLAGS) $(FPIC) $(TLS_CFLAGS) -c -o $@ src/tls-socket.c
+tls-socket.o: $(TLS_DEPENDS) tls-socket.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(NIXIO_CFLAGS) $(LUA_CFLAGS) $(FPIC) $(TLS_CFLAGS) -c -o $@ tls-socket.c
 	
-src/axtls-compat.o: src/libaxtls.a src/axtls-compat.c
-	$(COMPILE) $(NIXIO_CFLAGS) $(LUA_CFLAGS) $(FPIC) $(TLS_CFLAGS) -c -o $@ src/axtls-compat.c
+axtls-compat.o: libaxtls.a axtls-compat.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(NIXIO_CFLAGS) $(LUA_CFLAGS) $(FPIC) $(TLS_CFLAGS) -c -o $@ axtls-compat.c
 	mkdir -p dist
 	cp -pR axtls-root/* dist/
 endif	
 
 compile: $(NIXIO_OBJ)
-	$(LINK) $(SHLIB_FLAGS) -o src/$(NIXIO_SO) $(NIXIO_OBJ) $(NIXIO_LDFLAGS) $(NIXIO_LDFLAGS_POST)
-	mkdir -p dist$(LUA_LIBRARYDIR)
-	cp src/$(NIXIO_SO) dist$(LUA_LIBRARYDIR)/$(NIXIO_SO)
+	$(CC) $(LDFLAGS) $(SHLIB_FLAGS) -o $(NIXIO_SO) $(NIXIO_OBJ) $(NIXIO_LDFLAGS) $(NIXIO_LDFLAGS_POST)
+	mkdir -p dist/usr/lib/lua
+	cp $(NIXIO_SO) dist/usr/lib/lua/$(NIXIO_SO)
 
 $(AXTLS_DIR)/.prepared:
 	#rm -rf $(AXTLS_DIR)
@@ -100,7 +95,7 @@ $(AXTLS_DIR)/.prepared:
 	cp axtls-config/.config axtls-config/config.h $(AXTLS_DIR)/config
 	touch $@
 
-src/libaxtls.a: $(AXTLS_DIR)/.prepared
+libaxtls.a: $(AXTLS_DIR)/.prepared
 	$(MAKE) -C $(AXTLS_DIR) CC="$(CC)" CFLAGS="$(CFLAGS) $(EXTRA_CFLAGS) $(FPIC) -Wall -pedantic -I../config -I../ssl -I../crypto" LDFLAGS="$(LDFLAGS)" OS="$(OS)" clean all
 	cp -p $(AXTLS_DIR)/_stage/libaxtls.a src
 	# *************************************************************************
@@ -116,10 +111,10 @@ src/libaxtls.a: $(AXTLS_DIR)/.prepared
 	#
 	#**************************************************************************
 
-clean: luaclean
-	rm -f src/*.o src/*.so src/*.a src/*.dll
+clean:
+	rm -f *.o *.so *.a *.dll
 	rm -f $(AXTLS_DIR)/.prepared
 
-install: build
-	cp -pR dist$(LUA_MODULEDIR)/* $(LUA_MODULEDIR)
-	cp -pR dist$(LUA_LIBRARYDIR)/* $(LUA_LIBRARYDIR)
+install: compile
+	mkdir -p $(DESTDIR)
+	cp -pR dist/* $(DESTDIR)/
diff --git a/libs/nixio/src/address.c b/libs/luci-lib-nixio/src/address.c
index 4fd557d6a..4fd557d6a 100644
--- a/libs/nixio/src/address.c
+++ b/libs/luci-lib-nixio/src/address.c
diff --git a/libs/nixio/src/axtls-compat.c b/libs/luci-lib-nixio/src/axtls-compat.c
index 2c5b746c2..2c5b746c2 100644
--- a/libs/nixio/src/axtls-compat.c
+++ b/libs/luci-lib-nixio/src/axtls-compat.c
diff --git a/libs/nixio/src/axtls-compat.h b/libs/luci-lib-nixio/src/axtls-compat.h
index aee24f56c..aee24f56c 100644
--- a/libs/nixio/src/axtls-compat.h
+++ b/libs/luci-lib-nixio/src/axtls-compat.h
diff --git a/libs/nixio/src/binary.c b/libs/luci-lib-nixio/src/binary.c
index 2c4162228..2c4162228 100644
--- a/libs/nixio/src/binary.c
+++ b/libs/luci-lib-nixio/src/binary.c
diff --git a/libs/nixio/src/bind.c b/libs/luci-lib-nixio/src/bind.c
index 68e1df8a8..68e1df8a8 100644
--- a/libs/nixio/src/bind.c
+++ b/libs/luci-lib-nixio/src/bind.c
diff --git a/libs/nixio/src/bit.c b/libs/luci-lib-nixio/src/bit.c
index 1b352c51c..1b352c51c 100644
--- a/libs/nixio/src/bit.c
+++ b/libs/luci-lib-nixio/src/bit.c
diff --git a/libs/nixio/src/cyassl-compat.c b/libs/luci-lib-nixio/src/cyassl-compat.c
index a483119ac..a483119ac 100644
--- a/libs/nixio/src/cyassl-compat.c
+++ b/libs/luci-lib-nixio/src/cyassl-compat.c
diff --git a/libs/nixio/src/cyassl-compat.h b/libs/luci-lib-nixio/src/cyassl-compat.h
index b2cdc9233..b2cdc9233 100644
--- a/libs/nixio/src/cyassl-compat.h
+++ b/libs/luci-lib-nixio/src/cyassl-compat.h
diff --git a/libs/nixio/src/file.c b/libs/luci-lib-nixio/src/file.c
index b86e040e1..b86e040e1 100644
--- a/libs/nixio/src/file.c
+++ b/libs/luci-lib-nixio/src/file.c
diff --git a/libs/nixio/src/fs.c b/libs/luci-lib-nixio/src/fs.c
index 12ca111ac..12ca111ac 100644
--- a/libs/nixio/src/fs.c
+++ b/libs/luci-lib-nixio/src/fs.c
diff --git a/libs/nixio/src/io.c b/libs/luci-lib-nixio/src/io.c
index 12d5c7df4..12d5c7df4 100644
--- a/libs/nixio/src/io.c
+++ b/libs/luci-lib-nixio/src/io.c
diff --git a/libs/nixio/src/mingw-compat.c b/libs/luci-lib-nixio/src/mingw-compat.c
index 02be504a1..02be504a1 100644
--- a/libs/nixio/src/mingw-compat.c
+++ b/libs/luci-lib-nixio/src/mingw-compat.c
diff --git a/libs/nixio/src/mingw-compat.h b/libs/luci-lib-nixio/src/mingw-compat.h
index a26a4beec..a26a4beec 100644
--- a/libs/nixio/src/mingw-compat.h
+++ b/libs/luci-lib-nixio/src/mingw-compat.h
diff --git a/libs/nixio/src/nixio-tls.h b/libs/luci-lib-nixio/src/nixio-tls.h
index 0fac5a980..0fac5a980 100644
--- a/libs/nixio/src/nixio-tls.h
+++ b/libs/luci-lib-nixio/src/nixio-tls.h
diff --git a/libs/nixio/src/nixio.c b/libs/luci-lib-nixio/src/nixio.c
index ae81c6f96..ae81c6f96 100644
--- a/libs/nixio/src/nixio.c
+++ b/libs/luci-lib-nixio/src/nixio.c
diff --git a/libs/nixio/src/nixio.h b/libs/luci-lib-nixio/src/nixio.h
index 8802e9204..8802e9204 100644
--- a/libs/nixio/src/nixio.h
+++ b/libs/luci-lib-nixio/src/nixio.h
diff --git a/libs/nixio/src/poll.c b/libs/luci-lib-nixio/src/poll.c
index 1211bc72a..1211bc72a 100644
--- a/libs/nixio/src/poll.c
+++ b/libs/luci-lib-nixio/src/poll.c
diff --git a/libs/nixio/src/process.c b/libs/luci-lib-nixio/src/process.c
index 5ae9b829e..5ae9b829e 100644
--- a/libs/nixio/src/process.c
+++ b/libs/luci-lib-nixio/src/process.c
diff --git a/libs/nixio/src/protoent.c b/libs/luci-lib-nixio/src/protoent.c
index bda68a584..bda68a584 100644
--- a/libs/nixio/src/protoent.c
+++ b/libs/luci-lib-nixio/src/protoent.c
diff --git a/libs/nixio/src/socket.c b/libs/luci-lib-nixio/src/socket.c
index 17c6afc79..17c6afc79 100644
--- a/libs/nixio/src/socket.c
+++ b/libs/luci-lib-nixio/src/socket.c
diff --git a/libs/nixio/src/sockopt.c b/libs/luci-lib-nixio/src/sockopt.c
index cede884ce..cede884ce 100644
--- a/libs/nixio/src/sockopt.c
+++ b/libs/luci-lib-nixio/src/sockopt.c
diff --git a/libs/nixio/src/splice.c b/libs/luci-lib-nixio/src/splice.c
index db63ea9a8..db63ea9a8 100644
--- a/libs/nixio/src/splice.c
+++ b/libs/luci-lib-nixio/src/splice.c
diff --git a/libs/nixio/src/syslog.c b/libs/luci-lib-nixio/src/syslog.c
index 89f1b1dda..89f1b1dda 100644
--- a/libs/nixio/src/syslog.c
+++ b/libs/luci-lib-nixio/src/syslog.c
diff --git a/libs/nixio/src/tls-context.c b/libs/luci-lib-nixio/src/tls-context.c
index e9a833f59..e9a833f59 100644
--- a/libs/nixio/src/tls-context.c
+++ b/libs/luci-lib-nixio/src/tls-context.c
diff --git a/libs/nixio/src/tls-crypto.c b/libs/luci-lib-nixio/src/tls-crypto.c
index 714ec4e60..714ec4e60 100644
--- a/libs/nixio/src/tls-crypto.c
+++ b/libs/luci-lib-nixio/src/tls-crypto.c
diff --git a/libs/nixio/src/tls-socket.c b/libs/luci-lib-nixio/src/tls-socket.c
index fe4cb6075..fe4cb6075 100644
--- a/libs/nixio/src/tls-socket.c
+++ b/libs/luci-lib-nixio/src/tls-socket.c
diff --git a/libs/nixio/src/user.c b/libs/luci-lib-nixio/src/user.c
index b701bac95..b701bac95 100644
--- a/libs/nixio/src/user.c
+++ b/libs/luci-lib-nixio/src/user.c
diff --git a/libs/nixio/standalone.mk b/libs/luci-lib-nixio/standalone.mk
index 95f6bece4..95f6bece4 100644
--- a/libs/nixio/standalone.mk
+++ b/libs/luci-lib-nixio/standalone.mk
diff --git a/libs/luci-lib-px5g/Makefile b/libs/luci-lib-px5g/Makefile
new file mode 100644
index 000000000..906a1052e
--- /dev/null
+++ b/libs/luci-lib-px5g/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=RSA/X.509 Key Generator (required for LuCId SSL support)
+LUCI_DEPENDS:=+luci-lib-nixio
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/libs/px5g/lua/px5g/util.lua b/libs/luci-lib-px5g/lua/px5g/util.lua
index 0f07c81b8..0f07c81b8 100644
--- a/libs/px5g/lua/px5g/util.lua
+++ b/libs/luci-lib-px5g/lua/px5g/util.lua
diff --git a/libs/px5g/root/usr/sbin/px5g-genkeys b/libs/luci-lib-px5g/root/usr/sbin/px5g-genkeys
index 87a66bfe2..87a66bfe2 100755
--- a/libs/px5g/root/usr/sbin/px5g-genkeys
+++ b/libs/luci-lib-px5g/root/usr/sbin/px5g-genkeys
diff --git a/libs/px5g/src/library/bignum.c b/libs/luci-lib-px5g/src/library/bignum.c
index 8b7c12ff0..8b7c12ff0 100644
--- a/libs/px5g/src/library/bignum.c
+++ b/libs/luci-lib-px5g/src/library/bignum.c
diff --git a/libs/px5g/src/library/havege.c b/libs/luci-lib-px5g/src/library/havege.c
index 266299d3b..266299d3b 100644
--- a/libs/px5g/src/library/havege.c
+++ b/libs/luci-lib-px5g/src/library/havege.c
diff --git a/libs/px5g/src/library/rsa.c b/libs/luci-lib-px5g/src/library/rsa.c
index 131b6c6c9..131b6c6c9 100644
--- a/libs/px5g/src/library/rsa.c
+++ b/libs/luci-lib-px5g/src/library/rsa.c
diff --git a/libs/px5g/src/library/sha1.c b/libs/luci-lib-px5g/src/library/sha1.c
index 54a4416f3..54a4416f3 100644
--- a/libs/px5g/src/library/sha1.c
+++ b/libs/luci-lib-px5g/src/library/sha1.c
diff --git a/libs/px5g/src/library/timing.c b/libs/luci-lib-px5g/src/library/timing.c
index 6b7ab740e..6b7ab740e 100644
--- a/libs/px5g/src/library/timing.c
+++ b/libs/luci-lib-px5g/src/library/timing.c
diff --git a/libs/px5g/src/library/x509write.c b/libs/luci-lib-px5g/src/library/x509write.c
index 173610c1a..173610c1a 100644
--- a/libs/px5g/src/library/x509write.c
+++ b/libs/luci-lib-px5g/src/library/x509write.c
diff --git a/libs/px5g/src/polarssl/bignum.h b/libs/luci-lib-px5g/src/polarssl/bignum.h
index c66730332..c66730332 100644
--- a/libs/px5g/src/polarssl/bignum.h
+++ b/libs/luci-lib-px5g/src/polarssl/bignum.h
diff --git a/libs/px5g/src/polarssl/bn_mul.h b/libs/luci-lib-px5g/src/polarssl/bn_mul.h
index f6d34da58..f6d34da58 100644
--- a/libs/px5g/src/polarssl/bn_mul.h
+++ b/libs/luci-lib-px5g/src/polarssl/bn_mul.h
diff --git a/libs/px5g/src/polarssl/config.h b/libs/luci-lib-px5g/src/polarssl/config.h
index 6463e5219..6463e5219 100644
--- a/libs/px5g/src/polarssl/config.h
+++ b/libs/luci-lib-px5g/src/polarssl/config.h
diff --git a/libs/px5g/src/polarssl/havege.h b/libs/luci-lib-px5g/src/polarssl/havege.h
index c27cecac0..c27cecac0 100644
--- a/libs/px5g/src/polarssl/havege.h
+++ b/libs/luci-lib-px5g/src/polarssl/havege.h
diff --git a/libs/px5g/src/polarssl/rsa.h b/libs/luci-lib-px5g/src/polarssl/rsa.h
index b31dc2f14..b31dc2f14 100644
--- a/libs/px5g/src/polarssl/rsa.h
+++ b/libs/luci-lib-px5g/src/polarssl/rsa.h
diff --git a/libs/px5g/src/polarssl/sha1.h b/libs/luci-lib-px5g/src/polarssl/sha1.h
index 3ca7dc319..3ca7dc319 100644
--- a/libs/px5g/src/polarssl/sha1.h
+++ b/libs/luci-lib-px5g/src/polarssl/sha1.h
diff --git a/libs/px5g/src/polarssl/timing.h b/libs/luci-lib-px5g/src/polarssl/timing.h
index 62d627f61..62d627f61 100644
--- a/libs/px5g/src/polarssl/timing.h
+++ b/libs/luci-lib-px5g/src/polarssl/timing.h
diff --git a/libs/px5g/src/polarssl/x509.h b/libs/luci-lib-px5g/src/polarssl/x509.h
index 908a1dbf5..908a1dbf5 100644
--- a/libs/px5g/src/polarssl/x509.h
+++ b/libs/luci-lib-px5g/src/polarssl/x509.h
diff --git a/libs/px5g/src/px5g.c b/libs/luci-lib-px5g/src/px5g.c
index feecd0127..feecd0127 100644
--- a/libs/px5g/src/px5g.c
+++ b/libs/luci-lib-px5g/src/px5g.c
diff --git a/libs/px5g/src/px5g.h b/libs/luci-lib-px5g/src/px5g.h
index 47542b5c0..47542b5c0 100644
--- a/libs/px5g/src/px5g.h
+++ b/libs/luci-lib-px5g/src/px5g.h
diff --git a/libs/luci-lib-rpcc/Makefile b/libs/luci-lib-rpcc/Makefile
new file mode 100644
index 000000000..e0fea28a5
--- /dev/null
+++ b/libs/luci-lib-rpcc/Makefile
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=LuCI Support for AHCPd
+LUCI_DEPENDS:=@BROKEN
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/libs/rpcc/luasrc/rpcc.lua b/libs/luci-lib-rpcc/luasrc/rpcc.lua
index ef94d3bbd..ef94d3bbd 100644
--- a/libs/rpcc/luasrc/rpcc.lua
+++ b/libs/luci-lib-rpcc/luasrc/rpcc.lua
diff --git a/libs/rpcc/luasrc/rpcc/ruci.lua b/libs/luci-lib-rpcc/luasrc/rpcc/ruci.lua
index 05cb72805..05cb72805 100644
--- a/libs/rpcc/luasrc/rpcc/ruci.lua
+++ b/libs/luci-lib-rpcc/luasrc/rpcc/ruci.lua
diff --git a/libs/px5g/Makefile b/libs/px5g/Makefile
deleted file mode 100644
index 80a650ed0..000000000
--- a/libs/px5g/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
-include ../../build/gccconfig.mk
-
-PX5G_LIB_CFLAGS = -Isrc/ -include src/polarssl/rsa.h \
-	-include src/polarssl/x509.h \
-	$(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $(WFLAGS)
-
-PX5G_OBJ_CFLAGS = -Isrc/ \
-	$(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $(WFLAGS)
-
-PX5G_LIB = src/library/bignum.o src/library/havege.o src/library/rsa.o \
-		src/library/sha1.o src/library/timing.o src/library/x509write.o
-PX5G_OBJ = src/px5g.o
-
-src/library/%.o: src/library/%.c
-	$(CC) $(PX5G_LIB_CFLAGS) $(FPIC) -c -o $@ $<
-
-%.o: %.c
-	$(CC) $(PX5G_OBJ_CFLAGS) $(LUA_CFLAGS) $(FPIC) -c -o $@ $<
-
-compile: $(PX5G_LIB) $(PX5G_OBJ)
-	$(LINK) $(SHLIB_FLAGS) -o src/px5g.so $(PX5G_OBJ) $(PX5G_LIB)
-	mkdir -p dist$(LUA_LIBRARYDIR)
-	cp src/px5g.so dist$(LUA_LIBRARYDIR)/px5g.so
-
-clean: luaclean
-	rm -f $(PX5G_OBJ) $(PX5G_LIB) src/*.o src/*.so src/*.a src/*.dll
diff --git a/libs/rpcc/Makefile b/libs/rpcc/Makefile
deleted file mode 100644
index 81a96f6a8..000000000
--- a/libs/rpcc/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
\ No newline at end of file