diff --git a/configure.ac b/configure.ac index 75bebd211..bc075c10a 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([src/vfs/mc-vfs/samba]) + AC_CONFIG_SUBDIRS([lib/vfs/mc-vfs/samba]) fi AM_CONDITIONAL(USE_MAINTAINER_MODE, [test x"$USE_MAINTAINER_MODE" = xyes]) diff --git a/lib/Makefile.am b/lib/Makefile.am index 4b1e14e76..657b46465 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -14,9 +14,6 @@ libmc_la_LIBADD = \ tty/libmctty.la 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 +libmc_la_LIBADD += vfs/mc-vfs/libvfs-mc.la endif diff --git a/lib/filehighlight/Makefile.am b/lib/filehighlight/Makefile.am index dba81d39b..b1aa2045d 100644 --- a/lib/filehighlight/Makefile.am +++ b/lib/filehighlight/Makefile.am @@ -7,7 +7,7 @@ libmcfilehighlight_la_SOURCES = \ ini-file-read.c \ internal.h -libmcfilehighlight_la_CFLAGS=-I../ -I$(top_srcdir)/src \ +libmcfilehighlight_la_CFLAGS = -I$(top_srcdir) \ $(GLIB_CFLAGS) $(PCRE_CFLAGS) \ -DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\" diff --git a/lib/filehighlight/common.c b/lib/filehighlight/common.c index 7982f0cc5..76a2901b6 100644 --- a/lib/filehighlight/common.c +++ b/lib/filehighlight/common.c @@ -28,7 +28,7 @@ #include -#include "../src/global.h" +#include "src/global.h" #include "../lib/filehighlight/fhl.h" #include "internal.h" diff --git a/lib/filehighlight/fhl.h b/lib/filehighlight/fhl.h index d3e6b949f..1b39f3a91 100644 --- a/lib/filehighlight/fhl.h +++ b/lib/filehighlight/fhl.h @@ -3,7 +3,7 @@ #include "../../lib/mcconfig/mcconfig.h" #include "../../lib/search/search.h" -#include "../src/dir.h" +#include "src/dir.h" /*** typedefs(not structures) and defined constants **********************************************/ diff --git a/lib/filehighlight/get-color.c b/lib/filehighlight/get-color.c index c323c1a0c..e88d155d0 100644 --- a/lib/filehighlight/get-color.c +++ b/lib/filehighlight/get-color.c @@ -29,8 +29,8 @@ #include -#include "../src/global.h" -#include "../src/util.h" +#include "src/global.h" +#include "src/util.h" #include "../lib/skin/skin.h" #include "../lib/filehighlight/fhl.h" #include "internal.h" diff --git a/lib/filehighlight/ini-file-read.c b/lib/filehighlight/ini-file-read.c index 5b2192340..a440175d0 100644 --- a/lib/filehighlight/ini-file-read.c +++ b/lib/filehighlight/ini-file-read.c @@ -28,12 +28,12 @@ #include #include -#include "../src/global.h" -#include "../src/main.h" -#include "../src/fileloc.h" -#include "../src/strescape.h" +#include "src/global.h" +#include "src/main.h" +#include "src/fileloc.h" +#include "src/strescape.h" #include "../lib/skin/skin.h" -#include "../../src/util.h" +#include "src/util.h" #include "fhl.h" #include "internal.h" diff --git a/lib/mcconfig/Makefile.am b/lib/mcconfig/Makefile.am index 665ae0ed4..a81ef0d86 100644 --- a/lib/mcconfig/Makefile.am +++ b/lib/mcconfig/Makefile.am @@ -7,7 +7,7 @@ libmcconfig_la_SOURCES = \ get.c \ set.c -libmcconfig_la_CFLAGS=-I../ -I$(top_srcdir)/src \ +libmcconfig_la_CFLAGS = -I$(top_srcdir) \ $(GLIB_CFLAGS) \ -DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\" diff --git a/lib/mcconfig/common.c b/lib/mcconfig/common.c index 5bc4f401b..ca06632b7 100644 --- a/lib/mcconfig/common.c +++ b/lib/mcconfig/common.c @@ -26,10 +26,10 @@ #include /* extern int errno */ -#include "global.h" +#include "src/global.h" #include "../../lib/vfs/mc-vfs/vfs.h" /* mc_stat */ -#include "../../src/util.h" +#include "src/util.h" #include "mcconfig.h" diff --git a/lib/mcconfig/get.c b/lib/mcconfig/get.c index 9dda14304..724a54fd6 100644 --- a/lib/mcconfig/get.c +++ b/lib/mcconfig/get.c @@ -19,10 +19,10 @@ #include -#include "global.h" +#include "src/global.h" #include "mcconfig.h" -#include "../src/strutil.h" +#include "src/strutil.h" /*** global variables **************************************************/ diff --git a/lib/mcconfig/set.c b/lib/mcconfig/set.c index 5994125d5..0e8549408 100644 --- a/lib/mcconfig/set.c +++ b/lib/mcconfig/set.c @@ -19,10 +19,10 @@ #include -#include "global.h" +#include "src/global.h" #include "mcconfig.h" -#include "../src/strutil.h" +#include "src/strutil.h" /*** global variables **************************************************/ diff --git a/lib/search/Makefile.am b/lib/search/Makefile.am index f45b71874..15b12a788 100644 --- a/lib/search/Makefile.am +++ b/lib/search/Makefile.am @@ -10,7 +10,7 @@ libsearch_la_SOURCES = \ glob.c \ hex.c -libsearch_la_CFLAGS=-I../ -I$(top_srcdir)/src \ +libsearch_la_CFLAGS = -I$(top_srcdir) \ $(GLIB_CFLAGS) \ -DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\" $(PCRE_CFLAGS) diff --git a/lib/search/glob.c b/lib/search/glob.c index 1d07766c3..54b98921e 100644 --- a/lib/search/glob.c +++ b/lib/search/glob.c @@ -28,12 +28,12 @@ #include -#include "../src/global.h" +#include "src/global.h" #include "search.h" #include "internal.h" -#include "../src/strutil.h" -#include "../src/strescape.h" -#include "../src/charsets.h" +#include "src/strutil.h" +#include "src/strescape.h" +#include "src/charsets.h" /*** global variables ****************************************************************************/ diff --git a/lib/search/hex.c b/lib/search/hex.c index a7eb3b357..24c791b41 100644 --- a/lib/search/hex.c +++ b/lib/search/hex.c @@ -29,12 +29,12 @@ #include -#include "../src/global.h" +#include "src/global.h" #include "search.h" #include "internal.h" -#include "../src/strutil.h" -#include "../src/strescape.h" -#include "../src/charsets.h" +#include "src/strutil.h" +#include "src/strescape.h" +#include "src/charsets.h" /*** global variables ****************************************************************************/ diff --git a/lib/search/lib.c b/lib/search/lib.c index eba8390c9..9e8b0bc2d 100644 --- a/lib/search/lib.c +++ b/lib/search/lib.c @@ -30,11 +30,11 @@ #include #include -#include "../src/global.h" +#include "src/global.h" #include "search.h" #include "internal.h" -#include "../src/strutil.h" -#include "../src/charsets.h" +#include "src/strutil.h" +#include "src/charsets.h" /*** global variables ****************************************************************************/ diff --git a/lib/search/normal.c b/lib/search/normal.c index 5fcb1e392..8b3120b48 100644 --- a/lib/search/normal.c +++ b/lib/search/normal.c @@ -28,11 +28,11 @@ #include -#include "../src/global.h" +#include "src/global.h" #include "search.h" #include "internal.h" -#include "../src/strutil.h" -#include "../src/charsets.h" +#include "src/strutil.h" +#include "src/charsets.h" /*** global variables ****************************************************************************/ diff --git a/lib/search/regex.c b/lib/search/regex.c index f324d4990..2fd39234b 100644 --- a/lib/search/regex.c +++ b/lib/search/regex.c @@ -29,12 +29,12 @@ #include -#include "../src/global.h" +#include "src/global.h" #include "search.h" #include "internal.h" -#include "../src/strutil.h" -#include "../src/strescape.h" -#include "../src/charsets.h" +#include "src/strutil.h" +#include "src/strescape.h" +#include "src/charsets.h" /*** global variables ****************************************************************************/ diff --git a/lib/search/search.c b/lib/search/search.c index c69e74d12..2425fbffc 100644 --- a/lib/search/search.c +++ b/lib/search/search.c @@ -30,11 +30,11 @@ #include #include -#include "../src/global.h" +#include "src/global.h" #include "search.h" #include "internal.h" -#include "../src/strutil.h" -#include "../src/charsets.h" +#include "src/strutil.h" +#include "src/charsets.h" /*** global variables ****************************************************************************/ diff --git a/lib/search/search.h b/lib/search/search.h index 4dbf26d31..1f2f54796 100644 --- a/lib/search/search.h +++ b/lib/search/search.h @@ -3,7 +3,7 @@ #include -#include "../src/global.h" /* */ +#include "src/global.h" /* */ #include diff --git a/lib/skin/Makefile.am b/lib/skin/Makefile.am index 51e278fbe..e9e70e813 100644 --- a/lib/skin/Makefile.am +++ b/lib/skin/Makefile.am @@ -10,7 +10,7 @@ libmcskin_la_SOURCES = \ skin.h \ internal.h -libmcskin_la_CFLAGS=-I../ -I$(top_srcdir)/src \ +libmcskin_la_CFLAGS = -I$(top_srcdir) \ $(GLIB_CFLAGS) $(PCRE_CFLAGS) \ -DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\" diff --git a/lib/skin/colors-old.c b/lib/skin/colors-old.c index 46e9d3ee1..44a72b2b1 100644 --- a/lib/skin/colors-old.c +++ b/lib/skin/colors-old.c @@ -30,8 +30,8 @@ #include /* size_t */ #include "../tty/color.h" -#include "../src/global.h" -#include "../src/setup.h" +#include "src/global.h" +#include "src/setup.h" #include "skin.h" #include "internal.h" diff --git a/lib/skin/colors.c b/lib/skin/colors.c index 5c6a766a5..6949913f8 100644 --- a/lib/skin/colors.c +++ b/lib/skin/colors.c @@ -28,8 +28,8 @@ #include #include -#include "../src/global.h" -#include "../src/args.h" +#include "src/global.h" +#include "src/args.h" #include "../tty/color.h" #include "skin.h" #include "internal.h" diff --git a/lib/skin/common.c b/lib/skin/common.c index 6d3496f81..cc9a18e4c 100644 --- a/lib/skin/common.c +++ b/lib/skin/common.c @@ -28,8 +28,8 @@ #include #include -#include "../src/global.h" -#include "../src/args.h" +#include "src/global.h" +#include "src/args.h" #include "skin.h" #include "internal.h" diff --git a/lib/skin/hc-skins.c b/lib/skin/hc-skins.c index 8e49195c4..61f0c9127 100644 --- a/lib/skin/hc-skins.c +++ b/lib/skin/hc-skins.c @@ -26,7 +26,7 @@ */ #include -#include "../src/global.h" +#include "src/global.h" #include "skin.h" #include "internal.h" diff --git a/lib/skin/ini-file.c b/lib/skin/ini-file.c index 1a2b3fb51..cd154230c 100644 --- a/lib/skin/ini-file.c +++ b/lib/skin/ini-file.c @@ -28,10 +28,10 @@ #include #include -#include "../src/global.h" -#include "../src/main.h" -#include "../src/fileloc.h" -#include "../../src/util.h" +#include "src/global.h" +#include "src/main.h" +#include "src/fileloc.h" +#include "src/util.h" #include "skin.h" #include "internal.h" diff --git a/lib/skin/internal.h b/lib/skin/internal.h index 4310724cb..520018500 100644 --- a/lib/skin/internal.h +++ b/lib/skin/internal.h @@ -1,7 +1,7 @@ #ifndef MC__SKIN_INTERNAL_H #define MC__SKIN_INTERNAL_H -#include "../../src/global.h" +#include "src/global.h" #include "skin.h" diff --git a/lib/skin/lines.c b/lib/skin/lines.c index 255ae3a7f..98d548acc 100644 --- a/lib/skin/lines.c +++ b/lib/skin/lines.c @@ -28,8 +28,8 @@ #include #include -#include "../src/global.h" -#include "../src/args.h" +#include "src/global.h" +#include "src/args.h" #include "../tty/tty.h" #include "skin.h" #include "internal.h" diff --git a/lib/skin/skin.h b/lib/skin/skin.h index e2440adf5..ca49a3340 100644 --- a/lib/skin/skin.h +++ b/lib/skin/skin.h @@ -1,7 +1,7 @@ #ifndef MC__SKIN_H #define MC__SKIN_H -#include "../../src/global.h" +#include "src/global.h" #include "../../lib/mcconfig/mcconfig.h" diff --git a/lib/tty/Makefile.am b/lib/tty/Makefile.am index 713ce0513..c47555516 100644 --- a/lib/tty/Makefile.am +++ b/lib/tty/Makefile.am @@ -22,6 +22,6 @@ TTY_SRC = \ libmctty_la_SOURCES = $(TTY_SRC) $(TTY_SCREEN_SRC) -libmctty_la_CFLAGS = -I../ -I$(top_srcdir)/src \ +libmctty_la_CFLAGS = -I$(top_srcdir) \ $(GLIB_CFLAGS) \ -DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\" diff --git a/lib/tty/color-internal.h b/lib/tty/color-internal.h index a8bd9739a..9df1db0d3 100644 --- a/lib/tty/color-internal.h +++ b/lib/tty/color-internal.h @@ -8,7 +8,7 @@ #include /* size_t */ -#include "../../src/global.h" +#include "src/global.h" #ifdef HAVE_SLANG # include "tty-slang.h" diff --git a/lib/tty/color-ncurses.c b/lib/tty/color-ncurses.c index 9e5ab1792..3b4d538c3 100644 --- a/lib/tty/color-ncurses.c +++ b/lib/tty/color-ncurses.c @@ -30,7 +30,7 @@ #include #include /* size_t */ -#include "../../src/global.h" +#include "src/global.h" #include "tty-ncurses.h" #include "color.h" /* variables */ diff --git a/lib/tty/color-slang.c b/lib/tty/color-slang.c index f176b3f57..048a0933b 100644 --- a/lib/tty/color-slang.c +++ b/lib/tty/color-slang.c @@ -30,13 +30,13 @@ #include #include /* size_t */ -#include "../../src/global.h" +#include "src/global.h" #include "tty-slang.h" #include "color.h" /* variables */ #include "color-internal.h" -#include "../../src/setup.h" /* color_terminal_string */ +#include "src/setup.h" /* color_terminal_string */ static int has_colors (gboolean disable, gboolean force) diff --git a/lib/tty/color.c b/lib/tty/color.c index 47198b9f1..f56c85d3a 100644 --- a/lib/tty/color.c +++ b/lib/tty/color.c @@ -33,7 +33,7 @@ #include #include /* size_t */ -#include "../../src/global.h" +#include "src/global.h" #include "tty.h" #include "color.h" diff --git a/lib/tty/color.h b/lib/tty/color.h index ae8448953..8a8ed8c70 100644 --- a/lib/tty/color.h +++ b/lib/tty/color.h @@ -12,7 +12,7 @@ #ifndef MC_COLOR_H #define MC_COLOR_H -#include "../../src/global.h" /* glib.h */ +#include "src/global.h" /* glib.h */ #ifdef HAVE_SLANG # include "color-slang.h" diff --git a/lib/tty/key.c b/lib/tty/key.c index 93629688f..89c8a9d70 100644 --- a/lib/tty/key.c +++ b/lib/tty/key.c @@ -37,7 +37,7 @@ #include #include -#include "../../src/global.h" +#include "src/global.h" #include "tty.h" #include "tty-internal.h" /* mouse_enabled */ @@ -45,15 +45,15 @@ #include "key.h" #include "win.h" /* xterm_flag */ -#include "../../src/main.h" -#include "../../src/layout.h" /* winch_flag, mc_refresh() */ -#include "../../src/cons.saver.h" -#include "../../src/strutil.h" /* str_casecmp */ +#include "src/main.h" +#include "src/layout.h" /* winch_flag, mc_refresh() */ +#include "src/cons.saver.h" +#include "src/strutil.h" /* str_casecmp */ -#include "../../vfs/vfs.h" +#include "lib/vfs/mc-vfs/vfs.h" #ifdef ENABLE_VFS -#include "../../vfs/gc.h" +#include "lib/vfs/mc-vfs/gc.h" #endif /* ENABLE_VFS */ #ifdef HAVE_TEXTMODE_X11_SUPPORT diff --git a/lib/tty/key.h b/lib/tty/key.h index 16cba9e13..507664815 100644 --- a/lib/tty/key.h +++ b/lib/tty/key.h @@ -6,8 +6,8 @@ #ifndef MC_KEY_H #define MC_KEY_H -#include "../../src/global.h" /* */ -#include "../../src/dialog.h" /* cb_ret_t */ +#include "src/global.h" /* */ +#include "src/dialog.h" /* cb_ret_t */ #include "tty.h" /* KEY_F macro */ diff --git a/lib/tty/keyxdef.c b/lib/tty/keyxdef.c index c1e15c2cf..673e23f95 100644 --- a/lib/tty/keyxdef.c +++ b/lib/tty/keyxdef.c @@ -41,7 +41,7 @@ #include -#include "../../src/global.h" +#include "src/global.h" #include "tty.h" #include "mouse.h" /* required before key.h */ diff --git a/lib/tty/mouse.c b/lib/tty/mouse.c index 12ed03f63..66e115527 100644 --- a/lib/tty/mouse.c +++ b/lib/tty/mouse.c @@ -31,7 +31,7 @@ #include #include -#include "../../src/global.h" +#include "src/global.h" #include "tty.h" #include "tty-internal.h" /* mouse_enabled */ diff --git a/lib/tty/tty-internal.h b/lib/tty/tty-internal.h index 113330746..738a3ad69 100644 --- a/lib/tty/tty-internal.h +++ b/lib/tty/tty-internal.h @@ -6,7 +6,7 @@ #ifndef MC_TTY_INTERNAL_H #define MC_TTY_INTERNAL_H -#include "../../src/global.h" /* include */ +#include "src/global.h" /* include */ /* If true lines are shown by spaces */ extern gboolean slow_tty; diff --git a/lib/tty/tty-ncurses.c b/lib/tty/tty-ncurses.c index 5bc9b75b4..825ea6a44 100644 --- a/lib/tty/tty-ncurses.c +++ b/lib/tty/tty-ncurses.c @@ -36,7 +36,7 @@ #include #include -#include "../../src/global.h" +#include "src/global.h" #ifndef WANT_TERM_H # define WANT_TERM_H @@ -46,9 +46,9 @@ #include "tty.h" #include "color-internal.h" #include "win.h" -#include "../../src/main.h" +#include "src/main.h" -#include "../../src/strutil.h" /* str_term_form */ +#include "src/strutil.h" /* str_term_form */ /* include at last !!! */ #ifdef WANT_TERM_H diff --git a/lib/tty/tty-slang.c b/lib/tty/tty-slang.c index 63a71e48a..f52aaf4ff 100644 --- a/lib/tty/tty-slang.c +++ b/lib/tty/tty-slang.c @@ -39,7 +39,7 @@ #include #include -#include "../../src/global.h" +#include "src/global.h" #include "tty-internal.h" /* slow_tty */ #include "tty.h" @@ -49,7 +49,7 @@ #include "key.h" /* define_sequence */ #include "win.h" -#include "../../src/strutil.h" /* str_term_form */ +#include "src/strutil.h" /* str_term_form */ /*** global variables **************************************************/ extern int reset_hp_softkeys; diff --git a/lib/tty/tty.c b/lib/tty/tty.c index bf39d88bd..40079affd 100644 --- a/lib/tty/tty.c +++ b/lib/tty/tty.c @@ -34,12 +34,12 @@ #include #include -#include "../../src/global.h" +#include "src/global.h" #include "tty.h" #include "tty-internal.h" -#include "../../src/strutil.h" +#include "src/strutil.h" /*** global variables **************************************************/ diff --git a/lib/tty/tty.h b/lib/tty/tty.h index 50d384e18..509c1839d 100644 --- a/lib/tty/tty.h +++ b/lib/tty/tty.h @@ -11,7 +11,7 @@ #ifndef MC_TTY_H #define MC_TTY_H -#include "../../src/global.h" /* include */ +#include "src/global.h" /* include */ #ifdef HAVE_SLANG # include "tty-slang.h" diff --git a/lib/tty/win.c b/lib/tty/win.c index 9030973e9..6d6a54df6 100644 --- a/lib/tty/win.c +++ b/lib/tty/win.c @@ -34,8 +34,8 @@ #include "tty.h" /* tty_gotoyx, tty_print_char */ #include "win.h" -#include "../../src/util.h" -#include "../../src/cons.saver.h" /* console_flag */ +#include "src/util.h" +#include "src/cons.saver.h" /* console_flag */ /*** global variables **************************************************/ diff --git a/lib/tty/win.h b/lib/tty/win.h index a25429a12..afc16e4b6 100644 --- a/lib/tty/win.h +++ b/lib/tty/win.h @@ -6,7 +6,7 @@ #ifndef MC_WIN_H #define MC_WIN_H -#include "../../src/global.h" /* */ +#include "src/global.h" /* */ extern int xterm_flag; diff --git a/lib/tty/x11conn.c b/lib/tty/x11conn.c index 90c7a6d13..96c57701d 100644 --- a/lib/tty/x11conn.c +++ b/lib/tty/x11conn.c @@ -39,7 +39,7 @@ typedef int dummy; /* C99 forbids empty compilation unit */ # include #endif -#include "../../src/global.h" +#include "src/global.h" #include "x11conn.h" /*** file scope type declarations **************************************/ diff --git a/lib/vfs/mc-vfs/Makefile.am b/lib/vfs/mc-vfs/Makefile.am index 8f77479ae..f981a0313 100644 --- a/lib/vfs/mc-vfs/Makefile.am +++ b/lib/vfs/mc-vfs/Makefile.am @@ -76,21 +76,23 @@ distclean-local: else :; fi if ENABLE_VFS -noinst_LIBRARIES = libvfs-mc.a +noinst_LTLIBRARIES = libvfs-mc.la else -noinst_LIBRARIES = +noinst_LTLIBRARIES = endif if ENABLE_VFS_NET -libvfs_mc_a_SOURCES = $(NETFILES) $(NONETFILES) +libvfs_mc_la_SOURCES = $(NETFILES) $(NONETFILES) else -libvfs_mc_a_SOURCES = $(NONETFILES) +libvfs_mc_la_SOURCES = $(NONETFILES) endif +if ENABLE_VFS if ENABLE_MCSERVER sbin_PROGRAMS = mcserv -mcserv_SOURCES = mcserv.c mcfsutil.c -mcserv_LDADD = $(MCSERVLIBS) $(GLIB_LIBS) +mcserv_SOURCES = mcserv.c +mcserv_LDADD = $(MCSERVLIBS) $(GLIB_LIBS) libvfs-mc.la +endif endif diff --git a/lib/vfs/mc-vfs/cpio.c b/lib/vfs/mc-vfs/cpio.c index 8903f820b..d405a332a 100644 --- a/lib/vfs/mc-vfs/cpio.c +++ b/lib/vfs/mc-vfs/cpio.c @@ -29,11 +29,11 @@ #include #include -#include "../src/global.h" -#include "../src/wtools.h" /* message() */ -#include "../src/main.h" /* print_vfs_message */ -#include "../src/unixcompat.h" -#include "../vfs/vfs.h" +#include "src/global.h" +#include "src/wtools.h" /* message() */ +#include "src/main.h" /* print_vfs_message */ +#include "src/unixcompat.h" +#include "vfs.h" #include "utilvfs.h" #include "vfs-impl.h" diff --git a/lib/vfs/mc-vfs/direntry.c b/lib/vfs/mc-vfs/direntry.c index 778d36326..a688e7782 100644 --- a/lib/vfs/mc-vfs/direntry.c +++ b/lib/vfs/mc-vfs/direntry.c @@ -35,13 +35,13 @@ #include #include /* gettimeofday() */ -#include "../src/global.h" +#include "src/global.h" -#include "../tty/tty.h" /* enable/disable interrupt key */ +#include "lib/tty/tty.h" /* enable/disable interrupt key */ -#include "../src/wtools.h" /* message() */ -#include "../src/main.h" /* print_vfs_message */ -#include "../vfs/vfs.h" +#include "src/wtools.h" /* message() */ +#include "src/main.h" /* print_vfs_message */ +#include "vfs.h" #include "utilvfs.h" #include "vfs-impl.h" diff --git a/lib/vfs/mc-vfs/extfs.c b/lib/vfs/mc-vfs/extfs.c index d30774e7a..2511f13c2 100644 --- a/lib/vfs/mc-vfs/extfs.c +++ b/lib/vfs/mc-vfs/extfs.c @@ -45,11 +45,11 @@ #include #include -#include "../src/global.h" +#include "src/global.h" -#include "../src/wtools.h" /* message() */ -#include "../src/main.h" /* print_vfs_message */ -#include "../src/execute.h" /* For shell_execute */ +#include "src/wtools.h" /* message() */ +#include "src/main.h" /* print_vfs_message */ +#include "src/execute.h" /* For shell_execute */ #include "utilvfs.h" #include "vfs.h" diff --git a/lib/vfs/mc-vfs/fish.c b/lib/vfs/mc-vfs/fish.c index 649c996ae..3ad315db4 100644 --- a/lib/vfs/mc-vfs/fish.c +++ b/lib/vfs/mc-vfs/fish.c @@ -52,16 +52,16 @@ #include #include -#include "../src/global.h" +#include "src/global.h" -#include "../tty/tty.h" /* enable/disable interrupt key */ +#include "lib/tty/tty.h" /* enable/disable interrupt key */ -#include "../src/wtools.h" /* message() */ -#include "../src/main.h" /* print_vfs_message */ -#include "../src/util.h" -#include "../src/strescape.h" -#include "../src/unixcompat.h" -#include "../src/fs.h" +#include "src/wtools.h" /* message() */ +#include "src/main.h" /* print_vfs_message */ +#include "src/util.h" +#include "src/strescape.h" +#include "src/unixcompat.h" +#include "src/fs.h" #include "utilvfs.h" #include "xdirentry.h" #include "vfs.h" diff --git a/lib/vfs/mc-vfs/ftpfs.c b/lib/vfs/mc-vfs/ftpfs.c index a2fec45f6..1d972bc5b 100644 --- a/lib/vfs/mc-vfs/ftpfs.c +++ b/lib/vfs/mc-vfs/ftpfs.c @@ -83,15 +83,15 @@ What to do with this? #include #include /* gettimeofday() */ -#include "../src/global.h" +#include "src/global.h" -#include "../lib/tty/tty.h" /* enable/disable interrupt key */ +#include "lib/tty/tty.h" /* enable/disable interrupt key */ -#include "../src/wtools.h" /* message() */ -#include "../src/main.h" /* print_vfs_message */ -#include "../src/history.h" -#include "../src/setup.h" /* for load_anon_passwd */ -#include "../lib/mcconfig/mcconfig.h" +#include "src/wtools.h" /* message() */ +#include "src/main.h" /* print_vfs_message */ +#include "src/history.h" +#include "src/setup.h" /* for load_anon_passwd */ +#include "lib/mcconfig/mcconfig.h" #include "utilvfs.h" #include "xdirentry.h" diff --git a/lib/vfs/mc-vfs/gc.c b/lib/vfs/mc-vfs/gc.c index 802dffce4..0a8ad482f 100644 --- a/lib/vfs/mc-vfs/gc.c +++ b/lib/vfs/mc-vfs/gc.c @@ -42,12 +42,12 @@ #include /* is_digit() */ #include /* gettimeofday() */ -#include "../src/global.h" +#include "src/global.h" -#include "../src/wtools.h" /* message() */ -#include "../src/main.h" /* print_vfs_message */ -#include "../src/panel.h" /* get_current_panel() */ -#include "../src/layout.h" /* get_current_type() */ +#include "src/wtools.h" /* message() */ +#include "src/main.h" /* print_vfs_message */ +#include "src/panel.h" /* get_current_panel() */ +#include "src/layout.h" /* get_current_type() */ #include "utilvfs.h" #include "vfs-impl.h" diff --git a/lib/vfs/mc-vfs/local.c b/lib/vfs/mc-vfs/local.c index e136c073a..f088662e2 100644 --- a/lib/vfs/mc-vfs/local.c +++ b/lib/vfs/mc-vfs/local.c @@ -12,10 +12,10 @@ #include #include -#include "../src/global.h" +#include "src/global.h" -#include "../src/wtools.h" /* message() */ -#include "../src/main.h" /* print_vfs_message */ +#include "src/wtools.h" /* message() */ +#include "src/main.h" /* print_vfs_message */ #include "utilvfs.h" #include "vfs.h" diff --git a/lib/vfs/mc-vfs/mcfs.c b/lib/vfs/mc-vfs/mcfs.c index 76d382a1b..09d5cb35e 100644 --- a/lib/vfs/mc-vfs/mcfs.c +++ b/lib/vfs/mc-vfs/mcfs.c @@ -57,9 +57,9 @@ #endif #endif -#include "../src/global.h" -#include "../src/wtools.h" /* message() */ -#include "../src/main.h" /* print_vfs_message */ +#include "src/global.h" +#include "src/wtools.h" /* message() */ +#include "src/main.h" /* print_vfs_message */ #include "utilvfs.h" #include "vfs.h" #include "vfs-impl.h" diff --git a/lib/vfs/mc-vfs/mcfsutil.c b/lib/vfs/mc-vfs/mcfsutil.c index 984780cc8..b9e7347f5 100644 --- a/lib/vfs/mc-vfs/mcfsutil.c +++ b/lib/vfs/mc-vfs/mcfsutil.c @@ -50,9 +50,9 @@ #include -#include "../src/global.h" -#include "../src/wtools.h" /* message() */ -#include "../src/main.h" /* print_vfs_message */ +#include "src/global.h" +#include "src/wtools.h" /* message() */ +#include "src/main.h" /* print_vfs_message */ #include "utilvfs.h" #include "mcfsutil.h" #include "netutil.h" diff --git a/lib/vfs/mc-vfs/mcserv.c b/lib/vfs/mc-vfs/mcserv.c index 23f7ffe06..d0d4e8b88 100644 --- a/lib/vfs/mc-vfs/mcserv.c +++ b/lib/vfs/mc-vfs/mcserv.c @@ -110,10 +110,10 @@ * a native printf(3) capable of all POSIX features. */ #undef ENABLE_NLS -#include "../src/global.h" +#include "src/global.h" -#include "../src/wtools.h" /* message() */ -#include "../src/main.h" /* print_vfs_message */ +#include "src/wtools.h" /* message() */ +#include "src/main.h" /* print_vfs_message */ #include "utilvfs.h" #include "vfs.h" #include "mcfs.h" diff --git a/lib/vfs/mc-vfs/netutil.c b/lib/vfs/mc-vfs/netutil.c index 4bd7eaa3a..82bca535e 100644 --- a/lib/vfs/mc-vfs/netutil.c +++ b/lib/vfs/mc-vfs/netutil.c @@ -31,9 +31,9 @@ #include #include -#include "../src/global.h" -#include "../vfs/utilvfs.h" -#include "../vfs/netutil.h" +#include "src/global.h" +#include "utilvfs.h" +#include "netutil.h" int got_sigpipe; diff --git a/lib/vfs/mc-vfs/samba/configure.ac b/lib/vfs/mc-vfs/samba/configure.ac index e56453e18..319fcba4f 100644 --- a/lib/vfs/mc-vfs/samba/configure.ac +++ b/lib/vfs/mc-vfs/samba/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(include/includes.h) AC_PREREQ(2.52) AC_CONFIG_HEADER(include/config.h) -AC_CONFIG_AUX_DIR(../../config) +AC_CONFIG_AUX_DIR(../../../../config) # we want to be compatibe with older versions of Samba AC_PREFIX_DEFAULT(/usr/local/samba) AC_SYS_LARGEFILE diff --git a/lib/vfs/mc-vfs/sfs.c b/lib/vfs/mc-vfs/sfs.c index ade71eecd..d7fc992f5 100644 --- a/lib/vfs/mc-vfs/sfs.c +++ b/lib/vfs/mc-vfs/sfs.c @@ -41,11 +41,11 @@ #include #include -#include "../src/global.h" +#include "src/global.h" -#include "../src/wtools.h" /* message() */ -#include "../src/main.h" /* print_vfs_message */ -#include "../src/execute.h" /* EXECUTE_AS_SHELL */ +#include "src/wtools.h" /* message() */ +#include "src/main.h" /* print_vfs_message */ +#include "src/execute.h" /* EXECUTE_AS_SHELL */ #include "utilvfs.h" #include "vfs.h" diff --git a/lib/vfs/mc-vfs/smbfs.c b/lib/vfs/mc-vfs/smbfs.c index 05169d85f..eb7403784 100644 --- a/lib/vfs/mc-vfs/smbfs.c +++ b/lib/vfs/mc-vfs/smbfs.c @@ -38,10 +38,10 @@ #undef USE_NCURSES /* Don't include *curses.h */ #undef USE_NCURSESW -#include "../src/global.h" +#include "src/global.h" -#include "../src/wtools.h" /* message() */ -#include "../src/main.h" /* print_vfs_message */ +#include "src/wtools.h" /* message() */ +#include "src/main.h" /* print_vfs_message */ #include "utilvfs.h" @@ -65,7 +65,7 @@ #include "vfs.h" #include "vfs-impl.h" #include "smbfs.h" -#include "vfs/netutil.h" +#include "netutil.h" #define SMBFS_MAX_CONNECTIONS 16 static const char * const IPC = "IPC$"; diff --git a/lib/vfs/mc-vfs/tar.c b/lib/vfs/mc-vfs/tar.c index 63c4dc2d1..e9b1397bb 100644 --- a/lib/vfs/mc-vfs/tar.c +++ b/lib/vfs/mc-vfs/tar.c @@ -40,11 +40,11 @@ #include #endif -#include "../src/global.h" +#include "src/global.h" -#include "../src/wtools.h" /* message() */ -#include "../src/main.h" /* print_vfs_message */ -#include "../vfs/vfs.h" +#include "src/wtools.h" /* message() */ +#include "src/main.h" /* print_vfs_message */ +#include "vfs.h" #include "utilvfs.h" #include "gc.h" /* vfs_rmstamp */ diff --git a/lib/vfs/mc-vfs/undelfs.c b/lib/vfs/mc-vfs/undelfs.c index 3f4557004..109d7a5d8 100644 --- a/lib/vfs/mc-vfs/undelfs.c +++ b/lib/vfs/mc-vfs/undelfs.c @@ -56,9 +56,9 @@ #include #include -#include "../src/global.h" -#include "../src/wtools.h" /* message() */ -#include "../src/main.h" /* print_vfs_message */ +#include "src/global.h" +#include "src/wtools.h" /* message() */ +#include "src/main.h" /* print_vfs_message */ #include "utilvfs.h" #include "vfs.h" #include "vfs-impl.h" diff --git a/lib/vfs/mc-vfs/utilvfs.c b/lib/vfs/mc-vfs/utilvfs.c index 563354011..dc7a42fd7 100644 --- a/lib/vfs/mc-vfs/utilvfs.c +++ b/lib/vfs/mc-vfs/utilvfs.c @@ -33,12 +33,12 @@ #include #include -#include "../src/global.h" +#include "src/global.h" -#include "../src/wtools.h" /* message() */ -#include "../src/main.h" /* print_vfs_message */ -#include "../src/unixcompat.h" -#include "../src/history.h" +#include "src/wtools.h" /* message() */ +#include "src/main.h" /* print_vfs_message */ +#include "src/unixcompat.h" +#include "src/history.h" #include "vfs.h" #include "utilvfs.h" diff --git a/lib/vfs/mc-vfs/utilvfs.h b/lib/vfs/mc-vfs/utilvfs.h index 5e5d646b2..8628a80ab 100644 --- a/lib/vfs/mc-vfs/utilvfs.h +++ b/lib/vfs/mc-vfs/utilvfs.h @@ -11,7 +11,7 @@ #include -#include "../src/global.h" +#include "src/global.h" /** Bit flags for vfs_split_url() * diff --git a/lib/vfs/mc-vfs/vfs-impl.h b/lib/vfs/mc-vfs/vfs-impl.h index 055eb2afd..c7ab18770 100644 --- a/lib/vfs/mc-vfs/vfs-impl.h +++ b/lib/vfs/mc-vfs/vfs-impl.h @@ -14,7 +14,7 @@ #include #include -#include "../src/fs.h" /* MC_MAXPATHLEN */ +#include "src/fs.h" /* MC_MAXPATHLEN */ typedef void *vfsid; struct vfs_stamping; diff --git a/lib/vfs/mc-vfs/vfs.c b/lib/vfs/mc-vfs/vfs.c index 6ca2c7524..83875b5c3 100644 --- a/lib/vfs/mc-vfs/vfs.c +++ b/lib/vfs/mc-vfs/vfs.c @@ -50,11 +50,11 @@ #include #include -#include "../src/global.h" +#include "src/global.h" -#include "../src/wtools.h" /* message() */ -#include "../src/main.h" /* print_vfs_message */ -#include "../src/strutil.h" +#include "src/wtools.h" /* message() */ +#include "src/main.h" /* print_vfs_message */ +#include "src/strutil.h" #include "utilvfs.h" #include "gc.h" diff --git a/src/Makefile.am b/src/Makefile.am index 33993d080..96be9bc23 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -53,6 +53,12 @@ mc_LDADD = \ viewer/libmcviewer.la \ $(INTLLIBS) $(MCLIBS) $(SLANGLIB) $(LIBICONV) $(GLIB_LIBS) +if USE_SAMBA_FS +# this is a hack for linking with own samba library in simple way +mc_LDADD += ../lib/vfs/mc-vfs/samba/libsamba.a +endif + + SRC_mc_widgets = \ dialog.c dialog.h \ menu.c menu.h \ diff --git a/src/achown.c b/src/achown.c index dd1e90df8..8e066d496 100644 --- a/src/achown.c +++ b/src/achown.c @@ -35,10 +35,10 @@ #include "global.h" -#include "../lib/tty/tty.h" -#include "../lib/tty/key.h" /* XCTRL and ALT macros */ -#include "../lib/skin/skin.h" -#include "../lib/vfs/mc-vfs/vfs/vfs.h" +#include "lib/tty/tty.h" +#include "lib/tty/key.h" /* XCTRL and ALT macros */ +#include "lib/skin/skin.h" +#include "lib/vfs/mc-vfs/vfs.h" #include "dialog.h" #include "widget.h" diff --git a/src/args.c b/src/args.c index 791fc49f6..3a1a9137a 100644 --- a/src/args.c +++ b/src/args.c @@ -28,11 +28,11 @@ #include -#include "../src/global.h" -#include "../lib/tty/tty.h" -#include "../src/args.h" -#include "../src/strutil.h" -#include "../src/textconf.h" +#include "src/global.h" +#include "lib/tty/tty.h" +#include "src/args.h" +#include "src/strutil.h" +#include "src/textconf.h" /*** external variables **************************************************************************/ diff --git a/src/background.c b/src/background.c index 769a9dfe0..3112fb2e0 100644 --- a/src/background.c +++ b/src/background.c @@ -48,7 +48,7 @@ #include "wtools.h" #include "layout.h" /* repaint_screen() */ #include "fileopctx.h" /* FileOpContext */ -#include "../lib/tty/key.h" /* add_select_channel(), delete_select_channel() */ +#include "lib/tty/key.h" /* add_select_channel(), delete_select_channel() */ enum ReturnType { Return_String, diff --git a/src/boxes.c b/src/boxes.c index 82c5809ae..96979bf6b 100644 --- a/src/boxes.c +++ b/src/boxes.c @@ -36,11 +36,11 @@ #include "global.h" -#include "../lib/tty/tty.h" -#include "../lib/skin/skin.h" /* INPUT_COLOR */ -#include "../lib/tty/key.h" /* XCTRL and ALT macros */ +#include "lib/tty/tty.h" +#include "lib/skin/skin.h" /* INPUT_COLOR */ +#include "lib/tty/key.h" /* XCTRL and ALT macros */ -#include "../lib/mcconfig/mcconfig.h" /* Load/save user formats */ +#include "lib/mcconfig/mcconfig.h" /* Load/save user formats */ #include "dialog.h" /* The nice dialog manager */ #include "widget.h" /* The widgets for the nice dialog manager */ @@ -62,11 +62,11 @@ #endif #ifdef USE_NETCODE -# include "../vfs/ftpfs.h" +# include "lib/vfs/mc-vfs/ftpfs.h" #endif #ifdef ENABLE_VFS -#include "../vfs/gc.h" +#include "lib/vfs/mc-vfs/gc.h" #endif diff --git a/src/chmod.c b/src/chmod.c index 26d163657..a38056f65 100644 --- a/src/chmod.c +++ b/src/chmod.c @@ -33,9 +33,9 @@ #include "global.h" -#include "../lib/tty/tty.h" -#include "../lib/skin/skin.h" -#include "../lib/vfs/mc-vfs/vfs/vfs.h" +#include "lib/tty/tty.h" +#include "lib/skin/skin.h" +#include "lib/vfs/mc-vfs/vfs.h" #include "dialog.h" /* add_widget() */ #include "widget.h" /* NORMAL_BUTTON */ diff --git a/src/chown.c b/src/chown.c index 8f2d8aaa7..5b4456636 100644 --- a/src/chown.c +++ b/src/chown.c @@ -34,9 +34,9 @@ #include "global.h" -#include "../lib/tty/tty.h" -#include "../lib/skin/skin.h" -#include "../lib/vfs/mc-vfs/vfs/vfs.h" +#include "lib/tty/tty.h" +#include "lib/skin/skin.h" +#include "lib/vfs/mc-vfs/vfs.h" #include "dialog.h" #include "widget.h" diff --git a/src/cmd.c b/src/cmd.c index 744023252..ed8ad22c7 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -47,14 +47,14 @@ #include "global.h" -#include "../lib/tty/tty.h" /* LINES, tty_touch_screen() */ -#include "../lib/tty/key.h" /* ALT() macro */ -#include "../lib/tty/win.h" /* do_enter_ca_mode() */ -#include "../lib/mcconfig/mcconfig.h" -#include "../lib/search/search.h" -#include "../src/viewer/mcviewer.h" -#include "../lib/filehighlight/fhl.h" /* MC_FHL_INI_FILE */ -#include "../lib/vfs/mc-vfs/vfs.h" +#include "lib/tty/tty.h" /* LINES, tty_touch_screen() */ +#include "lib/tty/key.h" /* ALT() macro */ +#include "lib/tty/win.h" /* do_enter_ca_mode() */ +#include "lib/mcconfig/mcconfig.h" +#include "lib/search/search.h" +#include "src/viewer/mcviewer.h" +#include "lib/filehighlight/fhl.h" /* MC_FHL_INI_FILE */ +#include "lib/vfs/mc-vfs/vfs.h" #include "cmd.h" /* Our definitions */ #include "fileopctx.h" @@ -87,7 +87,7 @@ #endif #ifdef USE_INTERNAL_EDIT -# include "../src/editor/edit.h" +# include "src/editor/edit.h" #endif /* If set and you don't have subshell support,then C-o will give you a shell */ diff --git a/src/command.c b/src/command.c index 1e521152a..925467406 100644 --- a/src/command.c +++ b/src/command.c @@ -33,8 +33,8 @@ #include #include "global.h" /* home_dir */ -#include "../lib/tty/tty.h" -#include "../../lib/vfs/mc-vfs/vfs.h" +#include "lib/tty/tty.h" +#include "lib/vfs/mc-vfs/vfs.h" #include "widget.h" /* WInput */ #include "command.h" #include "wtools.h" /* message () */ @@ -44,9 +44,9 @@ #include "user.h" /* expand_format */ #include "subshell.h" /* SUBSHELL_EXIT */ #include "tree.h" /* for tree_chdir */ -#include "../lib/skin/skin.h" /* DEFAULT_COLOR */ +#include "lib/skin/skin.h" /* DEFAULT_COLOR */ #include "execute.h" /* shell_execute */ -#include "../src/strescape.h" +#include "src/strescape.h" /* This holds the command line */ WInput *cmdline; diff --git a/src/complete.c b/src/complete.c index 7a980c755..5c4aa97b1 100644 --- a/src/complete.c +++ b/src/complete.c @@ -38,16 +38,16 @@ #include "global.h" -#include "../lib/tty/tty.h" -#include "../lib/tty/key.h" /* XCTRL and ALT macros */ -#include "../lib/vfs/mc-vfs/vfs/vfs.h" +#include "lib/tty/tty.h" +#include "lib/tty/key.h" /* XCTRL and ALT macros */ +#include "lib/vfs/mc-vfs/vfs.h" #include "dialog.h" #include "widget.h" #include "wtools.h" #include "main.h" /* show_all_if_ambiguous */ #include "util.h" -#include "../src/strescape.h" +#include "src/strescape.h" #include "strutil.h" typedef char *CompletionFunction (const char * text, int state, INPUT_COMPLETE_FLAGS flags); diff --git a/src/cons.handler.c b/src/cons.handler.c index 80e54af29..6c0a0e37e 100644 --- a/src/cons.handler.c +++ b/src/cons.handler.c @@ -36,9 +36,9 @@ #include "global.h" -#include "../lib/tty/tty.h" -#include "../lib/skin/skin.h" /* tty_set_normal_attrs */ -#include "../lib/tty/win.h" +#include "lib/tty/tty.h" +#include "lib/skin/skin.h" /* tty_set_normal_attrs */ +#include "lib/tty/win.h" #include "cons.saver.h" diff --git a/src/cons.saver.c b/src/cons.saver.c index 0f49aaa23..c80ba57d6 100644 --- a/src/cons.saver.c +++ b/src/cons.saver.c @@ -62,7 +62,7 @@ #define LINUX_CONS_SAVER_C #include "cons.saver.h" -#include "../lib/tty/win.h" +#include "lib/tty/win.h" static void send_contents (char *buffer, unsigned int columns, unsigned int rows) diff --git a/src/dialog.c b/src/dialog.c index e0f845d8d..1dc740fdc 100644 --- a/src/dialog.c +++ b/src/dialog.c @@ -31,10 +31,10 @@ #include "global.h" -#include "../lib/tty/tty.h" -#include "../lib/skin/skin.h" -#include "../lib/tty/mouse.h" -#include "../lib/tty/key.h" +#include "lib/tty/tty.h" +#include "lib/skin/skin.h" +#include "lib/tty/mouse.h" +#include "lib/tty/key.h" #include "help.h" /* interactive_display() */ #include "dialog.h" diff --git a/src/dialog.h b/src/dialog.h index eaadcaa8c..e5c0e3652 100644 --- a/src/dialog.h +++ b/src/dialog.h @@ -23,7 +23,7 @@ #ifndef MC_DIALOG_H #define MC_DIALOG_H -#include "../lib/tty/mouse.h" +#include "lib/tty/mouse.h" #include "util.h" /* Hook */ /* Common return values */ diff --git a/src/dir.c b/src/dir.c index 2f7cbce03..831c1acf4 100644 --- a/src/dir.c +++ b/src/dir.c @@ -27,9 +27,9 @@ #include #include -#include "../lib/tty/tty.h" -#include "../lib/search/search.h" -#include "../lib/vfs/mc-vfs/vfs/vfs.h" +#include "lib/tty/tty.h" +#include "lib/search/search.h" +#include "lib/vfs/mc-vfs/vfs.h" #include "global.h" #include "wtools.h" diff --git a/src/editor/bookmark.c b/src/editor/bookmark.c index 00dfe8ea5..2270d8006 100644 --- a/src/editor/bookmark.c +++ b/src/editor/bookmark.c @@ -39,7 +39,7 @@ #include #include -#include "../src/global.h" +#include "src/global.h" #include "edit-impl.h" #include "edit-widget.h" diff --git a/src/editor/choosesyntax.c b/src/editor/choosesyntax.c index 20df93526..08660d384 100644 --- a/src/editor/choosesyntax.c +++ b/src/editor/choosesyntax.c @@ -26,8 +26,8 @@ #include -#include "../src/global.h" -#include "../src/wtools.h" +#include "src/global.h" +#include "src/wtools.h" #include "edit-impl.h" diff --git a/src/editor/edit-impl.h b/src/editor/edit-impl.h index 041d97284..70bfe3366 100644 --- a/src/editor/edit-impl.h +++ b/src/editor/edit-impl.h @@ -32,10 +32,10 @@ #include -#include "../src/dialog.h" /* cb_ret_t */ -#include "../src/keybind.h" /* global_keymap_t */ +#include "src/dialog.h" /* cb_ret_t */ +#include "src/keybind.h" /* global_keymap_t */ -#include "../src/editor/edit.h" +#include "src/editor/edit.h" #define SEARCH_DIALOG_OPTION_NO_SCANF (1 << 0) #define SEARCH_DIALOG_OPTION_NO_REGEX (1 << 1) diff --git a/src/editor/edit-widget.h b/src/editor/edit-widget.h index a4eeaeb7b..022bbb012 100644 --- a/src/editor/edit-widget.h +++ b/src/editor/edit-widget.h @@ -6,11 +6,11 @@ #ifndef MC_EDIT_WIDGET_H #define MC_EDIT_WIDGET_H -#include "../src/dialog.h" /* Widget */ -#include "../lib/search/search.h" /* mc_search_t */ +#include "src/dialog.h" /* Widget */ +#include "lib/search/search.h" /* mc_search_t */ #include "edit-impl.h" -#include "../src/keybind.h" +#include "src/keybind.h" #define MAX_MACRO_LENGTH 1024 #define N_LINE_CACHES 32 diff --git a/src/editor/edit.c b/src/editor/edit.c index 6aef1e7db..a351f7a70 100644 --- a/src/editor/edit.c +++ b/src/editor/edit.c @@ -39,30 +39,30 @@ #include #include -#include "../src/global.h" +#include "src/global.h" -#include "../lib/tty/color.h" -#include "../lib/tty/tty.h" /* attrset() */ -#include "../lib/tty/key.h" /* is_idle() */ +#include "lib/tty/color.h" +#include "lib/tty/tty.h" /* attrset() */ +#include "lib/tty/key.h" /* is_idle() */ -#include "../lib/skin/skin.h" /* EDITOR_NORMAL_COLOR */ +#include "lib/skin/skin.h" /* EDITOR_NORMAL_COLOR */ -#include "../src/widget.h" -#include "../src/cmd.h" /* view_other_cmd() */ -#include "../src/user.h" /* user_menu_cmd() */ -#include "../src/wtools.h" /* query_dialog() */ -#include "../src/timefmt.h" /* time formatting */ -#include "../src/strutil.h" /* utf string functions */ -#include "../src/charsets.h" /* get_codepage_id */ -#include "../src/main.h" /* source_codepage */ -#include "../src/learn.h" /* learn_keys */ -#include "../src/cmddef.h" +#include "src/widget.h" +#include "src/cmd.h" /* view_other_cmd() */ +#include "src/user.h" /* user_menu_cmd() */ +#include "src/wtools.h" /* query_dialog() */ +#include "src/timefmt.h" /* time formatting */ +#include "src/strutil.h" /* utf string functions */ +#include "src/charsets.h" /* get_codepage_id */ +#include "src/main.h" /* source_codepage */ +#include "src/learn.h" /* learn_keys */ +#include "src/cmddef.h" #include "edit-impl.h" #include "editlock.h" #include "edit-widget.h" -#include "../../lib/vfs/mc-vfs/vfs.h" +#include "lib/vfs/mc-vfs/vfs.h" int option_word_wrap_line_length = 72; int option_typewriter_wrap = 0; diff --git a/src/editor/edit.h b/src/editor/edit.h index 2b466078b..f32a3b764 100644 --- a/src/editor/edit.h +++ b/src/editor/edit.h @@ -32,8 +32,8 @@ #ifndef MC_EDIT_H #define MC_EDIT_H -#include "../src/global.h" /* PATH_SEP_STR */ -#include "../src/fileloc.h" +#include "src/global.h" /* PATH_SEP_STR */ +#include "src/fileloc.h" /* Editor widget */ struct WEdit; diff --git a/src/editor/editcmd.c b/src/editor/editcmd.c index 32ee59b8f..56d72b302 100644 --- a/src/editor/editcmd.c +++ b/src/editor/editcmd.c @@ -45,34 +45,34 @@ #include #include -#include "../src/global.h" +#include "src/global.h" -#include "../lib/tty/tty.h" -#include "../lib/tty/key.h" /* XCTRL */ +#include "lib/tty/tty.h" +#include "lib/tty/key.h" /* XCTRL */ -#include "../lib/mcconfig/mcconfig.h" +#include "lib/mcconfig/mcconfig.h" -#include "../lib/skin/skin.h" +#include "lib/skin/skin.h" -#include "../src/history.h" -#include "../src/widget.h" /* listbox_new() */ -#include "../src/layout.h" /* clr_scr() */ -#include "../src/main.h" /* mc_home source_codepage */ -#include "../src/help.h" /* interactive_display() */ -#include "../src/wtools.h" /* message() */ -#include "../src/charsets.h" -#include "../src/selcodepage.h" -#include "../src/strutil.h" /* utf string functions */ -#include "../src/cmddef.h" +#include "src/history.h" +#include "src/widget.h" /* listbox_new() */ +#include "src/layout.h" /* clr_scr() */ +#include "src/main.h" /* mc_home source_codepage */ +#include "src/help.h" /* interactive_display() */ +#include "src/wtools.h" /* message() */ +#include "src/charsets.h" +#include "src/selcodepage.h" +#include "src/strutil.h" /* utf string functions */ +#include "src/cmddef.h" -#include "../../lib/vfs/mc-vfs/vfs.h" +#include "lib/vfs/mc-vfs/vfs.h" -#include "../src/editor/edit-impl.h" -#include "../src/editor/edit.h" -#include "../src/editor/editlock.h" -#include "../src/editor/edit-widget.h" -#include "../src/editor/editcmd_dialogs.h" -#include "../src/editor/etags.h" +#include "src/editor/edit-impl.h" +#include "src/editor/edit.h" +#include "src/editor/editlock.h" +#include "src/editor/edit-widget.h" +#include "src/editor/editcmd_dialogs.h" +#include "src/editor/etags.h" /* globals: */ diff --git a/src/editor/editcmd_dialogs.c b/src/editor/editcmd_dialogs.c index d899fee02..f01564e4b 100644 --- a/src/editor/editcmd_dialogs.c +++ b/src/editor/editcmd_dialogs.c @@ -26,25 +26,25 @@ #include -#include "../src/global.h" +#include "src/global.h" -#include "../lib/tty/tty.h" -#include "../lib/skin/skin.h" /* INPUT_COLOR */ -#include "../lib/tty/key.h" +#include "lib/tty/tty.h" +#include "lib/skin/skin.h" /* INPUT_COLOR */ +#include "lib/tty/key.h" -#include "../lib/search/search.h" +#include "lib/search/search.h" -#include "../src/dialog.h" -#include "../src/widget.h" -#include "../src/wtools.h" -#include "../src/strutil.h" -#include "../src/main.h" -#include "../src/history.h" -#include "../src/charsets.h" +#include "src/dialog.h" +#include "src/widget.h" +#include "src/wtools.h" +#include "src/strutil.h" +#include "src/main.h" +#include "src/history.h" +#include "src/charsets.h" -#include "../src/editor/edit-widget.h" -#include "../src/editor/etags.h" -#include "../src/editor/editcmd_dialogs.h" +#include "src/editor/edit-widget.h" +#include "src/editor/etags.h" +#include "src/editor/editcmd_dialogs.h" /*** global variables **************************************************/ diff --git a/src/editor/editcmd_dialogs.h b/src/editor/editcmd_dialogs.h index 1b7cfb3d5..6b880b7c0 100644 --- a/src/editor/editcmd_dialogs.h +++ b/src/editor/editcmd_dialogs.h @@ -1,7 +1,7 @@ #ifndef MC__EDITCMD_DIALOGS_H #define MC__EDITCMD_DIALOGS_H -#include "../src/editor/edit.h" +#include "src/editor/edit.h" /*** typedefs(not structures) and defined constants **********************************************/ diff --git a/src/editor/editdraw.c b/src/editor/editdraw.c index 5471352ab..f502981b7 100644 --- a/src/editor/editdraw.c +++ b/src/editor/editdraw.c @@ -38,21 +38,21 @@ #include #include -#include "../src/global.h" +#include "src/global.h" #include "edit-impl.h" #include "edit-widget.h" #define MAX_LINE_LEN 1024 -#include "../lib/tty/tty.h" /* tty_printf() */ -#include "../lib/skin/skin.h" -#include "../lib/tty/key.h" /* is_idle() */ +#include "lib/tty/tty.h" /* tty_printf() */ +#include "lib/skin/skin.h" +#include "lib/tty/key.h" /* is_idle() */ -#include "../src/widget.h" /* buttonbar_redraw() */ -#include "../src/charsets.h" -#include "../src/strutil.h" /* utf string functions */ -#include "../src/main.h" /* source_codepage */ +#include "src/widget.h" /* buttonbar_redraw() */ +#include "src/charsets.h" +#include "src/strutil.h" /* utf string functions */ +#include "src/main.h" /* source_codepage */ /* Text styles */ #define MOD_ABNORMAL (1 << 8) diff --git a/src/editor/editkeys.c b/src/editor/editkeys.c index 78a7f456d..028f94510 100644 --- a/src/editor/editkeys.c +++ b/src/editor/editkeys.c @@ -39,20 +39,20 @@ #include -#include "../src/global.h" +#include "src/global.h" #include "edit-impl.h" #include "edit-widget.h" /* edit->macro_i */ #include "editcmd_dialogs.h" -#include "../lib/tty/tty.h" /* keys */ -#include "../lib/tty/key.h" /* KEY_M_SHIFT */ +#include "lib/tty/tty.h" /* keys */ +#include "lib/tty/key.h" /* KEY_M_SHIFT */ -#include "../src/cmddef.h" /* list of commands */ -#include "../src/keybind.h" /* lookup_keymap_command() */ -#include "../src/charsets.h" /* convert_from_input_c() */ -#include "../src/main.h" /* display_codepage */ -#include "../src/strutil.h" /* str_isutf8 () */ +#include "src/cmddef.h" /* list of commands */ +#include "src/keybind.h" /* lookup_keymap_command() */ +#include "src/charsets.h" /* convert_from_input_c() */ +#include "src/main.h" /* display_codepage */ +#include "src/strutil.h" /* str_isutf8 () */ /* * Translate the keycode into either 'command' or 'char_for_insertion'. diff --git a/src/editor/editlock.c b/src/editor/editlock.c index 9117f1c72..40b5f497c 100644 --- a/src/editor/editlock.c +++ b/src/editor/editlock.c @@ -52,15 +52,15 @@ #include #include -#include "../src/global.h" +#include "src/global.h" #include "edit-impl.h" #include "editlock.h" -#include "../src/wtools.h" /* edit_query_dialog () */ -#include "../src/strutil.h" /* utf string functions */ +#include "src/wtools.h" /* edit_query_dialog () */ +#include "src/strutil.h" /* utf string functions */ -#include "../../lib/vfs/mc-vfs/vfs.h" +#include "lib/vfs/mc-vfs/vfs.h" #define BUF_SIZE 255 #define PID_BUF_SIZE 10 diff --git a/src/editor/editmenu.c b/src/editor/editmenu.c index 3c286e991..818f24a4c 100644 --- a/src/editor/editmenu.c +++ b/src/editor/editmenu.c @@ -39,15 +39,15 @@ #include #include -#include "../src/global.h" +#include "src/global.h" -#include "../lib/tty/tty.h" /* KEY_F */ -#include "../lib/tty/key.h" /* XCTRL */ +#include "lib/tty/tty.h" /* KEY_F */ +#include "lib/tty/key.h" /* XCTRL */ -#include "../src/menu.h" /* menu_entry */ -#include "../src/main.h" /* drop_menus */ -#include "../src/dialog.h" /* cb_ret_t */ -#include "../src/cmddef.h" +#include "src/menu.h" /* menu_entry */ +#include "src/main.h" /* drop_menus */ +#include "src/dialog.h" /* cb_ret_t */ +#include "src/cmddef.h" #include "edit-impl.h" #include "edit-widget.h" diff --git a/src/editor/editoptions.c b/src/editor/editoptions.c index a63b07b1e..c6efcc342 100644 --- a/src/editor/editoptions.c +++ b/src/editor/editoptions.c @@ -31,12 +31,12 @@ #include /* atoi(), NULL */ -#include "../src/global.h" +#include "src/global.h" #include "edit-impl.h" -#include "../src/dialog.h" /* B_CANCEL */ -#include "../src/wtools.h" /* QuickDialog */ -#include "../src/main.h" /* option_tab_spacing */ +#include "src/dialog.h" /* B_CANCEL */ +#include "src/wtools.h" /* QuickDialog */ +#include "src/main.h" /* option_tab_spacing */ #define OPT_DLG_H 16 #define OPT_DLG_W 74 diff --git a/src/editor/editwidget.c b/src/editor/editwidget.c index e0395cd2c..34c34fba9 100644 --- a/src/editor/editwidget.c +++ b/src/editor/editwidget.c @@ -39,18 +39,18 @@ #include #include -#include "../src/global.h" +#include "src/global.h" -#include "../lib/tty/tty.h" /* LINES, COLS */ -#include "../lib/tty/key.h" /* is_idle() */ +#include "lib/tty/tty.h" /* LINES, COLS */ +#include "lib/tty/key.h" /* is_idle() */ #include "edit-impl.h" #include "edit-widget.h" -#include "../src/dialog.h" -#include "../src/widget.h" /* ButtonBar */ -#include "../src/menu.h" /* menubar_new() */ -#include "../src/cmddef.h" +#include "src/dialog.h" +#include "src/widget.h" /* ButtonBar */ +#include "src/menu.h" /* menubar_new() */ +#include "src/cmddef.h" WEdit *wedit; struct WMenuBar *edit_menubar; diff --git a/src/editor/etags.c b/src/editor/etags.c index c6f0525b9..7ce28a304 100644 --- a/src/editor/etags.c +++ b/src/editor/etags.c @@ -38,9 +38,9 @@ #include #include -#include "../src/global.h" -#include "../src/util.h" /* canonicalize_pathname() */ -#include "../src/editor/etags.h" +#include "src/global.h" +#include "src/util.h" /* canonicalize_pathname() */ +#include "src/editor/etags.h" /*** file scope functions **********************************************/ diff --git a/src/editor/etags.h b/src/editor/etags.h index 155acbaff..86c7643be 100644 --- a/src/editor/etags.h +++ b/src/editor/etags.h @@ -2,7 +2,7 @@ #define MC_EDIT_ETAGS_H 1 #include /* size_t */ -#include "../src/global.h" /* include */ +#include "src/global.h" /* include */ #define MAX_WIDTH_DEF_DIALOG 60 /* max width def dialog */ #define MAX_DEFINITIONS 60 /* count found entries show */ diff --git a/src/editor/syntax.c b/src/editor/syntax.c index c5b379d87..9b36d2272 100644 --- a/src/editor/syntax.c +++ b/src/editor/syntax.c @@ -46,15 +46,15 @@ #include #include -#include "../src/global.h" +#include "src/global.h" -#include "../lib/search/search.h" /* search engine */ +#include "lib/search/search.h" /* search engine */ -#include "../lib/skin/skin.h" +#include "lib/skin/skin.h" -#include "../src/main.h" /* mc_home */ -#include "../src/wtools.h" /* message() */ -#include "../src/strutil.h" /* utf string functions */ +#include "src/main.h" /* mc_home */ +#include "src/wtools.h" /* message() */ +#include "src/strutil.h" /* utf string functions */ #include "edit-impl.h" #include "edit-widget.h" diff --git a/src/editor/wordproc.c b/src/editor/wordproc.c index b3405448d..127ef04ea 100644 --- a/src/editor/wordproc.c +++ b/src/editor/wordproc.c @@ -37,11 +37,11 @@ #include -#include "../src/global.h" +#include "src/global.h" #include "edit-impl.h" #include "edit-widget.h" -#include "../src/main.h" /* option_tab_spacing */ +#include "src/main.h" /* option_tab_spacing */ #define tab_width option_tab_spacing diff --git a/src/execute.c b/src/execute.c index 827abd45e..0f508c768 100644 --- a/src/execute.c +++ b/src/execute.c @@ -27,9 +27,9 @@ #include "global.h" -#include "../lib/tty/tty.h" -#include "../lib/tty/key.h" -#include "../lib/tty/win.h" +#include "lib/tty/tty.h" +#include "lib/tty/key.h" +#include "lib/tty/win.h" #include "main.h" #include "cons.saver.h" @@ -39,7 +39,7 @@ #include "wtools.h" #include "panel.h" /* update_panels() */ #include "execute.h" -#include "../../lib/vfs/mc-vfs/vfs.h" +#include "lib/vfs/mc-vfs/vfs.h" static void diff --git a/src/ext.c b/src/ext.c index dac17eb0b..4ad98d5bd 100644 --- a/src/ext.c +++ b/src/ext.c @@ -33,7 +33,7 @@ #include #include "global.h" -#include "../lib/tty/tty.h" +#include "lib/tty/tty.h" #include "user.h" #include "main.h" #include "wtools.h" @@ -42,10 +42,10 @@ #include "history.h" #include "cons.saver.h" #include "layout.h" -#include "../lib/search/search.h" -#include "../src/viewer/mcviewer.h" +#include "lib/search/search.h" +#include "src/viewer/mcviewer.h" -#include "../../lib/vfs/mc-vfs/vfs.h" +#include "lib/vfs/mc-vfs/vfs.h" /* If set, we execute the file command to check the file type */ int use_file_to_check_type = 1; diff --git a/src/file.c b/src/file.c index d802eceb6..2bd59fdf5 100644 --- a/src/file.c +++ b/src/file.c @@ -58,10 +58,10 @@ #include "global.h" -#include "../lib/tty/tty.h" -#include "../lib/tty/key.h" +#include "lib/tty/tty.h" +#include "lib/tty/key.h" -#include "../lib/search/search.h" +#include "lib/search/search.h" #include "setup.h" #include "dialog.h" @@ -71,7 +71,7 @@ #include "widget.h" #include "wtools.h" #include "background.h" /* we_are_background */ -#include "../src/strescape.h" +#include "src/strescape.h" #include "strutil.h" /* Needed for current_panel, other_panel and WTree */ @@ -80,8 +80,8 @@ #include "file.h" #include "filegui.h" #include "tree.h" -#include "../../lib/vfs/mc-vfs/vfs-impl.h" -#include "../../lib/vfs/mc-vfs/vfs.h" +#include "lib/vfs/mc-vfs/vfs-impl.h" +#include "lib/vfs/mc-vfs/vfs.h" /* }}} */ diff --git a/src/filegui.c b/src/filegui.c index 790fad237..123154e1d 100644 --- a/src/filegui.c +++ b/src/filegui.c @@ -78,9 +78,9 @@ #include "global.h" -#include "../lib/tty/key.h" /* tty_get_event */ -#include "../lib/search/search.h" -#include "../lib/vfs/mc-vfs/vfs/vfs.h" +#include "lib/tty/key.h" /* tty_get_event */ +#include "lib/search/search.h" +#include "lib/vfs/mc-vfs/vfs.h" #include "setup.h" /* verbose */ #include "dialog.h" /* do_refresh() */ @@ -93,7 +93,7 @@ #include "filegui.h" #include "util.h" /* strip_password() */ #include "strutil.h" -#include "../src/strescape.h" +#include "src/strescape.h" /* }}} */ typedef enum { diff --git a/src/filenot.c b/src/filenot.c index d702e466f..756abb142 100644 --- a/src/filenot.c +++ b/src/filenot.c @@ -38,7 +38,7 @@ #include "fs.h" #include "util.h" -#include "../../lib/vfs/mc-vfs/vfs.h" +#include "lib/vfs/mc-vfs/vfs.h" static char * get_absolute_name (const char *file) diff --git a/src/fileopctx.c b/src/fileopctx.c index 20f8eb735..8d9749f7a 100644 --- a/src/fileopctx.c +++ b/src/fileopctx.c @@ -34,8 +34,8 @@ #include "global.h" #include "fileopctx.h" -#include "../lib/search/search.h" -#include "../lib/vfs/mc-vfs/vfs/vfs.h" +#include "lib/search/search.h" +#include "lib/vfs/mc-vfs/vfs.h" /** * \fn FileOpContext * file_op_context_new (FileOperation op) diff --git a/src/find.c b/src/find.c index 611f27afa..b85aa3a4d 100644 --- a/src/find.c +++ b/src/find.c @@ -34,13 +34,13 @@ #include "global.h" -#include "../lib/tty/tty.h" -#include "../lib/tty/key.h" -#include "../lib/skin/skin.h" -#include "../lib/search/search.h" -#include "../lib/mcconfig/mcconfig.h" +#include "lib/tty/tty.h" +#include "lib/tty/key.h" +#include "lib/skin/skin.h" +#include "lib/search/search.h" +#include "lib/mcconfig/mcconfig.h" -#include "../../lib/vfs/mc-vfs/vfs.h" +#include "lib/vfs/mc-vfs/vfs.h" #include "setup.h" /* verbose */ #include "strutil.h" diff --git a/src/global.h b/src/global.h index 60e34f0c4..01a998a95 100644 --- a/src/global.h +++ b/src/global.h @@ -87,7 +87,7 @@ #include "util.h" #ifdef USE_MAINTAINER_MODE -#include "../src/logging.h" +#include "src/logging.h" #endif #include "textconf.h" diff --git a/src/help.c b/src/help.c index 40d968633..088bd5b2c 100644 --- a/src/help.c +++ b/src/help.c @@ -53,10 +53,10 @@ #include "global.h" -#include "../lib/tty/tty.h" -#include "../lib/skin/skin.h" -#include "../lib/tty/mouse.h" -#include "../lib/tty/key.h" +#include "lib/tty/tty.h" +#include "lib/skin/skin.h" +#include "lib/tty/mouse.h" +#include "lib/tty/key.h" #include "dialog.h" /* For Dlg_head */ #include "widget.h" /* For Widget */ diff --git a/src/hotlist.c b/src/hotlist.c index aa6ff848e..d31e2fdc5 100644 --- a/src/hotlist.c +++ b/src/hotlist.c @@ -42,14 +42,14 @@ #include "global.h" -#include "../lib/tty/tty.h" /* COLS */ -#include "../lib/skin/skin.h" -#include "../lib/tty/key.h" /* KEY_M_CTRL */ +#include "lib/tty/tty.h" /* COLS */ +#include "lib/skin/skin.h" +#include "lib/tty/key.h" /* KEY_M_CTRL */ #include "dialog.h" #include "widget.h" #include "setup.h" /* For profile_bname */ -#include "../lib/mcconfig/mcconfig.h" /* Load/save directories hotlist */ +#include "lib/mcconfig/mcconfig.h" /* Load/save directories hotlist */ #include "wtools.h" /* QuickDialog */ #include "panel.h" /* current_panel */ #include "main.h" /* update_panels() */ @@ -79,7 +79,7 @@ #define B_MOVE (B_USER + 7) #ifdef ENABLE_VFS -#include "../vfs/gc.h" +#include "lib/vfs/mc-vfs/gc.h" #define B_FREE_ALL_VFS (B_USER + 8) #define B_REFRESH_VFS (B_USER + 9) #endif diff --git a/src/info.c b/src/info.c index b2ddb8a10..d5805ee75 100644 --- a/src/info.c +++ b/src/info.c @@ -26,10 +26,10 @@ #include "global.h" -#include "../lib/tty/tty.h" -#include "../lib/tty/key.h" /* is_idle() */ -#include "../lib/tty/mouse.h" /* Gpm_Event */ -#include "../lib/skin/skin.h" +#include "lib/tty/tty.h" +#include "lib/tty/key.h" /* is_idle() */ +#include "lib/tty/mouse.h" /* Gpm_Event */ +#include "lib/skin/skin.h" #include "dialog.h" #include "widget.h" /* default_proc*/ diff --git a/src/keybind.c b/src/keybind.c index 39cffeff3..b472e4c23 100644 --- a/src/keybind.c +++ b/src/keybind.c @@ -37,9 +37,9 @@ #include "global.h" #include "cmddef.h" /* CK_ cmd name const */ -#include "../lib/tty/win.h" -#include "../lib/tty/key.h" /* KEY_M_ */ -#include "../lib/tty/tty.h" /* keys */ +#include "lib/tty/win.h" +#include "lib/tty/key.h" /* KEY_M_ */ +#include "lib/tty/tty.h" /* keys */ #include "wtools.h" #include "strutil.h" diff --git a/src/layout.c b/src/layout.c index 5e12d5e12..64395e610 100644 --- a/src/layout.c +++ b/src/layout.c @@ -46,13 +46,13 @@ #include "global.h" -#include "../lib/tty/tty.h" -#include "../lib/skin/skin.h" -#include "../lib/tty/key.h" -#include "../lib/tty/mouse.h" -#include "../lib/tty/win.h" /* do_enter_ca_mode() */ +#include "lib/tty/tty.h" +#include "lib/skin/skin.h" +#include "lib/tty/key.h" +#include "lib/tty/mouse.h" +#include "lib/tty/win.h" /* do_enter_ca_mode() */ -#include "../lib/mcconfig/mcconfig.h" +#include "lib/mcconfig/mcconfig.h" #include "dialog.h" #include "widget.h" @@ -70,10 +70,10 @@ #include "cons.saver.h" #include "layout.h" #include "info.h" /* The Info widget */ -#include "../src/viewer/mcviewer.h" /* The view widget */ +#include "src/viewer/mcviewer.h" /* The view widget */ #include "setup.h" /* For save_setup() */ -#include "../../lib/vfs/mc-vfs/vfs.h" /* For vfs_translate_url() */ +#include "lib/vfs/mc-vfs/vfs.h" /* For vfs_translate_url() */ /* Controls the display of the rotating dash on the verbose mode */ int nice_rotating_dash = 1; diff --git a/src/learn.c b/src/learn.c index 5918f88b2..dea9266e2 100644 --- a/src/learn.c +++ b/src/learn.c @@ -36,12 +36,12 @@ #include "global.h" -#include "../lib/tty/tty.h" -#include "../lib/tty/key.h" +#include "lib/tty/tty.h" +#include "lib/tty/key.h" #include "dialog.h" #include "widget.h" -#include "../lib/mcconfig/mcconfig.h" /* Save profile */ +#include "lib/mcconfig/mcconfig.h" /* Save profile */ #include "setup.h" #include "layout.h" /* repaint_screen() */ #include "learn.h" diff --git a/src/logging.c b/src/logging.c index 2f34e6c4c..c23772ea1 100644 --- a/src/logging.c +++ b/src/logging.c @@ -35,7 +35,7 @@ #include "global.h" #include "logging.h" #include "setup.h" -#include "../lib/mcconfig/mcconfig.h" +#include "lib/mcconfig/mcconfig.h" #include "fileloc.h" /*** file scope functions **********************************************/ diff --git a/src/main.c b/src/main.c index cabc69806..d5385bb23 100644 --- a/src/main.c +++ b/src/main.c @@ -41,15 +41,15 @@ #include "global.h" -#include "../lib/tty/tty.h" -#include "../lib/skin/skin.h" -#include "../lib/tty/mouse.h" -#include "../lib/tty/key.h" /* For init_key() */ -#include "../lib/tty/win.h" /* xterm_flag */ +#include "lib/tty/tty.h" +#include "lib/skin/skin.h" +#include "lib/tty/mouse.h" +#include "lib/tty/key.h" /* For init_key() */ +#include "lib/tty/win.h" /* xterm_flag */ -#include "../lib/mcconfig/mcconfig.h" -#include "../src/args.h" -#include "../lib/filehighlight/fhl.h" +#include "lib/mcconfig/mcconfig.h" +#include "src/args.h" +#include "lib/filehighlight/fhl.h" #include "dir.h" #include "dialog.h" @@ -78,7 +78,7 @@ #include "fileloc.h" /* MC_USERCONF_DIR */ #include "user.h" /* user_file_menu_cmd() */ -#include "../../lib/vfs/mc-vfs/vfs.h" /* vfs_translate_url() */ +#include "lib/vfs/mc-vfs/vfs.h" /* vfs_translate_url() */ #include "chmod.h" #include "chown.h" @@ -87,11 +87,11 @@ #include "main.h" #ifdef ENABLE_VFS_SMB -#include "../vfs/smbfs.h" /* smbfs_set_debug() */ +#include "lib/vfs/mc-vfs/smbfs.h" /* smbfs_set_debug() */ #endif /* ENABLE_VFS_SMB */ #ifdef USE_INTERNAL_EDIT -# include "../src/editor/edit.h" +# include "src/editor/edit.h" #endif #ifdef HAVE_CHARSET @@ -99,7 +99,7 @@ #endif /* HAVE_CHARSET */ #ifdef ENABLE_VFS -#include "../vfs/gc.h" +#include "lib/vfs/mc-vfs/gc.h" #endif #include "keybind.h" /* type global_keymap_t */ diff --git a/src/menu.c b/src/menu.c index 1c8ac8b3a..3ee5b9bb4 100644 --- a/src/menu.c +++ b/src/menu.c @@ -28,10 +28,10 @@ #include "global.h" -#include "../lib/tty/tty.h" -#include "../lib/skin/skin.h" -#include "../lib/tty/mouse.h" -#include "../lib/tty/key.h" /* key macros */ +#include "lib/tty/tty.h" +#include "lib/skin/skin.h" +#include "lib/tty/mouse.h" +#include "lib/tty/key.h" /* key macros */ #include "cmddef.h" /* CK_Ignore_Key */ #include "help.h" diff --git a/src/option.c b/src/option.c index d47aa7a9b..f3e49d76c 100644 --- a/src/option.c +++ b/src/option.c @@ -32,13 +32,13 @@ #include "global.h" -#include "../lib/tty/tty.h" +#include "lib/tty/tty.h" #include "dialog.h" #include "widget.h" #include "setup.h" /* For save_setup() */ #include "main.h" -#include "../lib/mcconfig/mcconfig.h" /* For mc_config_save_file */ +#include "lib/mcconfig/mcconfig.h" /* For mc_config_save_file */ #include "strutil.h" #include "panel.h" /* Needed for the externs */ #include "file.h" /* safe_delete */ diff --git a/src/panelize.c b/src/panelize.c index 3a83d0f5b..a2ba91128 100644 --- a/src/panelize.c +++ b/src/panelize.c @@ -35,15 +35,15 @@ #include "global.h" -#include "../lib/skin/skin.h" +#include "lib/skin/skin.h" -#include "../../lib/vfs/mc-vfs/vfs.h" +#include "lib/vfs/mc-vfs/vfs.h" #include "dialog.h" #include "widget.h" #include "wtools.h" /* For common_dialog_repaint() */ #include "setup.h" /* For profile_bname */ -#include "../lib/mcconfig/mcconfig.h" /* Load/save directories panelize */ +#include "lib/mcconfig/mcconfig.h" /* Load/save directories panelize */ #include "dir.h" #include "panel.h" /* current_panel */ #include "layout.h" /* repaint_screen() */ diff --git a/src/screen.c b/src/screen.c index 6b4e064c3..6a1be116d 100644 --- a/src/screen.c +++ b/src/screen.c @@ -33,11 +33,11 @@ #include "global.h" -#include "../lib/tty/tty.h" -#include "../lib/skin/skin.h" -#include "../lib/tty/mouse.h" /* For Gpm_Event */ -#include "../lib/tty/key.h" /* XCTRL and ALT macros */ -#include "../lib/filehighlight/fhl.h" +#include "lib/tty/tty.h" +#include "lib/skin/skin.h" +#include "lib/tty/mouse.h" /* For Gpm_Event */ +#include "lib/tty/key.h" /* XCTRL and ALT macros */ +#include "lib/filehighlight/fhl.h" #include "dir.h" #include "panel.h" @@ -50,7 +50,7 @@ #include "command.h" /* cmdline */ #include "setup.h" /* For loading/saving panel options */ #include "user.h" -#include "../lib/mcconfig/mcconfig.h" +#include "lib/mcconfig/mcconfig.h" #include "execute.h" #include "widget.h" #include "menu.h" /* menubar_visible */ @@ -62,7 +62,7 @@ #include "charsets.h" /* get_codepage_id () */ #include "cmddef.h" /* CK_ cmd name const */ #include "keybind.h" /* global_keymap_t */ -#include "../../lib/vfs/mc-vfs/vfs.h" +#include "lib/vfs/mc-vfs/vfs.h" #define ELEMENTS(arr) ( sizeof(arr) / sizeof((arr)[0]) ) diff --git a/src/setup.c b/src/setup.c index 24f65d87a..794a9afab 100644 --- a/src/setup.c +++ b/src/setup.c @@ -30,19 +30,19 @@ #include "global.h" -#include "../lib/tty/tty.h" -#include "../lib/tty/key.h" -#include "../lib/tty/mouse.h" /* To make view.h happy */ -#include "../../lib/vfs/mc-vfs/vfs.h" +#include "lib/tty/tty.h" +#include "lib/tty/key.h" +#include "lib/tty/mouse.h" /* To make view.h happy */ +#include "lib/vfs/mc-vfs/vfs.h" #include "args.h" #include "dir.h" #include "panel.h" #include "main.h" #include "tree.h" /* xtree_mode */ -#include "../lib/mcconfig/mcconfig.h" +#include "lib/mcconfig/mcconfig.h" #include "setup.h" -#include "../src/viewer/mcviewer.h" /* For the externs */ +#include "src/viewer/mcviewer.h" /* For the externs */ #include "hotlist.h" /* load/save/done hotlist */ #include "panelize.h" /* load/save/done panelize */ #include "layout.h" @@ -54,7 +54,7 @@ #include "wtools.h" #ifdef ENABLE_VFS -#include "../vfs/gc.h" +#include "lib/vfs/mc-vfs/gc.h" #endif #ifdef HAVE_CHARSET @@ -62,15 +62,15 @@ #endif #ifdef USE_NETCODE -# include "../vfs/ftpfs.h" -# include "../vfs/fish.h" +# include "lib/vfs/mc-vfs/ftpfs.h" +# include "lib/vfs/mc-vfs/fish.h" #endif #ifdef USE_INTERNAL_EDIT -# include "../src/editor/edit.h" +# include "src/editor/edit.h" #endif -#include "../src/strutil.h" /* str_isutf8 () */ +#include "src/strutil.h" /* str_isutf8 () */ extern int num_history_items_recorded; diff --git a/src/strescape.c b/src/strescape.c index 07b07a92e..c8e596719 100644 --- a/src/strescape.c +++ b/src/strescape.c @@ -26,7 +26,7 @@ */ #include -#include "../src/strescape.h" +#include "src/strescape.h" /*** global variables ****************************************************************************/ diff --git a/src/strescape.h b/src/strescape.h index 5d69461f7..22847e5e1 100644 --- a/src/strescape.h +++ b/src/strescape.h @@ -3,7 +3,7 @@ #include -#include "../src/global.h" /* */ +#include "src/global.h" /* */ /*** typedefs(not structures) and defined constants **********************************************/ diff --git a/src/subshell.c b/src/subshell.c index f20befc86..0b7442243 100644 --- a/src/subshell.c +++ b/src/subshell.c @@ -48,17 +48,17 @@ #endif /* HAVE_STROPTS_H */ #include "global.h" -#include "../lib/tty/tty.h" /* LINES */ +#include "lib/tty/tty.h" /* LINES */ #include "panel.h" /* current_panel */ #include "wtools.h" /* query_dialog() */ #include "main.h" /* do_update_prompt() */ #include "cons.saver.h" /* handle_console() */ -#include "../lib/tty/key.h" /* XCTRL */ +#include "lib/tty/key.h" /* XCTRL */ #include "subshell.h" #include "strutil.h" #include "fileloc.h" -#include "../../lib/vfs/mc-vfs/vfs.h" +#include "lib/vfs/mc-vfs/vfs.h" #ifndef WEXITSTATUS # define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) diff --git a/src/textconf.c b/src/textconf.c index 671df28b3..bb97009d2 100644 --- a/src/textconf.c +++ b/src/textconf.c @@ -31,7 +31,7 @@ #include "global.h" #include "ecs.h" -#include "../src/textconf.h" +#include "src/textconf.h" #ifdef ENABLE_VFS static const char *const vfs_supported[] = { diff --git a/src/tree.c b/src/tree.c index f5fc9e95e..6bf20d1bd 100644 --- a/src/tree.c +++ b/src/tree.c @@ -41,11 +41,11 @@ #include "global.h" -#include "../lib/tty/tty.h" -#include "../lib/skin/skin.h" -#include "../lib/tty/mouse.h" -#include "../lib/tty/key.h" -#include "../lib/vfs/mc-vfs/vfs.h" +#include "lib/tty/tty.h" +#include "lib/skin/skin.h" +#include "lib/tty/mouse.h" +#include "lib/tty/key.h" +#include "lib/vfs/mc-vfs/vfs.h" #include "wtools.h" /* message() */ #include "dir.h" diff --git a/src/treestore.c b/src/treestore.c index 50a78bc02..efa540be2 100644 --- a/src/treestore.c +++ b/src/treestore.c @@ -49,8 +49,8 @@ #include "global.h" #include "treestore.h" -#include "../lib/mcconfig/mcconfig.h" -#include "../../lib/vfs/mc-vfs/vfs.h" +#include "lib/mcconfig/mcconfig.h" +#include "lib/vfs/mc-vfs/vfs.h" #include "setup.h" #include "fileloc.h" diff --git a/src/user.c b/src/user.c index 4bc86341c..662611be8 100644 --- a/src/user.c +++ b/src/user.c @@ -29,8 +29,8 @@ #include #include "global.h" -#include "../lib/tty/tty.h" -#include "../lib/skin/skin.h" +#include "lib/tty/tty.h" +#include "lib/skin/skin.h" #include "dir.h" #include "panel.h" #include "main.h" @@ -40,17 +40,17 @@ #include "setup.h" #include "history.h" #include "strutil.h" -#include "../lib/search/search.h" +#include "lib/search/search.h" -#include "../../lib/vfs/mc-vfs/vfs.h" +#include "lib/vfs/mc-vfs/vfs.h" -#include "../src/editor/edit.h" /* WEdit, BLOCK_FILE */ +#include "src/editor/edit.h" /* WEdit, BLOCK_FILE */ /* For the simple listbox manager */ #include "dialog.h" #include "widget.h" #include "wtools.h" -#include "../src/viewer/mcviewer.h" /* for default_* externs */ +#include "src/viewer/mcviewer.h" /* for default_* externs */ #define MAX_ENTRIES 16 #define MAX_ENTRY_LEN 60 diff --git a/src/user.h b/src/user.h index 953c01e6b..8d3eccbda 100644 --- a/src/user.h +++ b/src/user.h @@ -6,7 +6,7 @@ #ifndef MC_USER_H #define MC_USER_H -#include "../src/editor/edit.h" +#include "src/editor/edit.h" void user_menu_cmd (WEdit *edit_widget); char *expand_format (WEdit *edit_widget, char c, int quote); diff --git a/src/util.c b/src/util.c index 6d5d63fc4..eba4385dc 100644 --- a/src/util.c +++ b/src/util.c @@ -42,22 +42,22 @@ #include "global.h" -#include "../lib/tty/win.h" /* xterm_flag */ +#include "lib/tty/win.h" /* xterm_flag */ -#include "../lib/search/search.h" +#include "lib/search/search.h" #include "main.h" /* mc_home */ #include "cmd.h" /* guess_message_value */ #include "mountlist.h" #include "timefmt.h" #include "strutil.h" -#include "./lib/mcconfig/mcconfig.h" +#include "lib/mcconfig/mcconfig.h" #include "fileopctx.h" #include "file.h" /* copy_file_file() */ #include "dir.h" #include "fileloc.h" -#include "../../lib/vfs/mc-vfs/vfs.h" +#include "lib/vfs/mc-vfs/vfs.h" #ifdef HAVE_CHARSET #include "charsets.h" diff --git a/src/viewer/Makefile.am b/src/viewer/Makefile.am index 780d4bca3..5ce47b69a 100644 --- a/src/viewer/Makefile.am +++ b/src/viewer/Makefile.am @@ -19,7 +19,7 @@ libmcviewer_la_SOURCES = \ plain.c \ search.c -libmcviewer_la_CFLAGS=-I../ -I$(top_srcdir)/src \ +libmcviewer_la_CFLAGS = -I$(top_srcdir) \ $(GLIB_CFLAGS) $(PCRE_CFLAGS) \ -DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\" diff --git a/src/viewer/actions_cmd.c b/src/viewer/actions_cmd.c index 3e63c36e3..3c8e6d810 100644 --- a/src/viewer/actions_cmd.c +++ b/src/viewer/actions_cmd.c @@ -49,22 +49,22 @@ #include #include -#include "../src/global.h" +#include "src/global.h" -#include "../lib/tty/tty.h" -#include "../lib/tty/key.h" +#include "lib/tty/tty.h" +#include "lib/tty/key.h" -#include "../src/dialog.h" /* cb_ret_t */ -#include "../src/panel.h" -#include "../src/layout.h" -#include "../src/wtools.h" -#include "../src/history.h" -#include "../src/charsets.h" -#include "../src/cmd.h" -#include "../src/execute.h" -#include "../src/help.h" -#include "../src/keybind.h" -#include "../src/cmddef.h" /* CK_ cmd name const */ +#include "src/dialog.h" /* cb_ret_t */ +#include "src/panel.h" +#include "src/layout.h" +#include "src/wtools.h" +#include "src/history.h" +#include "src/charsets.h" +#include "src/cmd.h" +#include "src/execute.h" +#include "src/help.h" +#include "src/keybind.h" +#include "src/cmddef.h" /* CK_ cmd name const */ #include "internal.h" #include "mcviewer.h" diff --git a/src/viewer/coord_cache.c b/src/viewer/coord_cache.c index 1fec69f90..e77530a95 100644 --- a/src/viewer/coord_cache.c +++ b/src/viewer/coord_cache.c @@ -53,8 +53,8 @@ #include /* for g_memmove() */ -#include "../src/global.h" -#include "../lib/tty/tty.h" +#include "src/global.h" +#include "lib/tty/tty.h" #include "internal.h" /*** global variables ****************************************************************************/ diff --git a/src/viewer/datasource.c b/src/viewer/datasource.c index 4e210a3ba..5a7b0b10b 100644 --- a/src/viewer/datasource.c +++ b/src/viewer/datasource.c @@ -56,9 +56,9 @@ #include -#include "../src/global.h" -#include "../src/wtools.h" -#include "../../lib/vfs/mc-vfs/vfs.h" +#include "src/global.h" +#include "src/wtools.h" +#include "lib/vfs/mc-vfs/vfs.h" #include "internal.h" diff --git a/src/viewer/dialogs.c b/src/viewer/dialogs.c index de3bafed7..70bb250cc 100644 --- a/src/viewer/dialogs.c +++ b/src/viewer/dialogs.c @@ -40,14 +40,14 @@ #include #include -#include "../src/global.h" +#include "src/global.h" -#include "../src/search/search.h" +#include "lib/search/search.h" -#include "../src/wtools.h" -#include "../src/history.h" -#include "../src/charsets.h" -#include "../src/strutil.h" +#include "src/wtools.h" +#include "src/history.h" +#include "src/charsets.h" +#include "src/strutil.h" #include "internal.h" diff --git a/src/viewer/display.c b/src/viewer/display.c index 3974442af..bb49439c7 100644 --- a/src/viewer/display.c +++ b/src/viewer/display.c @@ -37,14 +37,14 @@ #include -#include "../src/global.h" -#include "../lib/skin/skin.h" -#include "../lib/tty/tty.h" -#include "../lib/tty/key.h" -#include "../src/strutil.h" -#include "../src/main.h" -#include "../src/dialog.h" /* Dlg_head */ -#include "../src/widget.h" /* WButtonBar */ +#include "src/global.h" +#include "lib/skin/skin.h" +#include "lib/tty/tty.h" +#include "lib/tty/key.h" +#include "src/strutil.h" +#include "src/main.h" +#include "src/dialog.h" /* Dlg_head */ +#include "src/widget.h" /* WButtonBar */ #include "internal.h" #include "mcviewer.h" diff --git a/src/viewer/growbuf.c b/src/viewer/growbuf.c index cf55495e6..067280afe 100644 --- a/src/viewer/growbuf.c +++ b/src/viewer/growbuf.c @@ -38,10 +38,10 @@ #include #include -#include "../src/global.h" -#include "../src/wtools.h" +#include "src/global.h" +#include "src/wtools.h" -#include "../../lib/vfs/mc-vfs/vfs.h" +#include "lib/vfs/mc-vfs/vfs.h" #include "internal.h" diff --git a/src/viewer/hex.c b/src/viewer/hex.c index 8249e76c3..31eaa9a4e 100644 --- a/src/viewer/hex.c +++ b/src/viewer/hex.c @@ -40,14 +40,14 @@ #include #include -#include "../src/global.h" -#include "../lib/tty/tty.h" -#include "../lib/skin/skin.h" -#include "../src/main.h" -#include "../src/wtools.h" -#include "../src/charsets.h" +#include "src/global.h" +#include "lib/tty/tty.h" +#include "lib/skin/skin.h" +#include "src/main.h" +#include "src/wtools.h" +#include "src/charsets.h" -#include "../../lib/vfs/mc-vfs/vfs.h" +#include "lib/vfs/mc-vfs/vfs.h" #include "internal.h" diff --git a/src/viewer/internal.h b/src/viewer/internal.h index 7b82606bc..15b0b436e 100644 --- a/src/viewer/internal.h +++ b/src/viewer/internal.h @@ -6,13 +6,13 @@ #include #include -#include "../src/global.h" +#include "src/global.h" -#include "../lib/search/search.h" +#include "lib/search/search.h" -#include "../src/dialog.h" -#include "../src/widget.h" -#include "../src/keybind.h" /* global_keymap_t */ +#include "src/dialog.h" +#include "src/widget.h" +#include "src/keybind.h" /* global_keymap_t */ /*** typedefs(not structures) and defined constants ********************/ diff --git a/src/viewer/lib.c b/src/viewer/lib.c index 335693dbc..502964321 100644 --- a/src/viewer/lib.c +++ b/src/viewer/lib.c @@ -39,13 +39,13 @@ #include -#include "../src/global.h" -#include "../src/wtools.h" -#include "../src/strutil.h" -#include "../src/main.h" -#include "../src/charsets.h" -#include "../src/selcodepage.h" -#include "../vfs/vfs.h" +#include "src/global.h" +#include "src/wtools.h" +#include "src/strutil.h" +#include "src/main.h" +#include "src/charsets.h" +#include "src/selcodepage.h" +#include "lib/vfs/mc-vfs/vfs.h" #include "internal.h" #include "mcviewer.h" diff --git a/src/viewer/mcviewer.c b/src/viewer/mcviewer.c index 9dc04c2b0..7d7c090f6 100644 --- a/src/viewer/mcviewer.c +++ b/src/viewer/mcviewer.c @@ -39,15 +39,15 @@ #include #include -#include "../src/global.h" -#include "../lib/tty/tty.h" -#include "../src/strutil.h" -#include "../src/main.h" -#include "../src/charsets.h" -#include "../src/main-widgets.h" /* the_menubar */ -#include "../src/menu.h" /* menubar_visible */ -#include "../src/widget.h" -#include "../vfs/vfs.h" +#include "src/global.h" +#include "lib/tty/tty.h" +#include "src/strutil.h" +#include "src/main.h" +#include "src/charsets.h" +#include "src/main-widgets.h" /* the_menubar */ +#include "src/menu.h" /* menubar_visible */ +#include "src/widget.h" +#include "lib/vfs/mc-vfs/vfs.h" #include "internal.h" #include "mcviewer.h" diff --git a/src/viewer/move.c b/src/viewer/move.c index 8e8da7950..47c5531ee 100644 --- a/src/viewer/move.c +++ b/src/viewer/move.c @@ -53,8 +53,8 @@ #include -#include "../src/global.h" -#include "../lib/tty/tty.h" +#include "src/global.h" +#include "lib/tty/tty.h" #include "internal.h" /*** global variables ****************************************************************************/ diff --git a/src/viewer/nroff.c b/src/viewer/nroff.c index 39d9e3dbe..47aa3f9f0 100644 --- a/src/viewer/nroff.c +++ b/src/viewer/nroff.c @@ -37,11 +37,11 @@ #include -#include "../src/global.h" -#include "../src/main.h" -#include "../src/charsets.h" -#include "../lib/tty/tty.h" -#include "../lib/skin/skin.h" +#include "src/global.h" +#include "src/main.h" +#include "src/charsets.h" +#include "lib/tty/tty.h" +#include "lib/skin/skin.h" #include "internal.h" diff --git a/src/viewer/plain.c b/src/viewer/plain.c index 9a79fdc10..eab7cd434 100644 --- a/src/viewer/plain.c +++ b/src/viewer/plain.c @@ -38,14 +38,14 @@ #include -#include "../lib/tty/tty.h" +#include "lib/tty/tty.h" -#include "../lib/skin/skin.h" +#include "lib/skin/skin.h" -#include "../src/global.h" -#include "../src/main.h" -#include "../src/charsets.h" -#include "../src/util.h" /* is_printable() */ +#include "src/global.h" +#include "src/main.h" +#include "src/charsets.h" +#include "src/util.h" /* is_printable() */ #include "mcviewer.h" /* mcview_show_eof */ #include "internal.h" diff --git a/src/viewer/search.c b/src/viewer/search.c index 751ab017d..776470ede 100644 --- a/src/viewer/search.c +++ b/src/viewer/search.c @@ -37,10 +37,10 @@ #include -#include "../src/global.h" -#include "../src/setup.h" -#include "../src/wtools.h" -#include "../lib/tty/tty.h" +#include "src/global.h" +#include "src/setup.h" +#include "src/wtools.h" +#include "lib/tty/tty.h" #include "internal.h" /*** global variables ****************************************************************************/ diff --git a/src/widget.c b/src/widget.c index e2ddeb1fc..e5fc0b347 100644 --- a/src/widget.c +++ b/src/widget.c @@ -42,13 +42,13 @@ #include "global.h" -#include "../lib/tty/tty.h" -#include "../lib/skin/skin.h" -#include "../lib/tty/mouse.h" -#include "../lib/tty/key.h" /* XCTRL and ALT macros */ -#include "../lib/mcconfig/mcconfig.h" /* for history loading and saving */ +#include "lib/tty/tty.h" +#include "lib/skin/skin.h" +#include "lib/tty/mouse.h" +#include "lib/tty/key.h" /* XCTRL and ALT macros */ +#include "lib/mcconfig/mcconfig.h" /* for history loading and saving */ -#include "../../lib/vfs/mc-vfs/vfs.h" +#include "lib/vfs/mc-vfs/vfs.h" #include "dialog.h" #include "widget.h" diff --git a/src/wtools.c b/src/wtools.c index de0faebea..7373b40ef 100644 --- a/src/wtools.c +++ b/src/wtools.c @@ -35,10 +35,10 @@ #include "global.h" -#include "../lib/tty/tty.h" -#include "../lib/tty/key.h" /* tty_getch() */ +#include "lib/tty/tty.h" +#include "lib/tty/key.h" /* tty_getch() */ -#include "../lib/skin/skin.h" /* INPUT_COLOR */ +#include "lib/skin/skin.h" /* INPUT_COLOR */ #include "dialog.h" #include "widget.h"