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

3 files changed, 23 insertions, 46 deletions

diff --git a/package/davfs2/Config.in b/package/davfs2/Config.in
deleted file mode 100644
index d1f1c2a6d..000000000
--- a/package/davfs2/Config.in
+++ /dev/null
@@ -1,43 +0,0 @@
-config ADK_PACKAGE_DAVFS2
-	prompt "davfs2............................ WebDAV filesystem"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBICONV
-	select ADK_PACKAGE_NEON
-	help
-	  WebDAV is an extension to HTTP that allows remote collaborative
-	  authoring of Web resources, defined in RFC 2518.
-	  
-	  davfs2 is a Linux file system driver that allows you to mount a
-	  WebDAV server as a local file system, like a disk drive. This
-	  way applications can access resources on a Web server without
-	  knowing anything about HTTP or WebDAV.
-	  
-	  davfs2 runs as a daemon in userspace. It uses the kernel file
-	  system coda or fuse. To connect to the WebDAV
-	  server it makes use of the neon library. Neon supports TLS/SSL
-	  (using OpenSSL or GnuTLS) and access via proxy server.
-	  
-	  davfs2 allows you to e.g.
-	  * use a WebDAV server as workspace for a geographically
-	    distributed work group.
-	  * save documents on a WebDAV server and access and edit them
-	    via internet from wherever you want.
-	  * edit a web site in place, using your preferred development
-	    tools.
-
-choice
-prompt "kernel filesystem interface"
-depends on ADK_PACKAGE_DAVFS2
-
-config ADK_PACKAGE_DAVFS2_FUSE
-	bool "use the FUSE filesystem interface"
-	select ADK_PACKAGE_FUSE_UTILS
-config ADK_PACKAGE_DAVFS2_CODA
-	bool "use the CODA filesystem interface"
-	select ADK_KPACKAGE_KMOD_CODA_FS
-config ADK_PACKAGE_DAVFS2_BOTH
-	bool "use both filesystem interfaces"
-	select ADK_PACKAGE_FUSE_UTILS
-	select ADK_KPACKAGE_KMOD_CODA_FS
-endchoice
diff --git a/package/davfs2/Config.in.kernel b/package/davfs2/Config.in.kernel
new file mode 100644
index 000000000..3ef8e77d7
--- /dev/null
+++ b/package/davfs2/Config.in.kernel
@@ -0,0 +1,16 @@
+choice
+prompt "kernel filesystem interface"
+depends on ADK_PACKAGE_DAVFS2
+
+config ADK_PACKAGE_DAVFS2_FUSE
+       bool "use the FUSE filesystem interface"
+       select ADK_PACKAGE_FUSE_UTILS
+config ADK_PACKAGE_DAVFS2_CODA
+       bool "use the CODA filesystem interface"
+       select ADK_KPACKAGE_KMOD_CODA_FS
+config ADK_PACKAGE_DAVFS2_BOTH
+       bool "use both filesystem interfaces"
+       select ADK_PACKAGE_FUSE_UTILS
+       select ADK_KPACKAGE_KMOD_CODA_FS
+endchoice
+
diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile
index ffd292acd..55bd4eddc 100644
--- a/package/davfs2/Makefile
+++ b/package/davfs2/Makefile
@@ -6,6 +6,10 @@ include ${TOPDIR}/rules.mk
 PKG_NAME=		davfs2
 PKG_VERSION=		1.3.3
 PKG_RELEASE=		1
+PKG_BUILDDEP+=		libiconv neon
+ifneq (${ADK_PACKAGE_DAVFS2_FUSE}${ADK_PACKAGE_DAVFS2_BOTH},)
+PKG_BUILDDEP+=		fuse
+endif
 PKG_MD5SUM=		57def26e4d6d63527e01612d10fd0515
 PKG_DESCR:=		WebDAV filesystem
 PKG_SECTION:=		admin
@@ -15,11 +19,11 @@ PKG_SITES=		${MASTER_SITE_SOURCEFORGE:=dav/}
 include ${TOPDIR}/mk/package.mk
 
 ifeq (${ADK_PACKAGE_DAVFS2_FUSE},y)
-PKG_DEPENDS:=			fuse-utils, kmod-fuse, libfuse, libiconv, neon
+PKG_DEPENDS:=			fuse-utils kmod-fuse libiconv neon
 else ifeq (${ADK_PACKAGE_DAVFS2_CODA},y)
-PKG_DEPENDS:=			kmod-fs-coda, libiconv, neon
+PKG_DEPENDS:=			kmod-fs-coda libiconv neon
 else
-PKG_DEPENDS:=			kmod-fs-coda, fuse-utils, kmod-fuse, libfuse, libiconv, neon
+PKG_DEPENDS:=			kmod-fs-coda fuse-utils kmod-fuse libiconv neon
 endif
 
 $(eval $(call PKG_template,DAVFS2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))