Moved charsets.[ch] from src to lib directory

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

lib/Makefile.am

@@ -32,6 +32,9 @@ if USE_MAINTAINER_MODE
 libmc_la_SOURCES += logging.c logging.h
 endif
 
+if CHARSET
+libmc_la_SOURCES += charsets.c charsets.h
+endif
 
 libmc_la_CFLAGS= $(GLIB_CFLAGS) -I$(top_srcdir) $(PCRE_CFLAGS)
 

lib/charsets.c

@@ -32,9 +32,9 @@
 #include "lib/global.h"
 #include "lib/strutil.h"        /* utf-8 functions */
 #include "lib/fileloc.h"
+#include "lib/charsets.h"
 
-#include "charsets.h"
-#include "main.h"
+#include "src/main.h"
 
 /*** global variables ****************************************************************************/
 

lib/search/glob.c

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

lib/search/hex.c

@@ -34,7 +34,7 @@
 #include "lib/search.h"
 #include "lib/strescape.h"
 
-#include "src/charsets.h"
+#include "lib/charsets.h"
 
 #include "internal.h"
 

lib/search/lib.c

@@ -35,7 +35,7 @@
 #include "lib/search.h"
 
 #include "internal.h"
-#include "src/charsets.h"
+#include "lib/charsets.h"
 
 /*** global variables ****************************************************************************/
 

lib/search/normal.c

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

lib/search/regex.c

@@ -34,7 +34,7 @@
 #include "lib/search.h"
 #include "lib/strescape.h"
 
-#include "src/charsets.h"
+#include "lib/charsets.h"
 
 #include "internal.h"
 

lib/search/search.c

@@ -34,7 +34,7 @@
 #include "lib/strutil.h"
 #include "lib/search.h"
 
-#include "src/charsets.h"
+#include "lib/charsets.h"
 
 #include "internal.h"
 

lib/utilunix.c

@@ -59,7 +59,7 @@
 
 #include "src/execute.h"
 #ifdef HAVE_CHARSET
-#include "src/charsets.h"
+#include "charsets.h"
 #endif
 
 /*** global variables ****************************************************************************/

lib/vfs/mc-vfs/vfs.c

@@ -56,7 +56,7 @@
 #include "lib/widget.h"         /* message() */
 
 #ifdef HAVE_CHARSET
-#include "src/charsets.h"
+#include "lib/charsets.h"
 #endif
 #include "src/main.h"           /* cd_symlinks */
 

src/Makefile.am

@@ -33,7 +33,7 @@ if USE_DIFF
 DIFFLIB = diffviewer/libdiffviewer.la
 endif
 
-SRC_charset = charsets.c charsets.h selcodepage.c selcodepage.h
+SRC_charset = selcodepage.c selcodepage.h
 
 if CHARSET
     SRC_USE_charset=$(SRC_charset)

src/boxes.c

@@ -63,7 +63,7 @@
 #include "background.h"         /* task_list */
 
 #ifdef HAVE_CHARSET
-#include "charsets.h"
+#include "lib/charsets.h"
 #include "selcodepage.h"
 #endif
 

src/diffviewer/search.c

@@ -32,9 +32,9 @@
 #include "lib/strutil.h"
 #include "lib/tty/key.h"
 #include "lib/widget.h"
+#include "lib/charsets.h"
 
 #include "src/history.h"
-#include "src/charsets.h"
 
 #include "internal.h"
 

src/diffviewer/ydiff.c

@@ -41,12 +41,12 @@
 #include "lib/vfs/mc-vfs/vfs.h" /* mc_opendir, mc_readdir, mc_closedir, */
 #include "lib/util.h"
 #include "lib/widget.h"
+#include "lib/charsets.h"
 
 #include "src/cmddef.h"
 #include "src/keybind.h"
 #include "src/cmd.h"
 #include "src/help.h"
-#include "src/charsets.h"
 #include "src/history.h"
 #include "src/panel.h"          /* Needed for current_panel and other_panel */
 #include "src/layout.h"         /* Needed for get_current_index and get_other_panel */

