From 52f6bed7d0b2f66c5d0483251eeb89009bfa0c99 Mon Sep 17 00:00:00 2001
From: Slava Zanko <slavazanko@gmail.com>
Date: Thu, 7 Jan 2010 00:45:27 +0200
Subject: [PATCH] Moved dir $(srcdir)/vfs into $(srcdir)/lib/vfs/mc-vfs

Also, initial support of library directory.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
---
 Makefile.am                                   |  2 +-
 autogen.sh                                    |  8 +--
 configure.ac                                  | 60 ++++++++++---------
 lib/Makefile.am                               | 17 ++++++
 lib/vfs/Makefile.am                           |  1 +
 {vfs => lib/vfs/mc-vfs}/.gitignore            |  0
 {vfs => lib/vfs/mc-vfs}/COPYING.LGPL          |  0
 {vfs => lib/vfs/mc-vfs}/HACKING               |  0
 {vfs => lib/vfs/mc-vfs}/Makefile.am           |  0
 {vfs => lib/vfs/mc-vfs}/README                |  0
 {vfs => lib/vfs/mc-vfs}/README.fish           |  0
 {vfs => lib/vfs/mc-vfs}/cpio.c                |  0
 {vfs => lib/vfs/mc-vfs}/direntry.c            |  0
 {vfs => lib/vfs/mc-vfs}/extfs.c               |  0
 {vfs => lib/vfs/mc-vfs}/extfs/.gitignore      |  0
 {vfs => lib/vfs/mc-vfs}/extfs/Makefile.am     |  0
 {vfs => lib/vfs/mc-vfs}/extfs/README          |  0
 {vfs => lib/vfs/mc-vfs}/extfs/README.it       |  0
 {vfs => lib/vfs/mc-vfs}/extfs/README.uzip     |  0
 {vfs => lib/vfs/mc-vfs}/extfs/a.in            |  0
 {vfs => lib/vfs/mc-vfs}/extfs/apt.in          |  0
 {vfs => lib/vfs/mc-vfs}/extfs/audio.in        |  0
 {vfs => lib/vfs/mc-vfs}/extfs/bpp             |  0
 {vfs => lib/vfs/mc-vfs}/extfs/deb.in          |  0
 {vfs => lib/vfs/mc-vfs}/extfs/deba.in         |  0
 {vfs => lib/vfs/mc-vfs}/extfs/debd.in         |  0
 {vfs => lib/vfs/mc-vfs}/extfs/dpkg.in         |  0
 {vfs => lib/vfs/mc-vfs}/extfs/extfs.ini       |  0
 {vfs => lib/vfs/mc-vfs}/extfs/hp48.in         |  0
 {vfs => lib/vfs/mc-vfs}/extfs/iso9660.in      |  0
 {vfs => lib/vfs/mc-vfs}/extfs/lslR.in         |  0
 {vfs => lib/vfs/mc-vfs}/extfs/mailfs.in       |  0
 {vfs => lib/vfs/mc-vfs}/extfs/patchfs.in      |  0
 {vfs => lib/vfs/mc-vfs}/extfs/rpm             |  0
 {vfs => lib/vfs/mc-vfs}/extfs/rpms.in         |  0
 {vfs => lib/vfs/mc-vfs}/extfs/s3.in           |  0
 {vfs => lib/vfs/mc-vfs}/extfs/sfs.ini         |  0
 {vfs => lib/vfs/mc-vfs}/extfs/trpm            |  0
 {vfs => lib/vfs/mc-vfs}/extfs/u7z             |  0
 {vfs => lib/vfs/mc-vfs}/extfs/uace.in         |  0
 {vfs => lib/vfs/mc-vfs}/extfs/ualz.in         |  0
 {vfs => lib/vfs/mc-vfs}/extfs/uar.in          |  0
 {vfs => lib/vfs/mc-vfs}/extfs/uarc.in         |  0
 {vfs => lib/vfs/mc-vfs}/extfs/uarj.in         |  0
 {vfs => lib/vfs/mc-vfs}/extfs/uc1541.in       |  0
 {vfs => lib/vfs/mc-vfs}/extfs/ucab            |  0
 {vfs => lib/vfs/mc-vfs}/extfs/uha.in          |  0
 {vfs => lib/vfs/mc-vfs}/extfs/ulha.in         |  0
 {vfs => lib/vfs/mc-vfs}/extfs/urar.in         |  0
 {vfs => lib/vfs/mc-vfs}/extfs/uzip.in         |  0
 {vfs => lib/vfs/mc-vfs}/extfs/uzoo.in         |  0
 {vfs => lib/vfs/mc-vfs}/fish.c                |  0
 {vfs => lib/vfs/mc-vfs}/fish.h                |  0
 {vfs => lib/vfs/mc-vfs}/ftpfs.c               |  0
 {vfs => lib/vfs/mc-vfs}/ftpfs.h               |  0
 {vfs => lib/vfs/mc-vfs}/gc.c                  |  0
 {vfs => lib/vfs/mc-vfs}/gc.h                  |  0
 {vfs => lib/vfs/mc-vfs}/local.c               |  0
 {vfs => lib/vfs/mc-vfs}/local.h               |  0
 {vfs => lib/vfs/mc-vfs}/mcfs.c                |  0
 {vfs => lib/vfs/mc-vfs}/mcfs.h                |  0
 {vfs => lib/vfs/mc-vfs}/mcfsutil.c            |  0
 {vfs => lib/vfs/mc-vfs}/mcfsutil.h            |  0
 {vfs => lib/vfs/mc-vfs}/mcserv.c              |  0
 {vfs => lib/vfs/mc-vfs}/netutil.c             |  0
 {vfs => lib/vfs/mc-vfs}/netutil.h             |  0
 {vfs => lib/vfs/mc-vfs}/samba/Makefile.in     |  0
 {vfs => lib/vfs/mc-vfs}/samba/aclocal.m4      |  0
 {vfs => lib/vfs/mc-vfs}/samba/configure.ac    |  0
 .../vfs/mc-vfs}/samba/include/byteorder.h     |  0
 .../vfs/mc-vfs}/samba/include/charset.h       |  0
 .../vfs/mc-vfs}/samba/include/client.h        |  0
 .../vfs/mc-vfs}/samba/include/includes.h      |  0
 {vfs => lib/vfs/mc-vfs}/samba/include/kanji.h |  0
 {vfs => lib/vfs/mc-vfs}/samba/include/local.h |  0
 .../vfs/mc-vfs}/samba/include/nameserv.h      |  0
 {vfs => lib/vfs/mc-vfs}/samba/include/nterr.h |  0
 {vfs => lib/vfs/mc-vfs}/samba/include/proto.h |  0
 {vfs => lib/vfs/mc-vfs}/samba/include/smb.h   |  0
 .../vfs/mc-vfs}/samba/include/trans2.h        |  0
 .../vfs/mc-vfs}/samba/include/version.h       |  0
 {vfs => lib/vfs/mc-vfs}/samba/internals.doc   |  0
 {vfs => lib/vfs/mc-vfs}/samba/lib/charcnv.c   |  0
 {vfs => lib/vfs/mc-vfs}/samba/lib/charset.c   |  0
 {vfs => lib/vfs/mc-vfs}/samba/lib/debug.c     |  0
 {vfs => lib/vfs/mc-vfs}/samba/lib/interface.c |  0
 {vfs => lib/vfs/mc-vfs}/samba/lib/kanji.c     |  0
 {vfs => lib/vfs/mc-vfs}/samba/lib/md4.c       |  0
 {vfs => lib/vfs/mc-vfs}/samba/lib/netmask.c   |  0
 {vfs => lib/vfs/mc-vfs}/samba/lib/slprintf.c  |  0
 {vfs => lib/vfs/mc-vfs}/samba/lib/system.c    |  0
 {vfs => lib/vfs/mc-vfs}/samba/lib/time.c      |  0
 {vfs => lib/vfs/mc-vfs}/samba/lib/username.c  |  0
 {vfs => lib/vfs/mc-vfs}/samba/lib/util.c      |  0
 {vfs => lib/vfs/mc-vfs}/samba/lib/util_file.c |  0
 {vfs => lib/vfs/mc-vfs}/samba/lib/util_sock.c |  0
 {vfs => lib/vfs/mc-vfs}/samba/lib/util_str.c  |  0
 .../vfs/mc-vfs}/samba/libsmb/clientgen.c      |  0
 .../vfs/mc-vfs}/samba/libsmb/namequery.c      |  0
 {vfs => lib/vfs/mc-vfs}/samba/libsmb/nmblib.c |  0
 {vfs => lib/vfs/mc-vfs}/samba/libsmb/nterr.c  |  0
 .../vfs/mc-vfs}/samba/libsmb/pwd_cache.c      |  0
 {vfs => lib/vfs/mc-vfs}/samba/libsmb/smbdes.c |  0
 .../vfs/mc-vfs}/samba/libsmb/smbencrypt.c     |  0
 {vfs => lib/vfs/mc-vfs}/samba/libsmb/smberr.c |  0
 .../vfs/mc-vfs}/samba/param/loadparm.c        |  0
 {vfs => lib/vfs/mc-vfs}/samba/param/params.c  |  0
 {vfs => lib/vfs/mc-vfs}/samba/parsing.doc     |  0
 {vfs => lib/vfs/mc-vfs}/sfs.c                 |  0
 {vfs => lib/vfs/mc-vfs}/smbfs.c               |  0
 {vfs => lib/vfs/mc-vfs}/smbfs.h               |  0
 {vfs => lib/vfs/mc-vfs}/tar.c                 |  0
 {vfs => lib/vfs/mc-vfs}/undelfs.c             |  0
 {vfs => lib/vfs/mc-vfs}/utilvfs.c             |  0
 {vfs => lib/vfs/mc-vfs}/utilvfs.h             |  0
 {vfs => lib/vfs/mc-vfs}/vfs-impl.h            |  0
 {vfs => lib/vfs/mc-vfs}/vfs.c                 |  0
 {vfs => lib/vfs/mc-vfs}/vfs.h                 |  0
 {vfs => lib/vfs/mc-vfs}/xdirentry.h           |  0
 src/Makefile.am                               | 11 +---
 120 files changed, 56 insertions(+), 43 deletions(-)
 create mode 100644 lib/Makefile.am
 create mode 100644 lib/vfs/Makefile.am
 rename {vfs => lib/vfs/mc-vfs}/.gitignore (100%)
 rename {vfs => lib/vfs/mc-vfs}/COPYING.LGPL (100%)
 rename {vfs => lib/vfs/mc-vfs}/HACKING (100%)
 rename {vfs => lib/vfs/mc-vfs}/Makefile.am (100%)
 rename {vfs => lib/vfs/mc-vfs}/README (100%)
 rename {vfs => lib/vfs/mc-vfs}/README.fish (100%)
 rename {vfs => lib/vfs/mc-vfs}/cpio.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/direntry.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/.gitignore (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/Makefile.am (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/README (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/README.it (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/README.uzip (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/a.in (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/apt.in (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/audio.in (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/bpp (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/deb.in (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/deba.in (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/debd.in (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/dpkg.in (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/extfs.ini (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/hp48.in (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/iso9660.in (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/lslR.in (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/mailfs.in (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/patchfs.in (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/rpm (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/rpms.in (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/s3.in (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/sfs.ini (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/trpm (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/u7z (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/uace.in (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/ualz.in (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/uar.in (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/uarc.in (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/uarj.in (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/uc1541.in (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/ucab (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/uha.in (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/ulha.in (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/urar.in (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/uzip.in (100%)
 rename {vfs => lib/vfs/mc-vfs}/extfs/uzoo.in (100%)
 rename {vfs => lib/vfs/mc-vfs}/fish.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/fish.h (100%)
 rename {vfs => lib/vfs/mc-vfs}/ftpfs.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/ftpfs.h (100%)
 rename {vfs => lib/vfs/mc-vfs}/gc.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/gc.h (100%)
 rename {vfs => lib/vfs/mc-vfs}/local.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/local.h (100%)
 rename {vfs => lib/vfs/mc-vfs}/mcfs.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/mcfs.h (100%)
 rename {vfs => lib/vfs/mc-vfs}/mcfsutil.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/mcfsutil.h (100%)
 rename {vfs => lib/vfs/mc-vfs}/mcserv.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/netutil.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/netutil.h (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/Makefile.in (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/aclocal.m4 (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/configure.ac (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/include/byteorder.h (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/include/charset.h (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/include/client.h (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/include/includes.h (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/include/kanji.h (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/include/local.h (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/include/nameserv.h (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/include/nterr.h (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/include/proto.h (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/include/smb.h (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/include/trans2.h (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/include/version.h (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/internals.doc (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/lib/charcnv.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/lib/charset.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/lib/debug.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/lib/interface.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/lib/kanji.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/lib/md4.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/lib/netmask.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/lib/slprintf.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/lib/system.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/lib/time.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/lib/username.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/lib/util.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/lib/util_file.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/lib/util_sock.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/lib/util_str.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/libsmb/clientgen.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/libsmb/namequery.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/libsmb/nmblib.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/libsmb/nterr.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/libsmb/pwd_cache.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/libsmb/smbdes.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/libsmb/smbencrypt.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/libsmb/smberr.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/param/loadparm.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/param/params.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/samba/parsing.doc (100%)
 rename {vfs => lib/vfs/mc-vfs}/sfs.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/smbfs.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/smbfs.h (100%)
 rename {vfs => lib/vfs/mc-vfs}/tar.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/undelfs.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/utilvfs.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/utilvfs.h (100%)
 rename {vfs => lib/vfs/mc-vfs}/vfs-impl.h (100%)
 rename {vfs => lib/vfs/mc-vfs}/vfs.c (100%)
 rename {vfs => lib/vfs/mc-vfs}/vfs.h (100%)
 rename {vfs => lib/vfs/mc-vfs}/xdirentry.h (100%)

diff --git a/Makefile.am b/Makefile.am
index e72bf429b..90e5b779d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to create Makefile.in.
 AUTOMAKE_OPTIONS = 1.5
 
-SUBDIRS = intl po vfs src doc syntax contrib misc
+SUBDIRS = intl po lib src doc syntax contrib misc
 
 EXTRA_DIST = 
 
diff --git a/autogen.sh b/autogen.sh
index c93fc2ff4..cc4a88437 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -29,7 +29,7 @@ fi
 cd "$srcdir"
 
 # The autoconf cache (version after 2.52) is not reliable yet.
-rm -rf autom4te.cache vfs/samba/autom4te.cache
+rm -rf autom4te.cache lib/vfs/mc-vfs/samba/autom4te.cache
 
 if test ! -d config; then
   mkdir config
@@ -72,16 +72,16 @@ $AUTOMAKE -a
 test -f Makefile.in || \
   { echo "automake failed to generate Makefile.in" >&2; exit 1; }
 
-cd vfs/samba
+cd lib/vfs/mc-vfs/samba
 date -u >include/stamp-h.in
 
 $AUTOHEADER
 test -f include/config.h.in || \
-  { echo "autoheader failed to generate vfs/samba/include/config.h.in" >&2; exit 1; }
+  { echo "autoheader failed to generate lib/vfs/mc-vfs/samba/include/config.h.in" >&2; exit 1; }
 
 $AUTOCONF
 test -f configure || \
-  { echo "autoconf failed to generate vfs/samba/configure" >&2; exit 1; }
+  { echo "autoconf failed to generate lib/vfs/mc-vfs/samba/configure" >&2; exit 1; }
 ) || exit 1
 
 $srcdir/maint/version.sh "$srcdir"
diff --git a/configure.ac b/configure.ac
index 8f66c08da..5eb555a59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -545,7 +545,7 @@ dnl Libraries used only when building the mc binary
 AC_SUBST(MCLIBS)
 
 if test -n "$use_smbfs"; then
-  AC_CONFIG_SUBDIRS([vfs/samba])
+  AC_CONFIG_SUBDIRS([src/vfs/mc-vfs/samba])
 fi
 
 AM_CONDITIONAL(USE_MAINTAINER_MODE, [test x"$USE_MAINTAINER_MODE" = xyes])
@@ -583,35 +583,37 @@ src/skin/Makefile
 src/tty/Makefile
 src/viewer/Makefile
 
-syntax/Makefile
+lib/Makefile
+lib/vfs/Makefile
+lib/vfs/mc-vfs/Makefile
+lib/vfs/mc-vfs/extfs/Makefile
+lib/vfs/mc-vfs/extfs/a
+lib/vfs/mc-vfs/extfs/apt
+lib/vfs/mc-vfs/extfs/audio
+lib/vfs/mc-vfs/extfs/deb
+lib/vfs/mc-vfs/extfs/deba
+lib/vfs/mc-vfs/extfs/debd
+lib/vfs/mc-vfs/extfs/dpkg
+lib/vfs/mc-vfs/extfs/iso9660
+lib/vfs/mc-vfs/extfs/hp48
+lib/vfs/mc-vfs/extfs/lslR
+lib/vfs/mc-vfs/extfs/mailfs
+lib/vfs/mc-vfs/extfs/patchfs
+lib/vfs/mc-vfs/extfs/rpms
+lib/vfs/mc-vfs/extfs/s3
+lib/vfs/mc-vfs/extfs/uace
+lib/vfs/mc-vfs/extfs/ualz
+lib/vfs/mc-vfs/extfs/uar
+lib/vfs/mc-vfs/extfs/uarc
+lib/vfs/mc-vfs/extfs/uarj
+lib/vfs/mc-vfs/extfs/uc1541
+lib/vfs/mc-vfs/extfs/uha
+lib/vfs/mc-vfs/extfs/ulha
+lib/vfs/mc-vfs/extfs/urar
+lib/vfs/mc-vfs/extfs/uzip
+lib/vfs/mc-vfs/extfs/uzoo
 
-vfs/Makefile
-vfs/extfs/Makefile
-vfs/extfs/a
-vfs/extfs/apt
-vfs/extfs/audio
-vfs/extfs/deb
-vfs/extfs/deba
-vfs/extfs/debd
-vfs/extfs/dpkg
-vfs/extfs/iso9660
-vfs/extfs/hp48
-vfs/extfs/lslR
-vfs/extfs/mailfs
-vfs/extfs/patchfs
-vfs/extfs/rpms
-vfs/extfs/s3
-vfs/extfs/uace
-vfs/extfs/ualz
-vfs/extfs/uar
-vfs/extfs/uarc
-vfs/extfs/uarj
-vfs/extfs/uc1541
-vfs/extfs/uha
-vfs/extfs/ulha
-vfs/extfs/urar
-vfs/extfs/uzip
-vfs/extfs/uzoo
+syntax/Makefile
 
 doc/Makefile
 doc/hints/Makefile
diff --git a/lib/Makefile.am b/lib/Makefile.am
new file mode 100644
index 000000000..da138e02d
--- /dev/null
+++ b/lib/Makefile.am
@@ -0,0 +1,17 @@
+SUBDIRS = vfs
+
+noinst_LTLIBRARIES = libmc.la
+
+libmc_la_SOURCES =
+
+libmc_la_CFLAGS=
+
+libmc_la_LIBADD =
+
+if ENABLE_VFS
+libmc_la_LIBADD += vfs/mc-vfs/libvfs-mc.a
+if USE_SAMBA_FS
+libmc_la_LIBADD += vfs/mc-vfs/samba/libsamba.a
+endif
+endif
+
diff --git a/lib/vfs/Makefile.am b/lib/vfs/Makefile.am
new file mode 100644
index 000000000..95587f654
--- /dev/null
+++ b/lib/vfs/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = mc-vfs
diff --git a/vfs/.gitignore b/lib/vfs/mc-vfs/.gitignore
similarity index 100%
rename from vfs/.gitignore
rename to lib/vfs/mc-vfs/.gitignore
diff --git a/vfs/COPYING.LGPL b/lib/vfs/mc-vfs/COPYING.LGPL
similarity index 100%
rename from vfs/COPYING.LGPL
rename to lib/vfs/mc-vfs/COPYING.LGPL
diff --git a/vfs/HACKING b/lib/vfs/mc-vfs/HACKING
similarity index 100%
rename from vfs/HACKING
rename to lib/vfs/mc-vfs/HACKING
diff --git a/vfs/Makefile.am b/lib/vfs/mc-vfs/Makefile.am
similarity index 100%
rename from vfs/Makefile.am
rename to lib/vfs/mc-vfs/Makefile.am
diff --git a/vfs/README b/lib/vfs/mc-vfs/README
similarity index 100%
rename from vfs/README
rename to lib/vfs/mc-vfs/README
diff --git a/vfs/README.fish b/lib/vfs/mc-vfs/README.fish
similarity index 100%
rename from vfs/README.fish
rename to lib/vfs/mc-vfs/README.fish
diff --git a/vfs/cpio.c b/lib/vfs/mc-vfs/cpio.c
similarity index 100%
rename from vfs/cpio.c
rename to lib/vfs/mc-vfs/cpio.c
diff --git a/vfs/direntry.c b/lib/vfs/mc-vfs/direntry.c
similarity index 100%
rename from vfs/direntry.c
rename to lib/vfs/mc-vfs/direntry.c
diff --git a/vfs/extfs.c b/lib/vfs/mc-vfs/extfs.c
similarity index 100%
rename from vfs/extfs.c
rename to lib/vfs/mc-vfs/extfs.c
diff --git a/vfs/extfs/.gitignore b/lib/vfs/mc-vfs/extfs/.gitignore
similarity index 100%
rename from vfs/extfs/.gitignore
rename to lib/vfs/mc-vfs/extfs/.gitignore
diff --git a/vfs/extfs/Makefile.am b/lib/vfs/mc-vfs/extfs/Makefile.am
similarity index 100%
rename from vfs/extfs/Makefile.am
rename to lib/vfs/mc-vfs/extfs/Makefile.am
diff --git a/vfs/extfs/README b/lib/vfs/mc-vfs/extfs/README
similarity index 100%
rename from vfs/extfs/README
rename to lib/vfs/mc-vfs/extfs/README
diff --git a/vfs/extfs/README.it b/lib/vfs/mc-vfs/extfs/README.it
similarity index 100%
rename from vfs/extfs/README.it
rename to lib/vfs/mc-vfs/extfs/README.it
diff --git a/vfs/extfs/README.uzip b/lib/vfs/mc-vfs/extfs/README.uzip
similarity index 100%
rename from vfs/extfs/README.uzip
rename to lib/vfs/mc-vfs/extfs/README.uzip
diff --git a/vfs/extfs/a.in b/lib/vfs/mc-vfs/extfs/a.in
similarity index 100%
rename from vfs/extfs/a.in
rename to lib/vfs/mc-vfs/extfs/a.in
diff --git a/vfs/extfs/apt.in b/lib/vfs/mc-vfs/extfs/apt.in
similarity index 100%
rename from vfs/extfs/apt.in
rename to lib/vfs/mc-vfs/extfs/apt.in
diff --git a/vfs/extfs/audio.in b/lib/vfs/mc-vfs/extfs/audio.in
similarity index 100%
rename from vfs/extfs/audio.in
rename to lib/vfs/mc-vfs/extfs/audio.in
diff --git a/vfs/extfs/bpp b/lib/vfs/mc-vfs/extfs/bpp
similarity index 100%
rename from vfs/extfs/bpp
rename to lib/vfs/mc-vfs/extfs/bpp
diff --git a/vfs/extfs/deb.in b/lib/vfs/mc-vfs/extfs/deb.in
similarity index 100%
rename from vfs/extfs/deb.in
rename to lib/vfs/mc-vfs/extfs/deb.in
diff --git a/vfs/extfs/deba.in b/lib/vfs/mc-vfs/extfs/deba.in
similarity index 100%
rename from vfs/extfs/deba.in
rename to lib/vfs/mc-vfs/extfs/deba.in
diff --git a/vfs/extfs/debd.in b/lib/vfs/mc-vfs/extfs/debd.in
similarity index 100%
rename from vfs/extfs/debd.in
rename to lib/vfs/mc-vfs/extfs/debd.in
diff --git a/vfs/extfs/dpkg.in b/lib/vfs/mc-vfs/extfs/dpkg.in
similarity index 100%
rename from vfs/extfs/dpkg.in
rename to lib/vfs/mc-vfs/extfs/dpkg.in
diff --git a/vfs/extfs/extfs.ini b/lib/vfs/mc-vfs/extfs/extfs.ini
similarity index 100%
rename from vfs/extfs/extfs.ini
rename to lib/vfs/mc-vfs/extfs/extfs.ini
diff --git a/vfs/extfs/hp48.in b/lib/vfs/mc-vfs/extfs/hp48.in
similarity index 100%
rename from vfs/extfs/hp48.in
rename to lib/vfs/mc-vfs/extfs/hp48.in
diff --git a/vfs/extfs/iso9660.in b/lib/vfs/mc-vfs/extfs/iso9660.in
similarity index 100%
rename from vfs/extfs/iso9660.in
rename to lib/vfs/mc-vfs/extfs/iso9660.in
diff --git a/vfs/extfs/lslR.in b/lib/vfs/mc-vfs/extfs/lslR.in
similarity index 100%
rename from vfs/extfs/lslR.in
rename to lib/vfs/mc-vfs/extfs/lslR.in
diff --git a/vfs/extfs/mailfs.in b/lib/vfs/mc-vfs/extfs/mailfs.in
similarity index 100%
rename from vfs/extfs/mailfs.in
rename to lib/vfs/mc-vfs/extfs/mailfs.in
diff --git a/vfs/extfs/patchfs.in b/lib/vfs/mc-vfs/extfs/patchfs.in
similarity index 100%
rename from vfs/extfs/patchfs.in
rename to lib/vfs/mc-vfs/extfs/patchfs.in
diff --git a/vfs/extfs/rpm b/lib/vfs/mc-vfs/extfs/rpm
similarity index 100%
rename from vfs/extfs/rpm
rename to lib/vfs/mc-vfs/extfs/rpm
diff --git a/vfs/extfs/rpms.in b/lib/vfs/mc-vfs/extfs/rpms.in
similarity index 100%
rename from vfs/extfs/rpms.in
rename to lib/vfs/mc-vfs/extfs/rpms.in
diff --git a/vfs/extfs/s3.in b/lib/vfs/mc-vfs/extfs/s3.in
similarity index 100%
rename from vfs/extfs/s3.in
rename to lib/vfs/mc-vfs/extfs/s3.in
diff --git a/vfs/extfs/sfs.ini b/lib/vfs/mc-vfs/extfs/sfs.ini
similarity index 100%
rename from vfs/extfs/sfs.ini
rename to lib/vfs/mc-vfs/extfs/sfs.ini
diff --git a/vfs/extfs/trpm b/lib/vfs/mc-vfs/extfs/trpm
similarity index 100%
rename from vfs/extfs/trpm
rename to lib/vfs/mc-vfs/extfs/trpm
diff --git a/vfs/extfs/u7z b/lib/vfs/mc-vfs/extfs/u7z
similarity index 100%
rename from vfs/extfs/u7z
rename to lib/vfs/mc-vfs/extfs/u7z
diff --git a/vfs/extfs/uace.in b/lib/vfs/mc-vfs/extfs/uace.in
similarity index 100%
rename from vfs/extfs/uace.in
rename to lib/vfs/mc-vfs/extfs/uace.in
diff --git a/vfs/extfs/ualz.in b/lib/vfs/mc-vfs/extfs/ualz.in
similarity index 100%
rename from vfs/extfs/ualz.in
rename to lib/vfs/mc-vfs/extfs/ualz.in
diff --git a/vfs/extfs/uar.in b/lib/vfs/mc-vfs/extfs/uar.in
similarity index 100%
rename from vfs/extfs/uar.in
rename to lib/vfs/mc-vfs/extfs/uar.in
diff --git a/vfs/extfs/uarc.in b/lib/vfs/mc-vfs/extfs/uarc.in
similarity index 100%
rename from vfs/extfs/uarc.in
rename to lib/vfs/mc-vfs/extfs/uarc.in
diff --git a/vfs/extfs/uarj.in b/lib/vfs/mc-vfs/extfs/uarj.in
similarity index 100%
rename from vfs/extfs/uarj.in
rename to lib/vfs/mc-vfs/extfs/uarj.in
diff --git a/vfs/extfs/uc1541.in b/lib/vfs/mc-vfs/extfs/uc1541.in
similarity index 100%
rename from vfs/extfs/uc1541.in
rename to lib/vfs/mc-vfs/extfs/uc1541.in
diff --git a/vfs/extfs/ucab b/lib/vfs/mc-vfs/extfs/ucab
similarity index 100%
rename from vfs/extfs/ucab
rename to lib/vfs/mc-vfs/extfs/ucab
diff --git a/vfs/extfs/uha.in b/lib/vfs/mc-vfs/extfs/uha.in
similarity index 100%
rename from vfs/extfs/uha.in
rename to lib/vfs/mc-vfs/extfs/uha.in
diff --git a/vfs/extfs/ulha.in b/lib/vfs/mc-vfs/extfs/ulha.in
similarity index 100%
rename from vfs/extfs/ulha.in
rename to lib/vfs/mc-vfs/extfs/ulha.in
diff --git a/vfs/extfs/urar.in b/lib/vfs/mc-vfs/extfs/urar.in
similarity index 100%
rename from vfs/extfs/urar.in
rename to lib/vfs/mc-vfs/extfs/urar.in
diff --git a/vfs/extfs/uzip.in b/lib/vfs/mc-vfs/extfs/uzip.in
similarity index 100%
rename from vfs/extfs/uzip.in
rename to lib/vfs/mc-vfs/extfs/uzip.in
diff --git a/vfs/extfs/uzoo.in b/lib/vfs/mc-vfs/extfs/uzoo.in
similarity index 100%
rename from vfs/extfs/uzoo.in
rename to lib/vfs/mc-vfs/extfs/uzoo.in
diff --git a/vfs/fish.c b/lib/vfs/mc-vfs/fish.c
similarity index 100%
rename from vfs/fish.c
rename to lib/vfs/mc-vfs/fish.c
diff --git a/vfs/fish.h b/lib/vfs/mc-vfs/fish.h
similarity index 100%
rename from vfs/fish.h
rename to lib/vfs/mc-vfs/fish.h
diff --git a/vfs/ftpfs.c b/lib/vfs/mc-vfs/ftpfs.c
similarity index 100%
rename from vfs/ftpfs.c
rename to lib/vfs/mc-vfs/ftpfs.c
diff --git a/vfs/ftpfs.h b/lib/vfs/mc-vfs/ftpfs.h
similarity index 100%
rename from vfs/ftpfs.h
rename to lib/vfs/mc-vfs/ftpfs.h
diff --git a/vfs/gc.c b/lib/vfs/mc-vfs/gc.c
similarity index 100%
rename from vfs/gc.c
rename to lib/vfs/mc-vfs/gc.c
diff --git a/vfs/gc.h b/lib/vfs/mc-vfs/gc.h
similarity index 100%
rename from vfs/gc.h
rename to lib/vfs/mc-vfs/gc.h
diff --git a/vfs/local.c b/lib/vfs/mc-vfs/local.c
similarity index 100%
rename from vfs/local.c
rename to lib/vfs/mc-vfs/local.c
diff --git a/vfs/local.h b/lib/vfs/mc-vfs/local.h
similarity index 100%
rename from vfs/local.h
rename to lib/vfs/mc-vfs/local.h
diff --git a/vfs/mcfs.c b/lib/vfs/mc-vfs/mcfs.c
similarity index 100%
rename from vfs/mcfs.c
rename to lib/vfs/mc-vfs/mcfs.c
diff --git a/vfs/mcfs.h b/lib/vfs/mc-vfs/mcfs.h
similarity index 100%
rename from vfs/mcfs.h
rename to lib/vfs/mc-vfs/mcfs.h
diff --git a/vfs/mcfsutil.c b/lib/vfs/mc-vfs/mcfsutil.c
similarity index 100%
rename from vfs/mcfsutil.c
rename to lib/vfs/mc-vfs/mcfsutil.c
diff --git a/vfs/mcfsutil.h b/lib/vfs/mc-vfs/mcfsutil.h
similarity index 100%
rename from vfs/mcfsutil.h
rename to lib/vfs/mc-vfs/mcfsutil.h
diff --git a/vfs/mcserv.c b/lib/vfs/mc-vfs/mcserv.c
similarity index 100%
rename from vfs/mcserv.c
rename to lib/vfs/mc-vfs/mcserv.c
diff --git a/vfs/netutil.c b/lib/vfs/mc-vfs/netutil.c
similarity index 100%
rename from vfs/netutil.c
rename to lib/vfs/mc-vfs/netutil.c
diff --git a/vfs/netutil.h b/lib/vfs/mc-vfs/netutil.h
similarity index 100%
rename from vfs/netutil.h
rename to lib/vfs/mc-vfs/netutil.h
diff --git a/vfs/samba/Makefile.in b/lib/vfs/mc-vfs/samba/Makefile.in
similarity index 100%
rename from vfs/samba/Makefile.in
rename to lib/vfs/mc-vfs/samba/Makefile.in
diff --git a/vfs/samba/aclocal.m4 b/lib/vfs/mc-vfs/samba/aclocal.m4
similarity index 100%
rename from vfs/samba/aclocal.m4
rename to lib/vfs/mc-vfs/samba/aclocal.m4
diff --git a/vfs/samba/configure.ac b/lib/vfs/mc-vfs/samba/configure.ac
similarity index 100%
rename from vfs/samba/configure.ac
rename to lib/vfs/mc-vfs/samba/configure.ac
diff --git a/vfs/samba/include/byteorder.h b/lib/vfs/mc-vfs/samba/include/byteorder.h
similarity index 100%
rename from vfs/samba/include/byteorder.h
rename to lib/vfs/mc-vfs/samba/include/byteorder.h
diff --git a/vfs/samba/include/charset.h b/lib/vfs/mc-vfs/samba/include/charset.h
similarity index 100%
rename from vfs/samba/include/charset.h
rename to lib/vfs/mc-vfs/samba/include/charset.h
diff --git a/vfs/samba/include/client.h b/lib/vfs/mc-vfs/samba/include/client.h
similarity index 100%
rename from vfs/samba/include/client.h
rename to lib/vfs/mc-vfs/samba/include/client.h
diff --git a/vfs/samba/include/includes.h b/lib/vfs/mc-vfs/samba/include/includes.h
similarity index 100%
rename from vfs/samba/include/includes.h
rename to lib/vfs/mc-vfs/samba/include/includes.h
diff --git a/vfs/samba/include/kanji.h b/lib/vfs/mc-vfs/samba/include/kanji.h
similarity index 100%
rename from vfs/samba/include/kanji.h
rename to lib/vfs/mc-vfs/samba/include/kanji.h
diff --git a/vfs/samba/include/local.h b/lib/vfs/mc-vfs/samba/include/local.h
similarity index 100%
rename from vfs/samba/include/local.h
rename to lib/vfs/mc-vfs/samba/include/local.h
diff --git a/vfs/samba/include/nameserv.h b/lib/vfs/mc-vfs/samba/include/nameserv.h
similarity index 100%
rename from vfs/samba/include/nameserv.h
rename to lib/vfs/mc-vfs/samba/include/nameserv.h
diff --git a/vfs/samba/include/nterr.h b/lib/vfs/mc-vfs/samba/include/nterr.h
similarity index 100%
rename from vfs/samba/include/nterr.h
rename to lib/vfs/mc-vfs/samba/include/nterr.h
diff --git a/vfs/samba/include/proto.h b/lib/vfs/mc-vfs/samba/include/proto.h
similarity index 100%
rename from vfs/samba/include/proto.h
rename to lib/vfs/mc-vfs/samba/include/proto.h
diff --git a/vfs/samba/include/smb.h b/lib/vfs/mc-vfs/samba/include/smb.h
similarity index 100%
rename from vfs/samba/include/smb.h
rename to lib/vfs/mc-vfs/samba/include/smb.h
diff --git a/vfs/samba/include/trans2.h b/lib/vfs/mc-vfs/samba/include/trans2.h
similarity index 100%
rename from vfs/samba/include/trans2.h
rename to lib/vfs/mc-vfs/samba/include/trans2.h
diff --git a/vfs/samba/include/version.h b/lib/vfs/mc-vfs/samba/include/version.h
similarity index 100%
rename from vfs/samba/include/version.h
rename to lib/vfs/mc-vfs/samba/include/version.h
diff --git a/vfs/samba/internals.doc b/lib/vfs/mc-vfs/samba/internals.doc
similarity index 100%
rename from vfs/samba/internals.doc
rename to lib/vfs/mc-vfs/samba/internals.doc
diff --git a/vfs/samba/lib/charcnv.c b/lib/vfs/mc-vfs/samba/lib/charcnv.c
similarity index 100%
rename from vfs/samba/lib/charcnv.c
rename to lib/vfs/mc-vfs/samba/lib/charcnv.c
diff --git a/vfs/samba/lib/charset.c b/lib/vfs/mc-vfs/samba/lib/charset.c
similarity index 100%
rename from vfs/samba/lib/charset.c
rename to lib/vfs/mc-vfs/samba/lib/charset.c
diff --git a/vfs/samba/lib/debug.c b/lib/vfs/mc-vfs/samba/lib/debug.c
similarity index 100%
rename from vfs/samba/lib/debug.c
rename to lib/vfs/mc-vfs/samba/lib/debug.c
diff --git a/vfs/samba/lib/interface.c b/lib/vfs/mc-vfs/samba/lib/interface.c
similarity index 100%
rename from vfs/samba/lib/interface.c
rename to lib/vfs/mc-vfs/samba/lib/interface.c
diff --git a/vfs/samba/lib/kanji.c b/lib/vfs/mc-vfs/samba/lib/kanji.c
similarity index 100%
rename from vfs/samba/lib/kanji.c
rename to lib/vfs/mc-vfs/samba/lib/kanji.c
diff --git a/vfs/samba/lib/md4.c b/lib/vfs/mc-vfs/samba/lib/md4.c
similarity index 100%
rename from vfs/samba/lib/md4.c
rename to lib/vfs/mc-vfs/samba/lib/md4.c
diff --git a/vfs/samba/lib/netmask.c b/lib/vfs/mc-vfs/samba/lib/netmask.c
similarity index 100%
rename from vfs/samba/lib/netmask.c
rename to lib/vfs/mc-vfs/samba/lib/netmask.c
diff --git a/vfs/samba/lib/slprintf.c b/lib/vfs/mc-vfs/samba/lib/slprintf.c
similarity index 100%
rename from vfs/samba/lib/slprintf.c
rename to lib/vfs/mc-vfs/samba/lib/slprintf.c
diff --git a/vfs/samba/lib/system.c b/lib/vfs/mc-vfs/samba/lib/system.c
similarity index 100%
rename from vfs/samba/lib/system.c
rename to lib/vfs/mc-vfs/samba/lib/system.c
diff --git a/vfs/samba/lib/time.c b/lib/vfs/mc-vfs/samba/lib/time.c
similarity index 100%
rename from vfs/samba/lib/time.c
rename to lib/vfs/mc-vfs/samba/lib/time.c
diff --git a/vfs/samba/lib/username.c b/lib/vfs/mc-vfs/samba/lib/username.c
similarity index 100%
rename from vfs/samba/lib/username.c
rename to lib/vfs/mc-vfs/samba/lib/username.c
diff --git a/vfs/samba/lib/util.c b/lib/vfs/mc-vfs/samba/lib/util.c
similarity index 100%
rename from vfs/samba/lib/util.c
rename to lib/vfs/mc-vfs/samba/lib/util.c
diff --git a/vfs/samba/lib/util_file.c b/lib/vfs/mc-vfs/samba/lib/util_file.c
similarity index 100%
rename from vfs/samba/lib/util_file.c
rename to lib/vfs/mc-vfs/samba/lib/util_file.c
diff --git a/vfs/samba/lib/util_sock.c b/lib/vfs/mc-vfs/samba/lib/util_sock.c
similarity index 100%
rename from vfs/samba/lib/util_sock.c
rename to lib/vfs/mc-vfs/samba/lib/util_sock.c
diff --git a/vfs/samba/lib/util_str.c b/lib/vfs/mc-vfs/samba/lib/util_str.c
similarity index 100%
rename from vfs/samba/lib/util_str.c
rename to lib/vfs/mc-vfs/samba/lib/util_str.c
diff --git a/vfs/samba/libsmb/clientgen.c b/lib/vfs/mc-vfs/samba/libsmb/clientgen.c
similarity index 100%
rename from vfs/samba/libsmb/clientgen.c
rename to lib/vfs/mc-vfs/samba/libsmb/clientgen.c
diff --git a/vfs/samba/libsmb/namequery.c b/lib/vfs/mc-vfs/samba/libsmb/namequery.c
similarity index 100%
rename from vfs/samba/libsmb/namequery.c
rename to lib/vfs/mc-vfs/samba/libsmb/namequery.c
diff --git a/vfs/samba/libsmb/nmblib.c b/lib/vfs/mc-vfs/samba/libsmb/nmblib.c
similarity index 100%
rename from vfs/samba/libsmb/nmblib.c
rename to lib/vfs/mc-vfs/samba/libsmb/nmblib.c
diff --git a/vfs/samba/libsmb/nterr.c b/lib/vfs/mc-vfs/samba/libsmb/nterr.c
similarity index 100%
rename from vfs/samba/libsmb/nterr.c
rename to lib/vfs/mc-vfs/samba/libsmb/nterr.c
diff --git a/vfs/samba/libsmb/pwd_cache.c b/lib/vfs/mc-vfs/samba/libsmb/pwd_cache.c
similarity index 100%
rename from vfs/samba/libsmb/pwd_cache.c
rename to lib/vfs/mc-vfs/samba/libsmb/pwd_cache.c
diff --git a/vfs/samba/libsmb/smbdes.c b/lib/vfs/mc-vfs/samba/libsmb/smbdes.c
similarity index 100%
rename from vfs/samba/libsmb/smbdes.c
rename to lib/vfs/mc-vfs/samba/libsmb/smbdes.c
diff --git a/vfs/samba/libsmb/smbencrypt.c b/lib/vfs/mc-vfs/samba/libsmb/smbencrypt.c
similarity index 100%
rename from vfs/samba/libsmb/smbencrypt.c
rename to lib/vfs/mc-vfs/samba/libsmb/smbencrypt.c
diff --git a/vfs/samba/libsmb/smberr.c b/lib/vfs/mc-vfs/samba/libsmb/smberr.c
similarity index 100%
rename from vfs/samba/libsmb/smberr.c
rename to lib/vfs/mc-vfs/samba/libsmb/smberr.c
diff --git a/vfs/samba/param/loadparm.c b/lib/vfs/mc-vfs/samba/param/loadparm.c
similarity index 100%
rename from vfs/samba/param/loadparm.c
rename to lib/vfs/mc-vfs/samba/param/loadparm.c
diff --git a/vfs/samba/param/params.c b/lib/vfs/mc-vfs/samba/param/params.c
similarity index 100%
rename from vfs/samba/param/params.c
rename to lib/vfs/mc-vfs/samba/param/params.c
diff --git a/vfs/samba/parsing.doc b/lib/vfs/mc-vfs/samba/parsing.doc
similarity index 100%
rename from vfs/samba/parsing.doc
rename to lib/vfs/mc-vfs/samba/parsing.doc
diff --git a/vfs/sfs.c b/lib/vfs/mc-vfs/sfs.c
similarity index 100%
rename from vfs/sfs.c
rename to lib/vfs/mc-vfs/sfs.c
diff --git a/vfs/smbfs.c b/lib/vfs/mc-vfs/smbfs.c
similarity index 100%
rename from vfs/smbfs.c
rename to lib/vfs/mc-vfs/smbfs.c
diff --git a/vfs/smbfs.h b/lib/vfs/mc-vfs/smbfs.h
similarity index 100%
rename from vfs/smbfs.h
rename to lib/vfs/mc-vfs/smbfs.h
diff --git a/vfs/tar.c b/lib/vfs/mc-vfs/tar.c
similarity index 100%
rename from vfs/tar.c
rename to lib/vfs/mc-vfs/tar.c
diff --git a/vfs/undelfs.c b/lib/vfs/mc-vfs/undelfs.c
similarity index 100%
rename from vfs/undelfs.c
rename to lib/vfs/mc-vfs/undelfs.c
diff --git a/vfs/utilvfs.c b/lib/vfs/mc-vfs/utilvfs.c
similarity index 100%
rename from vfs/utilvfs.c
rename to lib/vfs/mc-vfs/utilvfs.c
diff --git a/vfs/utilvfs.h b/lib/vfs/mc-vfs/utilvfs.h
similarity index 100%
rename from vfs/utilvfs.h
rename to lib/vfs/mc-vfs/utilvfs.h
diff --git a/vfs/vfs-impl.h b/lib/vfs/mc-vfs/vfs-impl.h
similarity index 100%
rename from vfs/vfs-impl.h
rename to lib/vfs/mc-vfs/vfs-impl.h
diff --git a/vfs/vfs.c b/lib/vfs/mc-vfs/vfs.c
similarity index 100%
rename from vfs/vfs.c
rename to lib/vfs/mc-vfs/vfs.c
diff --git a/vfs/vfs.h b/lib/vfs/mc-vfs/vfs.h
similarity index 100%
rename from vfs/vfs.h
rename to lib/vfs/mc-vfs/vfs.h
diff --git a/vfs/xdirentry.h b/lib/vfs/mc-vfs/xdirentry.h
similarity index 100%
rename from vfs/xdirentry.h
rename to lib/vfs/mc-vfs/xdirentry.h
diff --git a/src/Makefile.am b/src/Makefile.am
index aa7708871..e11c24c22 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,14 +36,6 @@ if USE_EDIT
 EDITLIB = editor/libedit.a
 endif
 
-if ENABLE_VFS
-if USE_SAMBA_FS
-VFSLIB = ../vfs/libvfs-mc.a ../vfs/samba/libsamba.a
-else
-VFSLIB = ../vfs/libvfs-mc.a
-endif
-endif
-
 SRC_maintainer=logging.c logging.h
 SRC_charset = charsets.c charsets.h selcodepage.c selcodepage.h
 
@@ -56,7 +48,8 @@ if CHARSET
 endif
 
 mc_LDADD = \
-	$(EDITLIB) $(VFSLIB) \
+	../lib/libmc.la \
+	$(EDITLIB) \
 	filehighlight/libmcfilehighlight.la \
 	mcconfig/libmcconfig.la \
 	search/libsearch.la \