treewide: include freifunk.mk in place of out-of-feed luci.mk

Use the new freifunk.mk file to reach the macros and definitions of the former luci.mk. Signed-off-by: Sven Roederer <freifunk@it-solutions.geroedel.de>
freifunk · Jun 6, 2019 · ac16b4a · ac16b4a
1 parent 3031c3a
commit ac16b4a
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 deletions.
diff --git a/applications/luci-app-freifunk-diagnostics/Makefile b/applications/luci-app-freifunk-diagnostics/Makefile
@@ -9,6 +9,6 @@ include $(TOPDIR)/rules.mk
 LUCI_TITLE:=Tools for network diagnosis like traceroute and ping
 LUCI_DEPENDS:=
 
-include ../../luci.mk
+include ../../freifunk.mk
 
 # call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-app-freifunk-policyrouting/Makefile b/applications/luci-app-freifunk-policyrouting/Makefile
@@ -9,6 +9,6 @@ include $(TOPDIR)/rules.mk
 LUCI_TITLE:=Policy routing for mesh traffic
 LUCI_DEPENDS:=+freifunk-policyrouting
 
-include ../../luci.mk
+include ../../freifunk.mk
 
 # call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-app-freifunk-widgets/Makefile b/applications/luci-app-freifunk-widgets/Makefile
@@ -9,6 +9,6 @@ include $(TOPDIR)/rules.mk
 LUCI_TITLE:=Widgets for the Freifunk index page
 LUCI_DEPENDS:=+luci-mod-freifunk
 
-include ../../luci.mk
+include ../../freifunk.mk
 
 # call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-app-meshwizard/Makefile b/applications/luci-app-meshwizard/Makefile
@@ -9,6 +9,6 @@ include $(TOPDIR)/rules.mk
 LUCI_TITLE:=Shellscript based wizard to setup mesh networks
 LUCI_DEPENDS:=+meshwizard
 
-include ../../luci.mk
+include ../../freifunk.mk
 
 # call BuildPackage - OpenWrt buildroot signature
diff --git a/modules/luci-mod-freifunk-community/Makefile b/modules/luci-mod-freifunk-community/Makefile
@@ -13,7 +13,7 @@ LUCI_DEPENDS:= \
 	+olsrd-mod-watchdog +kmod-tun +ip +freifunk-watchdog +luci-app-olsr \
 	+luci-app-olsr-services +freifunk-gwcheck +freifunk-mapupdate
 
-include ../../luci.mk
+include ../../freifunk.mk
 
 # call BuildPackage - OpenWrt buildroot signature
 
diff --git a/modules/luci-mod-freifunk/Makefile b/modules/luci-mod-freifunk/Makefile
@@ -6,7 +6,9 @@
 
 include $(TOPDIR)/rules.mk
 
-FF_TITLE:=LuCI Freifunk module
-FF_DEPENDS:=+luci-mod-admin-full +luci-lib-json +luci-lib-ipkg +freifunk-firewall +freifunk-common
+LUCI_TITLE:=LuCI Freifunk module
+LUCI_DEPENDS:=+luci-mod-admin-full +luci-lib-json +luci-lib-ipkg +freifunk-firewall +freifunk-common
 
 include ../../freifunk.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/themes/luci-theme-freifunk-generic/Makefile b/themes/luci-theme-freifunk-generic/Makefile
@@ -9,6 +9,6 @@ include $(TOPDIR)/rules.mk
 LUCI_TITLE:=Freifunk Generic Theme
 LUCI_DEPENDS:=
 
-include ../../luci.mk
+include ../../freifunk.mk
 
 # call BuildPackage - OpenWrt buildroot signature