Changeset 5287

Show
Ignore:
Timestamp:
08/18/09 09:37:29 (4 years ago)
Author:
cshore
Message:

Make luci-app-diag and friends use conditional dependencies

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • luci/trunk/contrib/package/luci/Makefile

    r5275 r5287  
    533533define Package/luci-app-diag-core 
    534534  $(call Package/luci/webtemplate) 
    535   DEPENDS+=+luci-admin-core  
     535  DEPENDS+=+PACKAGE_luci-app-diag-core:luci-admin-core  
    536536  TITLE:=LuCI Diagnostics Tools (Core) 
    537537endef 
    … …  
    539539define Package/luci-app-diag-devinfo 
    540540  $(call Package/luci/webtemplate) 
    541   DEPENDS+=+luci-app-diag-core +smap +netdiscover +mac-to-devinfo +httping +smap-to-devinfo +netdiscover-to-devinfo 
     541  DEPENDS+=+PACKAGE_luci_app-diag-devinfo:luci-app-diag-core \ 
     542    +PACKAGE_luci-app-diag-devinfo:smap \ 
     543    +PACKAGE_luci-app-diag-devinfo:netdiscover \ 
     544    +PACKAGE_luci-app-diag-devinfo:mac-to-devinfo \ 
     545    +PACKAGE_luci-app-diag-devinfo:httping \ 
     546    +PACKAGE_luci-app-diag-devinfo:smap-to-devinfo \ 
     547    +PACAKGE_luci-app-diag-devinfo:netdiscover-to-devinfo 
    542548  TITLE:=LuCI Diagnostics Tools (Device Info) 
    543549endef 
    … …  
    545551define Package/luci-app-voice-core 
    546552  $(call Package/luci/webtemplate) 
    547   DEPENDS+=+luci-admin-core  
     553  DEPENDS+=+PACKAGE_luci-app-voice-core:luci-admin-core  
    548554  TITLE:=LuCI Voice Software (Core) 
    549555endef 
    … …  
    551557define Package/luci-app-voice-diag 
    552558  $(call Package/luci/webtemplate) 
    553   DEPENDS+=+luci-app-voice-core +luci-app-diag-devinfo 
     559  DEPENDS+=+PACKAGE_luci-app-voice-diag:luci-app-voice-core \ 
     560    +PACKAGE_luci-apps-voice-diag:luci-app-diag-devinfo 
    554561  TITLE:=LuCI Voice Software (Diagnostics) 
    555562endef