Merge commit 'origin/confgen'

finally autogenerate menu Config.in files and Depends.mk
for packages. thx mirabilos

Conflicts:

	.gitignore
	Makefile
	mk/build.mk
	package/eglibc/Config.in
	package/glibc/Config.in
	package/uclibc++/Config.in
	package/uclibc/Config.in
	rules.mk

2 files changed, 5 insertions, 114 deletions

diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in
deleted file mode 100644
index b56fa8bff..000000000
--- a/package/lighttpd/Config.in
+++ /dev/null
@@ -1,113 +0,0 @@
-config ADK_PACKAGE_LIGHTTPD
-	prompt "lighttpd.......................... Flexible and lightweight web server"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBPCRE
-	select ADK_COMPILE_SQLITE
-	select ADK_PACKAGE_LIBXML2
-	help
-	  A flexible and lightweight web server.
-	  
-	  http://www.lighttpd.net/
-
-config ADK_COMPILE_LIGHTTPD_WITH_OPENSSL
-	bool "Use OpenSSL for https support"
-	default y
-	depends on ADK_PACKAGE_LIGHTTPD
-	select ADK_PACKAGE_LIBOPENSSL
-
-config ADK_PACKAGE_LIGHTTPD_MOD_ACCESSLOG
-	prompt   "lighttpd-mod-accesslog........ Access logging module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIGHTTPD
-
-config ADK_PACKAGE_LIGHTTPD_MOD_ALIAS
-	prompt   "lighttpd-mod-alias............ Directory alias module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIGHTTPD
-
-config ADK_PACKAGE_LIGHTTPD_MOD_AUTH
-	prompt   "lighttpd-mod-auth............. Authentication module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIGHTTPD
-
-config ADK_PACKAGE_LIGHTTPD_MOD_CGI
-	prompt   "lighttpd-mod-cgi.............. CGI module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIGHTTPD
-
-config ADK_PACKAGE_LIGHTTPD_MOD_EVASIVE
-	prompt   "lighttpd-mod-evasive.......... Evasive module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIGHTTPD
-
-config ADK_PACKAGE_LIGHTTPD_MOD_EXPIRE
-	prompt   "lighttpd-mod-expire........... Expire module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIGHTTPD
-
-config ADK_PACKAGE_LIGHTTPD_MOD_FASTCGI
-	prompt   "lighttpd-mod-fastcgi.......... FastCGI module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIGHTTPD
-
-config ADK_PACKAGE_LIGHTTPD_MOD_PROXY
-	prompt   "lighttpd-mod-proxy............ Proxy module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIGHTTPD
-
-config ADK_PACKAGE_LIGHTTPD_MOD_REDIRECT
-	prompt   "lighttpd-mod-redirect......... URL redirection module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIGHTTPD
-
-config ADK_PACKAGE_LIGHTTPD_MOD_REWRITE
-	prompt   "lighttpd-mod-rewrite.......... URL rewriting module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIGHTTPD
-
-config ADK_PACKAGE_LIGHTTPD_MOD_SETENV
-	prompt   "lighttpd-mod-setenv........... Environment variable setting module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIGHTTPD
-
-config ADK_PACKAGE_LIGHTTPD_MOD_SIMPLE_VHOST
-	prompt   "lighttpd-mod-simple-vhost..... Simple virtual hosting module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIGHTTPD
-
-config ADK_PACKAGE_LIGHTTPD_MOD_SSI
-	prompt   "lighttpd-mod-ssi.............. SSI module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIGHTTPD
-
-config ADK_PACKAGE_LIGHTTPD_MOD_STATUS
-	prompt   "lighttpd-mod-status........... Server status display module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIGHTTPD
-
-config ADK_PACKAGE_LIGHTTPD_MOD_USERTRACK
-	prompt   "lighttpd-mod-usertrack........ User tracking module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIGHTTPD
-
-config ADK_PACKAGE_LIGHTTPD_MOD_WEBDAV
-	prompt   "lighttpd-mod-webdav........... webdav module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIGHTTPD
diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile
index b20841a24..3ed986070 100644
--- a/package/lighttpd/Makefile
+++ b/package/lighttpd/Makefile
@@ -6,10 +6,14 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		lighttpd
 PKG_VERSION:=		1.4.25
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		pcre libxml2 sqlite
+ifeq (${ADK_COMPILE_LIGHTTPD_WITH_OPENSSL},y)
+PKG_BUILDDEP+=		openssl
+endif
 PKG_MD5SUM:=		87e936ec272ddaba8a2fdfecd8c6b704
 PKG_DESCR:=		a flexible and lightweight web server
 PKG_SECTION:=		net
-PKG_DEPENDS:=		libxml2 libsqlite libpcre
+PKG_DEPENDS:=		libxml2 libsqlite pcre
 PKG_URL:=		http://www.lighttpd.net
 PKG_SITES:=		http://download.lighttpd.net/lighttpd/releases-1.4.x/