reorganize/rationalize/format package menuconfig,

make updatedd modular

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2333 3c298f89-4303-0410-b956-a3cf2f4a3e73

2 files changed, 38 insertions, 39 deletions

diff --git a/openwrt/package/lua/Config.in b/openwrt/package/lua/Config.in
index 22989ac584..d62e9931d3 100644
--- a/openwrt/package/lua/Config.in
+++ b/openwrt/package/lua/Config.in
@@ -1,15 +1,14 @@
-menu "lua - LUA programming language"
+menu "lua............................... LUA programming language"
 
-config BR2_PACKAGE_LUA
+config BR2_COMPILE_LUA
 	bool
-	default n
+	default y
 	depends BR2_PACKAGE_LUA_INTERPRETER || BR2_PACKAGE_LUA_COMPILER || BR2_PACKAGE_LIBLUA
 
-config BR2_PACKAGE_LUA_INTERPRETER
-	tristate "lua - LUA programming language interpreter"
-	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_LUA
-	select BR2_PACKAGE_LIBLUA
+config BR2_PACKAGE_LIBLUA
+	prompt "liblua............................ LUA programming language shared libraries"
+	tristate
+	select BR2_COMPILE_LUA
 	help
 	  Lua is a powerful light-weight programming language designed for extending 
 	  applications. Lua is also frequently used as a general-purpose, stand-alone 
@@ -29,13 +28,13 @@ config BR2_PACKAGE_LUA_INTERPRETER
 	  
 	  http://www.lua.org/
 	  
-	  This package contains the LUA language interpreter.
-	  
+	  This package contains the LUA shared libraries, needed by other programs.
 
-config BR2_PACKAGE_LUA_COMPILER
-	tristate "luac - LUA programming language compiler"
+config BR2_PACKAGE_LUA_INTERPRETER
+	prompt "lua............................... LUA programming language interpreter"
+	tristate
 	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_LUA
+	select BR2_COMPILE_LUA
 	select BR2_PACKAGE_LIBLUA
 	help
 	  Lua is a powerful light-weight programming language designed for extending 
@@ -56,14 +55,14 @@ config BR2_PACKAGE_LUA_COMPILER
 	  
 	  http://www.lua.org/
 	  
-	  This package contains the LUA language compiler.
-	  
+	  This package contains the LUA language interpreter.
 
-config BR2_PACKAGE_LUA_EXAMPLES
-	tristate "lua-examples - LUA programming language examples"
+config BR2_PACKAGE_LUA_COMPILER
+	prompt "luac.............................. LUA programming language compiler"
+	tristate
 	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_LUA
-	select BR2_PACKAGE_LUA_INTERPRETER
+	select BR2_COMPILE_LUA
+	select BR2_PACKAGE_LIBLUA
 	help
 	  Lua is a powerful light-weight programming language designed for extending 
 	  applications. Lua is also frequently used as a general-purpose, stand-alone 
@@ -83,13 +82,14 @@ config BR2_PACKAGE_LUA_EXAMPLES
 	  
 	  http://www.lua.org/
 	  
-	  This package contains LUA language examples.
-	  
+	  This package contains the LUA language compiler.
 
-config BR2_PACKAGE_LIBLUA
-	tristate "liblua - LUA programming language shared libraries"
+config BR2_PACKAGE_LUA_EXAMPLES
+	prompt "lua-examples...................... LUA programming language examples"
+	tristate
 	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_LUA
+	select BR2_COMPILE_LUA
+	select BR2_PACKAGE_LUA_INTERPRETER
 	help
 	  Lua is a powerful light-weight programming language designed for extending 
 	  applications. Lua is also frequently used as a general-purpose, stand-alone 
@@ -109,7 +109,6 @@ config BR2_PACKAGE_LIBLUA
 	  
 	  http://www.lua.org/
 	  
-	  This package contains the LUA shared libraries, needed by other programs.
-	  
+	  This package contains LUA language examples.
 
 endmenu
diff --git a/openwrt/package/lua/Makefile b/openwrt/package/lua/Makefile
index 4b062de335..4896006f97 100644
--- a/openwrt/package/lua/Makefile
+++ b/openwrt/package/lua/Makefile
@@ -20,8 +20,8 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,LIBLUA,liblua,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,LUA_INTERPRETER,lua,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,LUA_COMPILER,luac,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,LUA,lua,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,LUAC,luac,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,LUA_EXAMPLES,lua-examples,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 $(PKG_BUILD_DIR)/.configured:
@@ -61,17 +61,17 @@ $(IPKG_LIBLUA):
 	$(RSTRIP) $(IDIR_LIBLUA)
 	$(IPKG_BUILD) $(IDIR_LIBLUA) $(PACKAGE_DIR)
 
-$(IPKG_LUA_INTERPRETER):
-	install -d -m0755 $(IDIR_LUA_INTERPRETER)/usr/bin
-	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/lua $(IDIR_LUA_INTERPRETER)/usr/bin/
-	$(RSTRIP) $(IDIR_LUA_INTERPRETER)
-	$(IPKG_BUILD) $(IDIR_LUA_INTERPRETER) $(PACKAGE_DIR)
-
-$(IPKG_LUA_COMPILER):
-	install -d -m0755 $(IDIR_LUA_COMPILER)/usr/bin
-	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/luac $(IDIR_LUA_COMPILER)/usr/bin/
-	$(RSTRIP) $(IDIR_LUA_COMPILER)
-	$(IPKG_BUILD) $(IDIR_LUA_COMPILER) $(PACKAGE_DIR)
+$(IPKG_LUA):
+	install -d -m0755 $(IDIR_LUA)/usr/bin
+	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/lua $(IDIR_LUA)/usr/bin/
+	$(RSTRIP) $(IDIR_LUA)
+	$(IPKG_BUILD) $(IDIR_LUA) $(PACKAGE_DIR)
+
+$(IPKG_LUAC):
+	install -d -m0755 $(IDIR_LUAC)/usr/bin
+	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/luac $(IDIR_LUAC)/usr/bin/
+	$(RSTRIP) $(IDIR_LUAC)
+	$(IPKG_BUILD) $(IDIR_LUAC) $(PACKAGE_DIR)
 
 $(IPKG_LUA_EXAMPLES):
 	install -d -m0755 $(IDIR_LUA_EXAMPLES)/usr/share/lua/examples