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>

31 files changed, 70 insertions, 10 deletions

diff --git a/protocols/3g/Makefile b/protocols/3g/Makefile
deleted file mode 100644
index f7fac7740..000000000
--- a/protocols/3g/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/protocols/ipv6/Makefile b/protocols/ipv6/Makefile
deleted file mode 100644
index f7fac7740..000000000
--- a/protocols/ipv6/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/protocols/luci-proto-3g/Makefile b/protocols/luci-proto-3g/Makefile
new file mode 100644
index 000000000..d1d5455dc
--- /dev/null
+++ b/protocols/luci-proto-3g/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:=Support for 3G
+LUCI_DEPENDS:=+comgt
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/protocols/3g/luasrc/model/cbi/admin_network/proto_3g.lua b/protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua
index 9c1a76282..9c1a76282 100644
--- a/protocols/3g/luasrc/model/cbi/admin_network/proto_3g.lua
+++ b/protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua
diff --git a/protocols/luci-proto-ipv6/Makefile b/protocols/luci-proto-ipv6/Makefile
new file mode 100644
index 000000000..f0ca605f8
--- /dev/null
+++ b/protocols/luci-proto-ipv6/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:=Support for DHCPv6/6in4/6to4/6rd/DS-Lite
+LUCI_DEPENDS:=
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua
index 9b668cdda..9b668cdda 100644
--- a/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua
diff --git a/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua
index 3835561dd..3835561dd 100644
--- a/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua
diff --git a/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua
index c0cb95b2b..c0cb95b2b 100644
--- a/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua
diff --git a/protocols/ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua
index 51f17878d..51f17878d 100644
--- a/protocols/ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua
diff --git a/protocols/ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua
index 2d9e258c3..2d9e258c3 100644
--- a/protocols/ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dslite.lua
diff --git a/protocols/ipv6/luasrc/model/cbi/admin_network/proto_hnet.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_hnet.lua
index 0cf8c0101..0cf8c0101 100644
--- a/protocols/ipv6/luasrc/model/cbi/admin_network/proto_hnet.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_hnet.lua
diff --git a/protocols/ipv6/luasrc/model/network/proto_4x6.lua b/protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua
index 91adfa944..91adfa944 100644
--- a/protocols/ipv6/luasrc/model/network/proto_4x6.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua
diff --git a/protocols/ipv6/luasrc/model/network/proto_6x4.lua b/protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua
index b800b0b54..b800b0b54 100644
--- a/protocols/ipv6/luasrc/model/network/proto_6x4.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua
diff --git a/protocols/ipv6/luasrc/model/network/proto_dhcpv6.lua b/protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua
index 59463d18a..59463d18a 100644
--- a/protocols/ipv6/luasrc/model/network/proto_dhcpv6.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua
diff --git a/protocols/ipv6/luasrc/model/network/proto_hnet.lua b/protocols/luci-proto-ipv6/luasrc/model/network/proto_hnet.lua
index d3e094f20..d3e094f20 100644
--- a/protocols/ipv6/luasrc/model/network/proto_hnet.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/network/proto_hnet.lua
diff --git a/protocols/luci-proto-openconnect/Makefile b/protocols/luci-proto-openconnect/Makefile
new file mode 100644
index 000000000..31f52749b
--- /dev/null
+++ b/protocols/luci-proto-openconnect/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:=Support for OpenConnect VPN
+LUCI_DEPENDS:=+openconnect
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/protocols/openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua b/protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua
index 2e2eacee0..2e2eacee0 100644
--- a/protocols/openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua
+++ b/protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua
diff --git a/protocols/openconnect/luasrc/model/network/proto_openconnect.lua b/protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua
index 26744cde8..26744cde8 100644
--- a/protocols/openconnect/luasrc/model/network/proto_openconnect.lua
+++ b/protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua
diff --git a/protocols/luci-proto-ppp/Makefile b/protocols/luci-proto-ppp/Makefile
new file mode 100644
index 000000000..70db744ea
--- /dev/null
+++ b/protocols/luci-proto-ppp/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:=Support for PPP/PPPoE/PPPoA/PPtP
+LUCI_DEPENDS:=
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/protocols/ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua
index c1dd56e12..c1dd56e12 100644
--- a/protocols/ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua
+++ b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua
diff --git a/protocols/ppp/luasrc/model/cbi/admin_network/proto_ppp.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua
index 659e733a7..659e733a7 100644
--- a/protocols/ppp/luasrc/model/cbi/admin_network/proto_ppp.lua
+++ b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua
diff --git a/protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua
index c32e2828d..c32e2828d 100644
--- a/protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua
+++ b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua
diff --git a/protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua
index ec258a528..ec258a528 100644
--- a/protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua
+++ b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua
diff --git a/protocols/ppp/luasrc/model/cbi/admin_network/proto_pptp.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua
index ea9858e7d..ea9858e7d 100644
--- a/protocols/ppp/luasrc/model/cbi/admin_network/proto_pptp.lua
+++ b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua
diff --git a/protocols/ppp/luasrc/model/network/proto_ppp.lua b/protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua
index dfd545f35..dfd545f35 100644
--- a/protocols/ppp/luasrc/model/network/proto_ppp.lua
+++ b/protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua
diff --git a/protocols/luci-proto-relay/Makefile b/protocols/luci-proto-relay/Makefile
new file mode 100644
index 000000000..d9c04f76a
--- /dev/null
+++ b/protocols/luci-proto-relay/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:=Support for relayd pseudo bridges
+LUCI_DEPENDS:=+relayd
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/protocols/relay/luasrc/model/cbi/admin_network/proto_relay.lua b/protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua
index 017bb9bfa..017bb9bfa 100644
--- a/protocols/relay/luasrc/model/cbi/admin_network/proto_relay.lua
+++ b/protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua
diff --git a/protocols/relay/luasrc/model/network/proto_relay.lua b/protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua
index 42bd1f846..42bd1f846 100644
--- a/protocols/relay/luasrc/model/network/proto_relay.lua
+++ b/protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua
diff --git a/protocols/openconnect/Makefile b/protocols/openconnect/Makefile
deleted file mode 100644
index f7fac7740..000000000
--- a/protocols/openconnect/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/protocols/ppp/Makefile b/protocols/ppp/Makefile
deleted file mode 100644
index f7fac7740..000000000
--- a/protocols/ppp/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/protocols/relay/Makefile b/protocols/relay/Makefile
deleted file mode 100644
index f7fac7740..000000000
--- a/protocols/relay/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk