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>

49 files changed, 56 insertions, 8 deletions

diff --git a/themes/bootstrap/Makefile b/themes/bootstrap/Makefile
deleted file mode 100644
index 81a96f6a83..0000000000
--- a/themes/bootstrap/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
\ No newline at end of file
diff --git a/themes/freifunk-bno/Makefile b/themes/freifunk-bno/Makefile
deleted file mode 100644
index 81a96f6a83..0000000000
--- a/themes/freifunk-bno/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
\ No newline at end of file
diff --git a/themes/freifunk-generic/Makefile b/themes/freifunk-generic/Makefile
deleted file mode 100644
index f7fac7740e..0000000000
--- a/themes/freifunk-generic/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
diff --git a/themes/luci-theme-bootstrap/Makefile b/themes/luci-theme-bootstrap/Makefile
new file mode 100644
index 0000000000..c4e684ed18
--- /dev/null
+++ b/themes/luci-theme-bootstrap/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:=Bootstrap Theme (default)
+LUCI_DEPENDS:=
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/themes/bootstrap/htdocs/luci-static/bootstrap/cascade.css b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css
index 9b5ee3a804..9b5ee3a804 100644
--- a/themes/bootstrap/htdocs/luci-static/bootstrap/cascade.css
+++ b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css
diff --git a/themes/bootstrap/htdocs/luci-static/bootstrap/favicon.ico b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/favicon.ico
index 77a138ba0c..77a138ba0c 100644
--- a/themes/bootstrap/htdocs/luci-static/bootstrap/favicon.ico
+++ b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/favicon.ico
diff --git a/themes/bootstrap/htdocs/luci-static/bootstrap/html5.js b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/html5.js
index 1ec510f2a4..1ec510f2a4 100644
--- a/themes/bootstrap/htdocs/luci-static/bootstrap/html5.js
+++ b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/html5.js
diff --git a/themes/bootstrap/htdocs/luci-static/bootstrap/mobile.css b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/mobile.css
index e9d9b61aa2..e9d9b61aa2 100644
--- a/themes/bootstrap/htdocs/luci-static/bootstrap/mobile.css
+++ b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/mobile.css
diff --git a/themes/bootstrap/ipkg/postinst b/themes/luci-theme-bootstrap/ipkg/postinst
index 8a2dd18d26..8a2dd18d26 100755
--- a/themes/bootstrap/ipkg/postinst
+++ b/themes/luci-theme-bootstrap/ipkg/postinst
diff --git a/themes/bootstrap/luasrc/view/themes/bootstrap/footer.htm b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/footer.htm
index 09b497a101..09b497a101 100644
--- a/themes/bootstrap/luasrc/view/themes/bootstrap/footer.htm
+++ b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/footer.htm
diff --git a/themes/bootstrap/luasrc/view/themes/bootstrap/header.htm b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm
index 12818cbc5f..12818cbc5f 100644
--- a/themes/bootstrap/luasrc/view/themes/bootstrap/header.htm
+++ b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm
diff --git a/themes/bootstrap/root/etc/uci-defaults/luci-theme-bootstrap b/themes/luci-theme-bootstrap/root/etc/uci-defaults/luci-theme-bootstrap
index ddefd3b04f..ddefd3b04f 100755
--- a/themes/bootstrap/root/etc/uci-defaults/luci-theme-bootstrap
+++ b/themes/luci-theme-bootstrap/root/etc/uci-defaults/luci-theme-bootstrap
diff --git a/themes/luci-theme-freifunk-bno/Makefile b/themes/luci-theme-freifunk-bno/Makefile
new file mode 100644
index 0000000000..1491a97746
--- /dev/null
+++ b/themes/luci-theme-freifunk-bno/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:=Freifunk Berlin Nordost Theme
+LUCI_DEPENDS:=
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css
index 4f89b2d3af..4f89b2d3af 100644
--- a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css
+++ b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css
diff --git a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/bgoption.png b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/bgoption.png
index 6fd1e2f347..6fd1e2f347 100644
--- a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/bgoption.png
+++ b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/bgoption.png
diff --git a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/favicon.ico b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/favicon.ico
index 7247cfac5f..7247cfac5f 100644
--- a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/favicon.ico
+++ b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/favicon.ico
diff --git a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-back.gif b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-back.gif
index 21fe02b1e9..21fe02b1e9 100644
--- a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-back.gif
+++ b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-back.gif
diff --git a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-left.gif b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-left.gif
index a3258ccb6d..a3258ccb6d 100644
--- a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-left.gif
+++ b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-left.gif
diff --git a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-right.gif b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-right.gif
index 93d0291a21..93d0291a21 100644
--- a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-right.gif
+++ b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-right.gif
diff --git a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/logo.gif b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/logo.gif
index ff00d6ddb8..ff00d6ddb8 100644
--- a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/logo.gif
+++ b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/logo.gif
diff --git a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/main-back.png b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/main-back.png
index 34aca44e01..34aca44e01 100644
--- a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/main-back.png
+++ b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/main-back.png
diff --git a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/schriftzug.gif b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/schriftzug.gif
index 82607d533f..82607d533f 100644
--- a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/images/schriftzug.gif
+++ b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/schriftzug.gif
diff --git a/themes/freifunk-bno/ipkg/postinst b/themes/luci-theme-freifunk-bno/ipkg/postinst
index 5972881a89..5972881a89 100755
--- a/themes/freifunk-bno/ipkg/postinst
+++ b/themes/luci-theme-freifunk-bno/ipkg/postinst
diff --git a/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/footer.htm b/themes/luci-theme-freifunk-bno/luasrc/view/themes/freifunk-bno/footer.htm
index 21d1ca68a3..21d1ca68a3 100644
--- a/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/footer.htm
+++ b/themes/luci-theme-freifunk-bno/luasrc/view/themes/freifunk-bno/footer.htm
diff --git a/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm b/themes/luci-theme-freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm
index 5099d186fe..5099d186fe 100644
--- a/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm
+++ b/themes/luci-theme-freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm
diff --git a/themes/freifunk-bno/root/etc/uci-defaults/luci-theme-freifunk-bno b/themes/luci-theme-freifunk-bno/root/etc/uci-defaults/luci-theme-freifunk-bno
index e5fb8a12dc..e5fb8a12dc 100755
--- a/themes/freifunk-bno/root/etc/uci-defaults/luci-theme-freifunk-bno
+++ b/themes/luci-theme-freifunk-bno/root/etc/uci-defaults/luci-theme-freifunk-bno
diff --git a/themes/luci-theme-freifunk-generic/Makefile b/themes/luci-theme-freifunk-generic/Makefile
new file mode 100644
index 0000000000..2fc62fdbca
--- /dev/null
+++ b/themes/luci-theme-freifunk-generic/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:=Freifunk Generic Theme
+LUCI_DEPENDS:=
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/bg.jpg b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/bg.jpg
index 822527ead8..822527ead8 100644
--- a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/bg.jpg
+++ b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/bg.jpg
diff --git a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css
index ed97427c91..ed97427c91 100644
--- a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css
+++ b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css
diff --git a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/header.jpg b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/header.jpg
index 2fde5a2125..2fde5a2125 100644
--- a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/header.jpg
+++ b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/header.jpg
diff --git a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/ie7.css b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/ie7.css
index 67ed9fb816..67ed9fb816 100644
--- a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/ie7.css
+++ b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/ie7.css
diff --git a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/logo.jpg b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/logo.jpg
index ea06ce77f4..ea06ce77f4 100644
--- a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/logo.jpg
+++ b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/logo.jpg
diff --git a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/mobile.css b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/mobile.css
index 37d77b4f43..37d77b4f43 100644
--- a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/mobile.css
+++ b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/mobile.css
diff --git a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/smallscreen.css b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/smallscreen.css
index 660cd8df4d..660cd8df4d 100644
--- a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/smallscreen.css
+++ b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/smallscreen.css
diff --git a/themes/freifunk-generic/ipkg/postinst b/themes/luci-theme-freifunk-generic/ipkg/postinst
index 76edf36217..76edf36217 100644
--- a/themes/freifunk-generic/ipkg/postinst
+++ b/themes/luci-theme-freifunk-generic/ipkg/postinst
diff --git a/themes/freifunk-generic/luasrc/view/themes/freifunk-generic/footer.htm b/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/footer.htm
index e9df8cda00..e9df8cda00 100644
--- a/themes/freifunk-generic/luasrc/view/themes/freifunk-generic/footer.htm
+++ b/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/footer.htm
diff --git a/themes/freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm b/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm
index e8b1c062d1..e8b1c062d1 100644
--- a/themes/freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm
+++ b/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm
diff --git a/themes/freifunk-generic/root/etc/uci-defaults/luci-theme-freifunk-generic b/themes/luci-theme-freifunk-generic/root/etc/uci-defaults/luci-theme-freifunk-generic
index 131f54e216..131f54e216 100644
--- a/themes/freifunk-generic/root/etc/uci-defaults/luci-theme-freifunk-generic
+++ b/themes/luci-theme-freifunk-generic/root/etc/uci-defaults/luci-theme-freifunk-generic
diff --git a/themes/luci-theme-openwrt/Makefile b/themes/luci-theme-openwrt/Makefile
new file mode 100644
index 0000000000..b873d80727
--- /dev/null
+++ b/themes/luci-theme-openwrt/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 OpenWrt.org theme
+LUCI_DEPENDS:=
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/themes/openwrt/htdocs/luci-static/openwrt.org/cascade.css b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css
index 4a6877fa98..4a6877fa98 100644
--- a/themes/openwrt/htdocs/luci-static/openwrt.org/cascade.css
+++ b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css
diff --git a/themes/openwrt/htdocs/luci-static/openwrt.org/ie6.css b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/ie6.css
index 14db3f86e5..14db3f86e5 100644
--- a/themes/openwrt/htdocs/luci-static/openwrt.org/ie6.css
+++ b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/ie6.css
diff --git a/themes/openwrt/htdocs/luci-static/openwrt.org/ie7.css b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/ie7.css
index 9e569b28bd..9e569b28bd 100644
--- a/themes/openwrt/htdocs/luci-static/openwrt.org/ie7.css
+++ b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/ie7.css
diff --git a/themes/openwrt/htdocs/luci-static/openwrt.org/ie8.css b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/ie8.css
index 890988c417..890988c417 100644
--- a/themes/openwrt/htdocs/luci-static/openwrt.org/ie8.css
+++ b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/ie8.css
diff --git a/themes/openwrt/htdocs/luci-static/openwrt.org/tabbg.png b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/tabbg.png
index c84c437cda..c84c437cda 100644
--- a/themes/openwrt/htdocs/luci-static/openwrt.org/tabbg.png
+++ b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/tabbg.png
diff --git a/themes/openwrt/ipkg/postinst b/themes/luci-theme-openwrt/ipkg/postinst
index 48ea52273f..48ea52273f 100755
--- a/themes/openwrt/ipkg/postinst
+++ b/themes/luci-theme-openwrt/ipkg/postinst
diff --git a/themes/openwrt/luasrc/view/themes/openwrt.org/footer.htm b/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/footer.htm
index 5830cb932b..5830cb932b 100644
--- a/themes/openwrt/luasrc/view/themes/openwrt.org/footer.htm
+++ b/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/footer.htm
diff --git a/themes/openwrt/luasrc/view/themes/openwrt.org/header.htm b/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm
index 5006723e6a..5006723e6a 100644
--- a/themes/openwrt/luasrc/view/themes/openwrt.org/header.htm
+++ b/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm
diff --git a/themes/openwrt/root/etc/uci-defaults/luci-theme-openwrt b/themes/luci-theme-openwrt/root/etc/uci-defaults/luci-theme-openwrt
index d8dea0467e..d8dea0467e 100755
--- a/themes/openwrt/root/etc/uci-defaults/luci-theme-openwrt
+++ b/themes/luci-theme-openwrt/root/etc/uci-defaults/luci-theme-openwrt
diff --git a/themes/openwrt/Makefile b/themes/openwrt/Makefile
deleted file mode 100644
index 81a96f6a83..0000000000
--- a/themes/openwrt/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-include ../../build/config.mk
-include ../../build/module.mk
\ No newline at end of file