Changeset 3961

Timestamp:

12/29/08 15:28:38 (4 years ago)

Author:

Cyrus

Message:

Revert "Use conditional dependencies"
- Build system is b0rken! Unknown recursive dependencies.

Files:

• luci/trunk/contrib/package/luci/Makefile (modified) (19 diffs)

luci/trunk/contrib/package/luci/Makefile

@@ -258 +258 @@
    +luci-theme-fledermaus \
    +luci-i18n-german \
-   +PACKAGE_luci-freifunk-community:olsrd-luci +PACKAGE_luci-freifunk-community:olsrd-luci-mod-dyn-gw \
-   +PACKAGE_luci-freifunk-community:olsrd-luci-mod-txtinfo +PACKAGE_luci-freifunk-community:olsrd-luci-mod-nameservice \
-   +PACKAGE_luci-freifunk-community:kmod-tun +PACKAGE_luci-freifunk-community:ip
+   +olsrd-luci +olsrd-luci-mod-dyn-gw +olsrd-luci-mod-txtinfo +olsrd-luci-mod-nameservice \
+   +kmod-tun +ip
   TITLE:=Freifunk Community Meta-Package
 endef
@@ -350 +349 @@
   $(call Package/luci/fftemplate)
   TITLE:=SIIT IPv4-over-IPv6 configuration wizard
-  DEPENDS:=+luci-admin-core +PACKAGE_luci-app-siitwizard:kmod-siit
+  DEPENDS:=+luci-admin-core +kmod-siit
 endef
 
@@ -371 +370 @@
 define Package/luci-app-olsr
   $(call Package/luci/webtemplate)
-  DEPENDS+=+luci-admin-full +PACKAGE_luci-app-olsr:olsrd-luci +PACkAGE_luci-app-olsr:olsrd-luci-mod-txtinfo
+  DEPENDS+=+luci-admin-full +olsrd-luci +olsrd-luci-mod-txtinfo
   TITLE:=OLSR configuration and status module
 endef
@@ -382 +381 @@
 define Package/luci-app-qos
   $(call Package/luci/webtemplate)
-  DEPENDS+=+luci-admin-core +PACKAGE_luci-app-qos:qos-scripts
+  DEPENDS+=+luci-admin-core +qos-scripts
   TITLE:=Quality of Service configuration module
 endef
@@ -393 +392 @@
 define Package/luci-app-splash
   $(call Package/luci/fftemplate)
-  DEPENDS+=+PACKAGE_luci-app-splash:luasocket
+  DEPENDS+=+luasocket
   TITLE:=Freifunk DHCP-Splash application
 endef
@@ -408 +407 @@
 define Package/luci-app-statistics
   $(call Package/luci/webtemplate)
-  DEPENDS+=+luci-admin-full +PACKAGE_luci-app-statistics:collectd \
-   +PACKAGE_luci-app-statistics:collectd-mod-rrdtool1 +PACKAGE_luci-app-statistics:rrdtool1
+  DEPENDS+=+luci-admin-full +collectd +collectd-mod-rrdtool1 +rrdtool1
   TITLE:=LuCI Statistics Application
 endef
@@ -424 +422 @@
 define Package/luci-app-upnp
   $(call Package/luci/webtemplate)
-  DEPENDS+=+luci-admin-core +PACKAGE_luci-app-upnp:miniupnpd
+  DEPENDS+=+luci-admin-core +miniupnpd
   TITLE:=Universal Plug & Play configuration module
 endef
@@ -435 +433 @@
 define Package/luci-app-ntpc
   $(call Package/luci/webtemplate)
-  DEPENDS+=+luci-admin-core +PACKAGE_luci-app-ntpc:ntpclient
+  DEPENDS+=+luci-admin-core +ntpclient
   TITLE:=NTP time synchronisation client configuration module
 endef
@@ -446 +444 @@
 define Package/luci-app-ddns
   $(call Package/luci/webtemplate)
-  DEPENDS+=+luci-admin-core +PACKAGE_luci-app-ddns:ddns-scripts
+  DEPENDS+=+luci-admin-core +ddns-scripts
   TITLE:=Dynamic DNS configuration module
 endef
@@ -457 +455 @@
 define Package/luci-app-samba
   $(call Package/luci/webtemplate)
-  DEPENDS+=+luci-admin-full +PACKAGE_luci-app-samba:samba3
+  DEPENDS+=+luci-admin-full +samba3
   TITLE:=Network Shares - Samba SMB/CIFS module
 endef
@@ -468 +466 @@
 define Package/luci-app-uvc_streamer
   $(call Package/luci/webtemplate)
-  DEPENDS+=+luci-admin-full +PACKAGE_luci-app-uvc_streamer:uvc-streamer
+  DEPENDS+=+luci-admin-full +uvc-streamer
   TITLE:=Webcam Streaming - UVC-Streamer module
 endef
@@ -479 +477 @@
 define Package/luci-app-mmc_over_gpio
   $(call Package/luci/webtemplate)
-  DEPENDS+=+luci-admin-full +PACKAGE_luci-app-mmc_over_gpio:kmod-mmc-over-gpio
+  DEPENDS+=+luci-admin-full +kmod-mmc-over-gpio
   TITLE:=mmc_over_gpio
 endef
@@ -490 +488 @@
 define Package/luci-app-p910nd
   $(call Package/luci/webtemplate)
-  DEPENDS+=+luci-admin-full +PACKAGE_luci-app-p910nd:p910nd
+  DEPENDS+=+luci-admin-full +p910nd
   TITLE:=p910nd - Printer server module
 endef
@@ -501 +499 @@
 define Package/luci-app-ushare
   $(call Package/luci/webtemplate)
-  DEPENDS+=+luci-admin-full +PACKAGE_luci-app-ushare:ushare
+  DEPENDS+=+luci-admin-full +ushare
   TITLE:=ushare - UPnP A/V & DLNA Media Server
 endef
@@ -511 +509 @@
 define Package/luci-app-hd_idle
   $(call Package/luci/webtemplate)
-  DEPENDS+=+luci-admin-full +PACKAGE_luci-app-hd_idle:hd-idle
+  DEPENDS+=+luci-admin-full +hd-idle
   TITLE:=hd-idle
 endef
@@ -521 +519 @@
 define Package/luci-app-tinyproxy
   $(call Package/luci/webtemplate)
-  DEPENDS+=+luci-admin-full +PACKAGE_luci-app-tinyproxy:tinyproxy
+  DEPENDS+=+luci-admin-full +tinyproxy
   TITLE:=Tinyproxy - HTTP(S)-Proxy
 endef
@@ -552 +550 @@
   $(call Package/luci/webtemplate)
   TITLE:=LuCI Support for Asterisk PBX
-  DEPENDS+=@BROKEN +luci-admin-core +PACKAGE_luci-app-asterisk:asterisk14
+  DEPENDS+=@BROKEN +luci-admin-core +asterisk14
 endef
 
@@ -562 +560 @@
   $(call Package/luci/webtemplate)
   TITLE:=LuCI Support for the Polipo Proxy
-  DEPENDS+=+luci-admin-core +PACKAGE_luci-app-polipo:polipo
+  DEPENDS+=+luci-admin-core +polipo
 endef
 
@@ -572 +570 @@
   $(call Package/luci/webtemplate)
   TITLE:=LuCI Support for OpenVPN
-  DEPENDS+=@BROKEN +luci-admin-core +PACKAGE_luci-app-openvpn:openvpn
+  DEPENDS+=@BROKEN +luci-admin-core +openvpn
 endef