src/editor/edit.c

@@ -51,10 +51,10 @@
 #include "lib/timefmt.h"        /* time formatting */
 #include "lib/lock.h"
 #include "lib/widget.h"
+#include "lib/charsets.h"       /* get_codepage_id */
 
 #include "src/cmd.h"            /* view_other_cmd() */
 #include "src/user.h"           /* user_menu_cmd() */
-#include "src/charsets.h"       /* get_codepage_id */
 #include "src/main.h"           /* source_codepage */
 #include "src/setup.h"          /* option_tab_spacing */
 #include "src/learn.h"          /* learn_keys */

src/editor/editcmd.c

@@ -55,13 +55,13 @@
 #include "lib/util.h"           /* tilde_expand() */
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/widget.h"
+#include "lib/charsets.h"
 
 #include "src/history.h"
 #include "src/layout.h"         /* clr_scr() */
 #include "src/main.h"           /* mc_home, midnight_shutdown */
 #include "src/setup.h"          /* option_tab_spacing */
 #include "src/help.h"           /* interactive_display() */
-#include "src/charsets.h"
 #include "src/selcodepage.h"
 #include "src/cmddef.h"
 #include "src/clipboard.h"      /* copy_file_to_ext_clip, paste_to_file_from_ext_clip */

src/editor/editcmd_dialogs.c

@@ -33,10 +33,10 @@
 #include "lib/search.h"
 #include "lib/strutil.h"
 #include "lib/widget.h"
+#include "lib/charsets.h"
 
 #include "src/main.h"
 #include "src/history.h"
-#include "src/charsets.h"
 
 #include "src/editor/edit-widget.h"
 #include "src/editor/etags.h"

src/editor/editdraw.c

@@ -45,8 +45,8 @@
 #include "lib/strutil.h"        /* utf string functions */
 #include "lib/util.h"           /* is_printable() */
 #include "lib/widget.h"         /* buttonbar_redraw() */
+#include "lib/charsets.h"
 
-#include "src/charsets.h"
 #include "src/main.h"           /* source_codepage */
 #include "src/setup.h"          /* edit_tab_spacing */
 

src/editor/editkeys.c

@@ -44,6 +44,7 @@
 #include "lib/tty/key.h"        /* KEY_M_SHIFT */
 #include "lib/strutil.h"        /* str_isutf8 () */
 #include "lib/util.h"           /* is_printable() */
+#include "lib/charsets.h"       /* convert_from_input_c() */
 
 #include "edit-impl.h"
 #include "edit-widget.h"        /* edit->macro_i */
@@ -51,7 +52,6 @@
 
 #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 */
 
 /*** global variables ****************************************************************************/

src/ext.c

@@ -39,6 +39,7 @@
 #include "lib/util.h"
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/widget.h"
+#include "lib/charsets.h"           /* get_codepage_index */
 
 #include "consaver/cons.saver.h"
 #include "viewer/mcviewer.h"
@@ -49,7 +50,6 @@
 #include "history.h"
 #include "layout.h"
 #ifdef HAVE_CHARSET
-#include "charsets.h"           /* get_codepage_index */
 #include "selcodepage.h"        /* do_set_codepage */
 #endif
 #include "ext.h"

src/main.c

@@ -96,7 +96,7 @@
 #endif
 
 #ifdef HAVE_CHARSET
-#include "charsets.h"
+#include "lib/charsets.h"
 #include "selcodepage.h"
 #endif /* HAVE_CHARSET */
 

src/screen.c

@@ -45,6 +45,9 @@
 #include "lib/timefmt.h"
 #include "lib/util.h"
 #include "lib/widget.h"
+#ifdef HAVE_CHARSET
+#include "lib/charsets.h"           /* get_codepage_id () */
+#endif
 
 #include "dir.h"
 #include "panel.h"
@@ -61,9 +64,6 @@
 #include "main.h"
 #include "mountlist.h"          /* my_statfs */
 #include "selcodepage.h"        /* select_charset (), SELECT_CHARSET_NO_TRANSLATE */
