Moved dir $(srcdir)/vfs into $(srcdir)/lib/vfs/mc-vfs
Also, initial support of library directory. Signed-off-by: Slava Zanko <slavazanko@gmail.com>
Этот коммит содержится в:
Slava Zanko
родитель
f90725ad0d
Коммит
52f6bed7d0
@ -1,7 +1,7 @@
|
|||||||
## Process this file with automake to create Makefile.in.
|
## Process this file with automake to create Makefile.in.
|
||||||
AUTOMAKE_OPTIONS = 1.5
|
AUTOMAKE_OPTIONS = 1.5
|
||||||
|
|
||||||
SUBDIRS = intl po vfs src doc syntax contrib misc
|
SUBDIRS = intl po lib src doc syntax contrib misc
|
||||||
|
|
||||||
EXTRA_DIST =
|
EXTRA_DIST =
|
||||||
|
|
||||||
|
|||||||
@ -29,7 +29,7 @@ fi
|
|||||||
cd "$srcdir"
|
cd "$srcdir"
|
||||||
|
|
||||||
# The autoconf cache (version after 2.52) is not reliable yet.
|
# 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
|
if test ! -d config; then
|
||||||
mkdir config
|
mkdir config
|
||||||
@ -72,16 +72,16 @@ $AUTOMAKE -a
|
|||||||
test -f Makefile.in || \
|
test -f Makefile.in || \
|
||||||
{ echo "automake failed to generate Makefile.in" >&2; exit 1; }
|
{ 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
|
date -u >include/stamp-h.in
|
||||||
|
|
||||||
$AUTOHEADER
|
$AUTOHEADER
|
||||||
test -f include/config.h.in || \
|
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
|
$AUTOCONF
|
||||||
test -f configure || \
|
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
|
) || exit 1
|
||||||
|
|
||||||
$srcdir/maint/version.sh "$srcdir"
|
$srcdir/maint/version.sh "$srcdir"
|
||||||
|
|||||||
60
configure.ac
60
configure.ac
@ -545,7 +545,7 @@ dnl Libraries used only when building the mc binary
|
|||||||
AC_SUBST(MCLIBS)
|
AC_SUBST(MCLIBS)
|
||||||
|
|
||||||
if test -n "$use_smbfs"; then
|
if test -n "$use_smbfs"; then
|
||||||
AC_CONFIG_SUBDIRS([vfs/samba])
|
AC_CONFIG_SUBDIRS([src/vfs/mc-vfs/samba])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AM_CONDITIONAL(USE_MAINTAINER_MODE, [test x"$USE_MAINTAINER_MODE" = xyes])
|
AM_CONDITIONAL(USE_MAINTAINER_MODE, [test x"$USE_MAINTAINER_MODE" = xyes])
|
||||||
@ -583,35 +583,37 @@ src/skin/Makefile
|
|||||||
src/tty/Makefile
|
src/tty/Makefile
|
||||||
src/viewer/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
|
syntax/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
|
|
||||||
|
|
||||||
doc/Makefile
|
doc/Makefile
|
||||||
doc/hints/Makefile
|
doc/hints/Makefile
|
||||||
|
|||||||
17
lib/Makefile.am
Обычный файл
17
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
|
||||||
|
|
||||||
1
lib/vfs/Makefile.am
Обычный файл
1
lib/vfs/Makefile.am
Обычный файл
@ -0,0 +1 @@
|
|||||||
|
SUBDIRS = mc-vfs
|
||||||
0
vfs/.gitignore → lib/vfs/mc-vfs/.gitignore
поставляемый
0
vfs/.gitignore → lib/vfs/mc-vfs/.gitignore
поставляемый
Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше
Загрузка…
Ссылка в новой задаче
Block a user