Move src/cons.saver into src/consaver/* subdir

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

configure.ac

@@ -575,6 +575,7 @@ misc/skins/Makefile
 misc/mc.ext
 
 src/Makefile
+src/consaver/Makefile
 src/editor/Makefile
 src/viewer/Makefile
 

lib/tty/key.c

@@ -54,7 +54,7 @@
 
 #include "src/main.h"
 #include "src/layout.h"   /* winch_flag, mc_refresh() */
-#include "src/cons.saver.h"
+#include "src/consaver/cons.saver.h"
 
 
 #ifdef HAVE_TEXTMODE_X11_SUPPORT

lib/tty/win.c

@@ -35,7 +35,7 @@
 #include "lib/global.h"
 #include "tty.h"  /* tty_gotoyx, tty_print_char */
 #include "win.h"
-#include "src/cons.saver.h"       /* console_flag */
+#include "src/consaver/cons.saver.h"       /* console_flag */
 
 /*** global variables **************************************************/
 

src/Makefile.am

@@ -4,6 +4,17 @@ if USE_EDIT
 SUBDIRS += editor
 endif
 
+
+AM_CPPFLAGS = -DDATADIR=\""$(pkgdatadir)/"\" \
+	-DLOCALEDIR=\""$(localedir)"\" \
+	-DSYSCONFDIR=\""$(sysconfdir)/@PACKAGE@/"\"
+
+
+if CONS_SAVER
+SUBDIRS += consaver
+AM_CPPFLAGS += -DSAVERDIR=\""$(pkglibexecdir)"\"
+endif
+
 AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) $(PCRE_CFLAGS)
 
 localedir = $(datadir)/locale
@@ -11,24 +22,10 @@ pkglibexecdir =		$(libexecdir)/@PACKAGE@
 
 bin_PROGRAMS = mc mcmfmt
 
-
-if CONS_SAVER
-pkglibexec_PROGRAMS = cons.saver
-AM_CPPFLAGS = -DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\" \
-	-DSAVERDIR=\""$(pkglibexecdir)"\" \
-	-DSYSCONFDIR=\""$(sysconfdir)/@PACKAGE@/"\"
-else
-AM_CPPFLAGS = -DDATADIR=\""$(pkgdatadir)/"\" \
-	-DLOCALEDIR=\""$(localedir)"\" \
-	-DSYSCONFDIR=\""$(sysconfdir)/@PACKAGE@/"\"
-endif
-
 noinst_PROGRAMS = man2hlp
 
 mcmfmt_SOURCES = mfmt.c
 
-cons_saver_SOURCES = cons.saver.c
-
 man2hlp_SOURCES = man2hlp.c
 
 man2hlp_LDADD = \
@@ -67,7 +64,7 @@ SRC_mc_widgets = \
 	wtools.c wtools.h
 
 SRC_mc_conssaver = \
-	cons.handler.c cons.saver.h
+	cons.handler.c consaver/cons.saver.h
 
 SRC_mc_options = \
 	learn.c learn.h \

src/cmd.c

@@ -65,7 +65,7 @@
 #include "hotlist.h"		/* hotlist_cmd() */
 #include "tree.h"		/* tree_chdir() */
 #include "subshell.h"		/* use_subshell */
-#include "cons.saver.h"		/* console_flag */
+#include "consaver/cons.saver.h"		/* console_flag */
 #include "dialog.h"		/* Widget */
 #include "wtools.h"		/* message() */
 #include "main.h"		/* change_panel() */

src/cons.handler.c

@@ -40,7 +40,7 @@
 #include "lib/skin.h"		/* tty_set_normal_attrs */
 #include "lib/tty/win.h"
 
-#include "cons.saver.h"
+#include "consaver/cons.saver.h"
 
 signed char console_flag = 0;
 

src/consaver/Makefile.am

@@ -0,0 +1,9 @@
+pkglibexecdir =		$(libexecdir)/@PACKAGE@
+
+pkglibexec_PROGRAMS = cons.saver
+
+cons_saver_SOURCES = cons.saver.c
+
+cons_saver_CFLAGS= -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CFLAGS)
+
+cons_saver_LDADD = $(GLIB_LIBS) $(PCRE_LIBS)

src/execute.c

@@ -32,7 +32,7 @@
 #include "lib/tty/win.h"
 
 #include "main.h"
-#include "cons.saver.h"
+#include "consaver/cons.saver.h"
 #include "subshell.h"
 #include "layout.h"
 #include "dialog.h"

src/ext.c

@@ -40,7 +40,7 @@
 #include "ext.h"
 #include "execute.h"
 #include "history.h"
-#include "cons.saver.h"
+#include "consaver/cons.saver.h"
 #include "layout.h"
 #include "lib/search.h"
 #include "src/viewer/mcviewer.h"

src/layout.c

@@ -66,7 +66,7 @@
 /* Needed for the extern declarations of integer parameters */
 #include "dir.h"
 #include "panel.h"		/* The Panel widget */
-#include "cons.saver.h"
+#include "consaver/cons.saver.h"
 #include "layout.h"
 #include "info.h"		/* The Info widget */
 #include "src/viewer/mcviewer.h"     /* The view widget */

src/main.c

@@ -72,7 +72,7 @@
 #include "option.h"
 #include "tree.h"
 #include "treestore.h"
-#include "cons.saver.h"
+#include "consaver/cons.saver.h"
 #include "subshell.h"
 #include "setup.h"		/* save_setup() */
 #include "boxes.h"		/* sort_box() */

src/subshell.c

@@ -57,7 +57,7 @@
 #include "panel.h"	/* current_panel */
 #include "wtools.h"	/* query_dialog() */
 #include "main.h"	/* do_update_prompt() */
-#include "cons.saver.h"	/* handle_console() */
+#include "consaver/cons.saver.h"	/* handle_console() */
 #include "subshell.h"
 
 #ifndef WEXITSTATUS