-#ifdef HAVE_CHARSET
-#include "charsets.h"           /* get_codepage_id () */
-#endif
 #include "cmddef.h"             /* CK_ cmd name const */
 #include "keybind.h"            /* global_keymap_t */
 

src/selcodepage.c

@@ -30,8 +30,8 @@
 
 #include "lib/global.h"
 #include "lib/widget.h"
+#include "lib/charsets.h"
 
-#include "charsets.h"
 #include "selcodepage.h"
 #include "main.h"
 

src/setup.c

@@ -47,6 +47,9 @@
 
 #include "lib/util.h"
 #include "lib/widget.h"
+#ifdef HAVE_CHARSET
+#include "lib/charsets.h"
+#endif
 
 #include "args.h"
 #include "dir.h"
@@ -60,9 +63,6 @@
 #include "file.h"               /* safe_delete */
 #include "keybind.h"            /* lookup_action */
 
-#ifdef HAVE_CHARSET
-#include "charsets.h"
-#endif
 
 #ifdef USE_INTERNAL_EDIT
 #include "src/editor/edit.h"

src/viewer/actions_cmd.c

@@ -56,11 +56,11 @@
 #include "lib/lock.h"           /* lock_file() */
 #include "lib/util.h"
 #include "lib/widget.h"
+#include "lib/charsets.h"
 
 #include "src/panel.h"
 #include "src/layout.h"
 #include "src/history.h"
-#include "src/charsets.h"
 #include "src/cmd.h"
 #include "src/execute.h"
 #include "src/help.h"

src/viewer/dialogs.c

@@ -44,9 +44,9 @@
 #include "lib/search.h"
 #include "lib/strutil.h"
 #include "lib/widget.h"
+#include "lib/charsets.h"
 
 #include "src/history.h"
-#include "src/charsets.h"
 
 #include "internal.h"
 

src/viewer/display.c

@@ -45,8 +45,8 @@
 #include "lib/strutil.h"
 #include "lib/util.h"
 #include "lib/widget.h"
+#include "lib/charsets.h"
 
-#include "src/charsets.h"
 #include "src/setup.h"          /* panels_options */
 #include "src/main.h"           /* source_codepage */
 

src/viewer/hex.c

@@ -47,9 +47,9 @@
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/util.h"
 #include "lib/widget.h"
+#include "lib/charsets.h"
 
 #include "src/main.h"
-#include "src/charsets.h"
 
 #include "internal.h"
 

src/viewer/lib.c

@@ -46,9 +46,9 @@
 #include "lib/util.h"           /* save_file_position() */
 #include "lib/lock.h"           /* unlock_file() */
 #include "lib/widget.h"
+#include "lib/charsets.h"
 
 #include "src/main.h"
-#include "src/charsets.h"
 #include "src/selcodepage.h"
 
 #include "internal.h"

src/viewer/mcviewer.c

@@ -46,9 +46,9 @@
 #include "lib/strutil.h"
 #include "lib/util.h"           /* load_file_position() */
 #include "lib/widget.h"
+#include "lib/charsets.h"
 
 #include "src/main.h"
-#include "src/charsets.h"
 #include "src/layout.h"         /* menubar_visible */
 #include "src/main-widgets.h"   /* the_menubar */
 

src/viewer/nroff.c

@@ -40,10 +40,10 @@
 #include "lib/global.h"
 #include "lib/tty/tty.h"
 #include "lib/skin.h"
+#include "lib/charsets.h"
 
 #include "src/main.h"           /* utf8_display */
 #include "src/setup.h"          /* option_tab_spacing */
-#include "src/charsets.h"
 
 #include "internal.h"
 

src/viewer/plain.c

@@ -42,10 +42,10 @@
 #include "lib/tty/tty.h"
 #include "lib/skin.h"
 #include "lib/util.h"           /* is_printable() */
+#include "lib/charsets.h"
 
 #include "src/main.h"           /* utf8_display */
 #include "src/setup.h"          /* option_tab_spacing */
-#include "src/charsets.h"
 
 #include "internal.h"
 #include "mcviewer.h"           /* mcview_show_eof */