Moved strecape.[ch] into library

Signed-off-by: Slava Zanko <slavazanko@gmail.com>

lib/Makefile.am

@@ -6,6 +6,7 @@ SUBLIB_includes = \
 	filehighlight.h \
 	mcconfig.h \
 	search.h \
+	strescape.h \
 	strutil.h
 
 SRC_mc_utils = \

lib/filehighlight/ini-file-read.c

@@ -29,11 +29,13 @@
 #include <string.h>
 
 #include "lib/global.h"
-#include "src/main.h"
 #include "lib/fileloc.h"
-#include "src/strescape.h"
+#include "lib/strescape.h"
 #include "lib/skin.h"
 #include "lib/filehighlight.h"
+
+#include "src/main.h"
+
 #include "internal.h"
 
 /*** global variables ****************************************************************************/

lib/search/glob.c

@@ -31,8 +31,8 @@
 #include "lib/global.h"
 #include "lib/strutil.h"
 #include "lib/search.h"
+#include "lib/strescape.h"
 
-#include "src/strescape.h"
 #include "src/charsets.h"
 
 #include "internal.h"

lib/search/hex.c

@@ -32,8 +32,8 @@
 #include "lib/global.h"
 #include "lib/strutil.h"
 #include "lib/search.h"
+#include "lib/strescape.h"
 
-#include "src/strescape.h"
 #include "src/charsets.h"
 
 #include "internal.h"

lib/search/regex.c

@@ -32,8 +32,8 @@
 #include "lib/global.h"
 #include "lib/strutil.h"
 #include "lib/search.h"
+#include "lib/strescape.h"
 
-#include "src/strescape.h"
 #include "src/charsets.h"
 
 #include "internal.h"

lib/strutil/Makefile.am

@@ -1,6 +1,7 @@
 noinst_LTLIBRARIES = libmcstrutil.la
 
 libmcstrutil_la_SOURCES = \
+	strescape.c \
 	strutil8bit.c \
 	strutilascii.c \
 	strutil.c \

lib/vfs/mc-vfs/fish.c

@@ -55,11 +55,11 @@
 #include "lib/global.h"
 #include "lib/fs.h"
 #include "lib/tty/tty.h"	/* enable/disable interrupt key */
+#include "lib/strescape.h"
 #include "lib/unixcompat.h"
 
 #include "src/wtools.h"	/* message() */
 #include "src/main.h"	/* print_vfs_message */
-#include "src/strescape.h"
 #include "utilvfs.h"
 #include "xdirentry.h"
 #include "vfs.h"

src/Makefile.am

@@ -71,9 +71,6 @@ SRC_mc_widgets = \
 	widget.c widget.h \
 	wtools.c wtools.h
 
-SRC_mc_strutils = \
-	strescape.c strescape.h
-
 SRC_mc_conssaver = \
 	cons.handler.c cons.saver.h
 
@@ -93,7 +90,6 @@ mc_SOURCES = \
 	$(SRC_USE_maintainer) \
 	$(SRC_USE_charset) \
 	$(SRC_mc_widgets) \
-	$(SRC_mc_strutils) \
 	$(SRC_mc_conssaver) \
 	$(SRC_mc_options) \
 	$(SRC_mc_keybind) \

src/command.c

@@ -35,6 +35,8 @@
 #include "lib/global.h"		/* home_dir */
 #include "lib/tty/tty.h"
 #include "lib/vfs/mc-vfs/vfs.h"
+#include "lib/strescape.h"
+
 #include "widget.h"		/* WInput */
 #include "command.h"
 #include "wtools.h"		/* message () */
@@ -46,7 +48,6 @@
 #include "tree.h"		/* for tree_chdir */
 #include "lib/skin.h"		/* DEFAULT_COLOR */
 #include "execute.h"		/* shell_execute */
-#include "src/strescape.h"
 
 /* This holds the command line */
 WInput *cmdline;

src/complete.c

@@ -41,13 +41,13 @@
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"		/* XCTRL and ALT macros */
 #include "lib/vfs/mc-vfs/vfs.h"
+#include "lib/strescape.h"
 #include "lib/strutil.h"
 
 #include "dialog.h"
 #include "widget.h"
 #include "wtools.h"
 #include "main.h"		/* show_all_if_ambiguous */
-#include "src/strescape.h"
 
 typedef char *CompletionFunction (const char * text, int state, INPUT_COMPLETE_FLAGS flags);
 

src/file.c

@@ -62,6 +62,7 @@
 #include "lib/search.h"
 #include "lib/vfs/mc-vfs/vfs-impl.h"
 #include "lib/vfs/mc-vfs/vfs.h"
+#include "lib/strescape.h"
 #include "lib/strutil.h"
 
 #include "setup.h"
@@ -72,7 +73,6 @@
 #include "widget.h"
 #include "wtools.h"
 #include "background.h"		/* we_are_background */
-#include "src/strescape.h"
 
 /* Needed for current_panel, other_panel and WTree */
 #include "dir.h"

src/filegui.c

@@ -81,6 +81,7 @@
 #include "lib/tty/key.h"		/* tty_get_event */
 #include "lib/search.h"
 #include "lib/vfs/mc-vfs/vfs.h"
+#include "lib/strescape.h"
 #include "lib/strutil.h"
 
 #include "setup.h"		/* verbose */
@@ -92,7 +93,6 @@
 #include "panel.h"		/* current_panel */
 #include "fileopctx.h"		/* FILE_CONT */
 #include "filegui.h"
-#include "src/strescape.h"
 
 /* }}} */
 typedef enum {

src/learn.c

@@ -39,6 +39,7 @@
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"
 #include "lib/mcconfig.h"	/* Save profile */
+#include "lib/strescape.h"
 #include "lib/strutil.h"
 
 #include "dialog.h"
@@ -47,7 +48,6 @@
 #include "layout.h"			/* repaint_screen() */
 #include "learn.h"
 #include "wtools.h"
-#include "strescape.h"
 
 #define UX		4
 #define UY		3