From 4fb6eaab433af80eed39f774090603a94838d77f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 18 Oct 2022 23:54:32 +0800
Subject: [PATCH] update 2022-10-18 23:54:32

---
 luci-app-vssr/Makefile | 62 ++++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 33 deletions(-)

diff --git a/luci-app-vssr/Makefile b/luci-app-vssr/Makefile
index 3f05eeeb8..208661a28 100644
--- a/luci-app-vssr/Makefile
+++ b/luci-app-vssr/Makefile
@@ -11,47 +11,43 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Xray_plugin \
 	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Server \
 	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Hysteria
-
+	
 LUCI_TITLE:=A New SS/SSR/Xray/Trojan LuCI interface
 LUCI_PKGARCH:=all
 LUCI_DEPENDS:=+ipset +ip-full +iptables-mod-tproxy +dnsmasq-full +coreutils +coreutils-base64 +bash +pdnsd-alt +wget-ssl +lua +luasocket +lua-maxminddb +lua-cjson \
-	+shadowsocks-libev-ss-local +shadowsocks-libev-ss-redir +shadowsocksr-libev-ssr-local +shadowsocksr-libev-ssr-redir +shadowsocksr-libev-ssr-check +simple-obfs
+	+shadowsocks-libev-ss-local +shadowsocks-libev-ss-redir +shadowsocksr-libev-ssr-local +shadowsocksr-libev-ssr-redir +shadowsocksr-libev-ssr-check +simple-obfs \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_Xray:xray-core \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_Trojan:trojan \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_Trojan:ipt2socks \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun:kcptun-client \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_Xray_plugin:xray-plugin \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Server:shadowsocksr-libev-ssr-server \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_Hysteria:hysteria
 
 define Package/$(PKG_NAME)/config
-	if PACKAGE_$(PKG_NAME)
-		menu "VSSR Configuration"
-			config PACKAGE_$(PKG_NAME)_INCLUDE_Xray
-				bool "Include Xray"
-				select PACKAGE_xray-core
-				default y if i386||x86_64||arm||aarch64
+config PACKAGE_$(PKG_NAME)_INCLUDE_Xray
+	bool "Include Xray"
+	default y if i386||x86_64||arm||aarch64
 
-			config PACKAGE_$(PKG_NAME)_INCLUDE_Trojan
-				bool "Include Trojan"
-				select PACKAGE_ipt2socks
-				select PACKAGE_trojan
-				default y if i386||x86_64||arm||aarch64
+config PACKAGE_$(PKG_NAME)_INCLUDE_Trojan
+	bool "Include Trojan"
+	default y if i386||x86_64||arm||aarch64
+	
+config PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun
+	bool "Include Kcptun"
+	default n
 
-			config PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun
-				bool "Include Kcptun"
-				select PACKAGE_kcptun-client
-				default n
+config PACKAGE_$(PKG_NAME)_INCLUDE_Xray_plugin
+	bool "Include Shadowsocks Xray Plugin"
+	default y if i386||x86_64||arm||aarch64
+	
+config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Server
+	bool "Include ShadowsocksR Libev Server"
+	default y if i386||x86_64||arm||aarch64
 
-			config PACKAGE_$(PKG_NAME)_INCLUDE_Xray_plugin
-				bool "Include Shadowsocks Xray Plugin"
-				select PACKAGE_xray-plugin
-				default y if i386||x86_64||arm||aarch64
-
-			config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Server
-				bool "Include ShadowsocksR Libev Server"
-				select PACKAGE_shadowsocksr-libev-ssr-server
-				default y if i386||x86_64||arm||aarch64
-
-			config PACKAGE_$(PKG_NAME)_INCLUDE_Hysteria
-				bool "Include Hysteria"
-				select PACKAGE_hysteria
-				default y if i386||x86_64||arm||aarch64
-		endmenu
-	endif
+config PACKAGE_$(PKG_NAME)_INCLUDE_Hysteria
+	bool "Include Hysteria"
+	default y if i386||x86_64||arm||aarch64
 endef
 
 define Package/$(PKG_NAME)/conffiles