Browse Source

Moved strecape.[ch] into library

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
Slava Zanko 15 years ago
parent
commit
e07ba16b3b

+ 1 - 0
lib/Makefile.am

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

+ 4 - 2
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 ****************************************************************************/

+ 1 - 1
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"

+ 1 - 1
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"

+ 1 - 1
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"

+ 0 - 0
src/strescape.h → lib/strescape.h


+ 1 - 0
lib/strutil/Makefile.am

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

+ 0 - 0
src/strescape.c → lib/strutil/strescape.c


+ 1 - 1
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"

+ 0 - 4
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) \

Some files were not shown because too many files changed in this diff