Reorganization of sources. Part 1.

* moved src/global.h into lib/global.h
 * moved glibcompat.[ch] from ./src/ into ./lib/
 * moved fs.h from ./src/ into ./lib/

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

lib/Makefile.am

@@ -2,16 +2,21 @@ SUBDIRS = filehighlight mcconfig search skin tty vfs
 
 noinst_LTLIBRARIES = libmc.la
 
-libmc_la_SOURCES =
+libmc_la_SOURCES = \
+	fs.h \
+	glibcompat.c glibcompat.h \
+	global.h
 
-libmc_la_CFLAGS=
+
+libmc_la_CFLAGS= $(GLIB_CFLAGS) -I$(top_srcdir) $(PCRE_CFLAGS)
 
 libmc_la_LIBADD = \
 	filehighlight/libmcfilehighlight.la \
 	mcconfig/libmcconfig.la \
 	search/libsearch.la \
 	skin/libmcskin.la \
-	tty/libmctty.la
+	tty/libmctty.la \
+	$(INTLLIBS) $(MCLIBS) $(SLANGLIB) $(LIBICONV) $(GLIB_LIBS)
 
 if ENABLE_VFS
 libmc_la_LIBADD += vfs/mc-vfs/libvfs-mc.la

lib/filehighlight/common.c

@@ -28,8 +28,8 @@
 #include <config.h>
 
 
-#include "src/global.h"
-#include "../lib/filehighlight/fhl.h"
+#include "lib/global.h"
+#include "lib/filehighlight/fhl.h"
 #include "internal.h"
 
 /*** global variables ****************************************************************************/

lib/filehighlight/fhl.h

@@ -1,8 +1,8 @@
 #ifndef MC__FILEHIGHLIGHT_H
 #define MC__FILEHIGHLIGHT_H
 
-#include "../../lib/mcconfig/mcconfig.h"
-#include "../../lib/search/search.h"
+#include "lib/mcconfig/mcconfig.h"
+#include "lib/search/search.h"
 #include "src/dir.h"
 
 /*** typedefs(not structures) and defined constants **********************************************/

lib/filehighlight/get-color.c

@@ -29,10 +29,9 @@
 #include <string.h>
 
 
-#include "src/global.h"
-#include "src/util.h"
-#include "../lib/skin/skin.h"
-#include "../lib/filehighlight/fhl.h"
+#include "lib/global.h"
+#include "lib/skin/skin.h"
+#include "lib/filehighlight/fhl.h"
 #include "internal.h"
 
 /*** global variables ****************************************************************************/

lib/filehighlight/ini-file-read.c

@@ -28,12 +28,11 @@
 #include <config.h>
 #include <string.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "src/main.h"
 #include "src/fileloc.h"
 #include "src/strescape.h"
-#include "../lib/skin/skin.h"
-#include "src/util.h"
+#include "lib/skin/skin.h"
 #include "fhl.h"
 #include "internal.h"
 

lib/global.h

@@ -84,7 +84,7 @@
 #endif /* !ENABLE_NLS */
 
 #include "fs.h"
-#include "util.h"
+#include "src/util.h"
 
 #ifdef USE_MAINTAINER_MODE
 #include "src/logging.h"

lib/mcconfig/common.c

@@ -26,10 +26,9 @@
 #include <errno.h> /* extern int errno */
 
 
-#include "src/global.h"
+#include "lib/global.h"
 
-#include "../../lib/vfs/mc-vfs/vfs.h"      /* mc_stat */
-#include "src/util.h"
+#include "lib/vfs/mc-vfs/vfs.h"      /* mc_stat */
 
 #include "mcconfig.h"
 

lib/mcconfig/get.c

@@ -19,7 +19,7 @@
 
 #include <config.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "mcconfig.h"
 #include "src/strutil.h"

lib/mcconfig/set.c

@@ -19,7 +19,7 @@
 
 #include <config.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "mcconfig.h"
 #include "src/strutil.h"

lib/search/glob.c

@@ -28,7 +28,7 @@
 #include <config.h>
 
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "search.h"
 #include "internal.h"
 #include "src/strutil.h"

lib/search/hex.c

@@ -29,7 +29,7 @@
 
 #include <stdio.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "search.h"
 #include "internal.h"
 #include "src/strutil.h"

lib/search/lib.c

@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <sys/types.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "search.h"
 #include "internal.h"
 #include "src/strutil.h"

lib/search/normal.c

@@ -28,7 +28,7 @@
 #include <config.h>
 
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "search.h"
 #include "internal.h"
 #include "src/strutil.h"

lib/search/regex.c

@@ -29,7 +29,7 @@
 
 #include <stdlib.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "search.h"
 #include "internal.h"
 #include "src/strutil.h"

lib/search/search.c

@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <sys/types.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "search.h"
 #include "internal.h"
 #include "src/strutil.h"

lib/search/search.h

@@ -3,7 +3,7 @@
 
 #include <config.h>
 
-#include "src/global.h"      /* <glib.h> */
+#include "lib/global.h"      /* <glib.h> */
 
 #include <sys/types.h>
 

lib/skin/colors-old.c

@@ -28,9 +28,9 @@
 #include <config.h>
 #include <stdlib.h>
 #include <sys/types.h>          /* size_t */
-#include "../tty/color.h"
+#include "lib/tty/color.h"
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "src/setup.h"
 #include "skin.h"
 #include "internal.h"

lib/skin/colors.c

@@ -28,9 +28,9 @@
 #include <config.h>
 #include <string.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "src/args.h"
-#include "../tty/color.h"
+#include "lib/tty/color.h"
 #include "skin.h"
 #include "internal.h"
 

lib/skin/common.c

@@ -28,7 +28,7 @@
 #include <config.h>
 #include <stdlib.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "src/args.h"
 #include "skin.h"
 #include "internal.h"

lib/skin/hc-skins.c

@@ -26,7 +26,7 @@
  */
 
 #include <config.h>
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "skin.h"
 #include "internal.h"

lib/skin/ini-file.c

@@ -28,10 +28,9 @@
 #include <config.h>
 #include <string.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "src/main.h"
 #include "src/fileloc.h"
-#include "src/util.h"
 #include "skin.h"
 #include "internal.h"
 

lib/skin/internal.h

@@ -1,7 +1,7 @@
 #ifndef MC__SKIN_INTERNAL_H
 #define MC__SKIN_INTERNAL_H
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "skin.h"
 

lib/skin/lines.c

@@ -28,9 +28,9 @@
 #include <config.h>
 #include <stdlib.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "src/args.h"
-#include "../tty/tty.h"
+#include "lib/tty/tty.h"
 #include "skin.h"
 #include "internal.h"
 

lib/skin/skin.h

@@ -1,11 +1,11 @@
 #ifndef MC__SKIN_H
 #define MC__SKIN_H
 
-#include "src/global.h"
+#include "lib/global.h"
 
-#include "../../lib/mcconfig/mcconfig.h"
+#include "lib/mcconfig/mcconfig.h"
 
-#include "../lib/tty/color.h"
+#include "lib/tty/color.h"
 
 /*** typedefs(not structures) and defined constants **********************************************/
 

lib/tty/color-internal.h

@@ -8,7 +8,7 @@
 
 #include <sys/types.h>          /* size_t */
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #ifdef HAVE_SLANG
 #   include "tty-slang.h"

lib/tty/color-ncurses.c

@@ -30,7 +30,7 @@
 #include <string.h>
 #include <sys/types.h>          /* size_t */
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "tty-ncurses.h"
 #include "color.h"        /* variables */

lib/tty/color-slang.c

@@ -30,7 +30,7 @@
 #include <string.h>
 #include <sys/types.h>          /* size_t */
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "tty-slang.h"
 #include "color.h"        /* variables */

lib/tty/color.c

@@ -33,7 +33,7 @@
 #include <string.h>
 #include <sys/types.h>          /* size_t */
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "tty.h"
 #include "color.h"

lib/tty/color.h

@@ -12,7 +12,7 @@
 #ifndef MC_COLOR_H
 #define MC_COLOR_H
 
-#include "src/global.h"   /* glib.h */
+#include "lib/global.h"   /* glib.h */
 
 #ifdef HAVE_SLANG
 #   include "color-slang.h"

lib/tty/key.c

@@ -37,7 +37,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "tty.h"
 #include "tty-internal.h" /* mouse_enabled */

lib/tty/key.h

@@ -6,7 +6,7 @@
 #ifndef MC_KEY_H
 #define MC_KEY_H
 
-#include "src/global.h"   /* <glib.h> */
+#include "lib/global.h"   /* <glib.h> */
 #include "src/dialog.h"   /* cb_ret_t */
 
 #include "tty.h"  /* KEY_F macro */

lib/tty/keyxdef.c

@@ -41,7 +41,7 @@
 
 #include <config.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "tty.h"
 #include "mouse.h"        /* required before key.h */

lib/tty/mouse.c

@@ -31,7 +31,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "tty.h"
 #include "tty-internal.h" /* mouse_enabled */

lib/tty/tty-internal.h

@@ -6,7 +6,7 @@
 #ifndef MC_TTY_INTERNAL_H
 #define MC_TTY_INTERNAL_H
 
-#include "src/global.h"   /* include <glib.h> */
+#include "lib/global.h"   /* include <glib.h> */
 
 /* If true lines are shown by spaces */
 extern gboolean slow_tty;

lib/tty/tty-ncurses.c

@@ -36,7 +36,7 @@
 #include <stdarg.h>
 #include <signal.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #ifndef WANT_TERM_H
 #   define WANT_TERM_H

lib/tty/tty-slang.c

@@ -39,7 +39,7 @@
 #include <unistd.h>
 #include <signal.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "tty-internal.h" /* slow_tty */
 #include "tty.h"

lib/tty/tty.c

@@ -34,7 +34,7 @@
 #include <signal.h>
 #include <stdarg.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "tty.h"
 #include "tty-internal.h"

lib/tty/tty.h

@@ -11,7 +11,7 @@
 #ifndef MC_TTY_H
 #define MC_TTY_H
 
-#include "src/global.h"   /* include <glib.h> */
+#include "lib/global.h"   /* include <glib.h> */
 
 #ifdef HAVE_SLANG
 #   include "tty-slang.h"

lib/tty/win.c

@@ -32,9 +32,9 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "lib/global.h"
 #include "tty.h"  /* tty_gotoyx, tty_print_char */
 #include "win.h"
-#include "src/util.h"
 #include "src/cons.saver.h"       /* console_flag */
 
 /*** global variables **************************************************/

lib/tty/win.h

@@ -6,7 +6,7 @@
 #ifndef MC_WIN_H
 #define MC_WIN_H
 
-#include "src/global.h"   /* <glib.h> */
+#include "lib/global.h"   /* <glib.h> */
 
 extern int xterm_flag;
 

lib/tty/x11conn.c

@@ -39,7 +39,7 @@ typedef int dummy;              /* C99 forbids empty compilation unit */
 #  include <gmodule.h>
 #endif
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "x11conn.h"
 
 /*** file scope type declarations **************************************/

lib/vfs/mc-vfs/cpio.c

@@ -29,7 +29,7 @@
 #include <errno.h>
 #include <fcntl.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "src/wtools.h"	/* message() */
 #include "src/main.h"	/* print_vfs_message */
 #include "src/unixcompat.h"

lib/vfs/mc-vfs/direntry.c

@@ -35,7 +35,7 @@
 #include <time.h>
 #include <sys/time.h>		/* gettimeofday() */
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"	/* enable/disable interrupt key */
 

lib/vfs/mc-vfs/extfs.c

@@ -45,7 +45,7 @@
 #include <errno.h>
 #include <sys/wait.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "src/wtools.h"	/* message() */
 #include "src/main.h"	/* print_vfs_message */

lib/vfs/mc-vfs/fish.c

@@ -52,16 +52,14 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "src/global.h"
-
+#include "lib/global.h"
+#include "lib/fs.h"
 #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 "utilvfs.h"
 #include "xdirentry.h"
 #include "vfs.h"

lib/vfs/mc-vfs/ftpfs.c

@@ -83,7 +83,7 @@ What to do with this?
 #include <fcntl.h>
 #include <sys/time.h>		/* gettimeofday() */
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"	/* enable/disable interrupt key */
 

lib/vfs/mc-vfs/gc.c

@@ -42,7 +42,7 @@
 #include <ctype.h>		/* is_digit() */
 #include <sys/time.h>		/* gettimeofday() */
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "src/wtools.h"	/* message() */
 #include "src/main.h"	/* print_vfs_message */

lib/vfs/mc-vfs/local.c

@@ -12,7 +12,7 @@
 #include <string.h>
 #include <fcntl.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "src/wtools.h"	/* message() */
 #include "src/main.h"	/* print_vfs_message */

lib/vfs/mc-vfs/mcfs.c

@@ -57,7 +57,7 @@
 #endif
 #endif
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "src/wtools.h"	/* message() */
 #include "src/main.h"	/* print_vfs_message */
 #include "utilvfs.h"

lib/vfs/mc-vfs/mcfsutil.c

@@ -50,7 +50,7 @@
 
 #include <errno.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "src/wtools.h"	/* message() */
 #include "src/main.h"	/* print_vfs_message */
 #include "utilvfs.h"

lib/vfs/mc-vfs/mcserv.c

@@ -110,7 +110,7 @@
  * a native printf(3) capable of all POSIX features.
  */
 #undef ENABLE_NLS
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "src/wtools.h"	/* message() */
 #include "src/main.h"	/* print_vfs_message */

lib/vfs/mc-vfs/netutil.c

@@ -31,7 +31,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "utilvfs.h"
 #include "netutil.h"
 

lib/vfs/mc-vfs/sfs.c

@@ -41,7 +41,7 @@
 #include <string.h>
 #include <fcntl.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "src/wtools.h"	/* message() */
 #include "src/main.h"	/* print_vfs_message */

lib/vfs/mc-vfs/smbfs.c

@@ -38,7 +38,7 @@
 #undef USE_NCURSES	/* Don't include *curses.h */
 #undef  USE_NCURSESW
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "src/wtools.h"	/* message() */
 #include "src/main.h"	/* print_vfs_message */

lib/vfs/mc-vfs/tar.c

@@ -40,7 +40,7 @@
 #include <sys/mknod.h>
 #endif
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "src/wtools.h"	/* message() */
 #include "src/main.h"	/* print_vfs_message */

lib/vfs/mc-vfs/undelfs.c

@@ -56,7 +56,7 @@
 #include <ext2fs/ext2fs.h>
 #include <ctype.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "src/wtools.h"	/* message() */
 #include "src/main.h"	/* print_vfs_message */
 #include "utilvfs.h"

lib/vfs/mc-vfs/utilvfs.c

@@ -33,7 +33,7 @@
 #include <grp.h>
 #include <stdlib.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "src/wtools.h"	/* message() */
 #include "src/main.h"	/* print_vfs_message */

lib/vfs/mc-vfs/utilvfs.h

@@ -11,7 +11,7 @@
 
 #include <sys/stat.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 /** Bit flags for vfs_split_url()
  *

lib/vfs/mc-vfs/vfs-impl.h

@@ -14,7 +14,7 @@
 #include <stddef.h>
 #include <utime.h>
 
-#include "src/fs.h"		/* MC_MAXPATHLEN */
+#include "lib/fs.h"		/* MC_MAXPATHLEN */
 
 typedef void *vfsid;
 struct vfs_stamping;

lib/vfs/mc-vfs/vfs.c

@@ -50,7 +50,7 @@
 #include <unistd.h>
 #include <dirent.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "src/wtools.h"	/* message() */
 #include "src/main.h"	/* print_vfs_message */

src/Makefile.am

@@ -24,16 +24,16 @@ AM_CPPFLAGS = -DDATADIR=\""$(pkgdatadir)/"\" \
 endif
 
 noinst_PROGRAMS = man2hlp
-man2hlp_LDADD = $(GLIB_LIBS)
 
 mcmfmt_SOURCES = mfmt.c
 
 cons_saver_SOURCES = cons.saver.c
 
-man2hlp_SOURCES = man2hlp.c glibcompat.c
+man2hlp_SOURCES = man2hlp.c
+man2hlp_LDADD = $(GLIB_LIBS) ../lib/libmc.la
 
 if USE_EDIT
-EDITLIB = editor/libedit.a
+EDITLIB = editor/libedit.la
 endif
 
 SRC_maintainer=logging.c logging.h
@@ -87,9 +87,9 @@ SRC_mc_keybind = \
 	cmddef.h
 
 SRC_mc_utils = \
-	util.c util.h \
 	utilunix.c \
-	unixcompat.h
+	unixcompat.h \
+	util.c util.h
 
 SRC_mc_extended_charset = \
 	ecs.c ecs.h
@@ -122,9 +122,6 @@ mc_SOURCES = \
 	filenot.c \
 	fileopctx.c fileopctx.h \
 	find.c find.h \
-	fs.h \
-	glibcompat.c glibcompat.h \
-	global.h \
 	help.c help.h \
 	history.h \
 	hotlist.c hotlist.h \

src/achown.c

@@ -33,7 +33,7 @@
 #include <pwd.h>
 #include <grp.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"		/* XCTRL and ALT macros */

src/args.c

@@ -28,7 +28,7 @@
 #include <stdio.h>
 
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "lib/tty/tty.h"
 #include "src/args.h"
 #include "src/strutil.h"

src/background.c

@@ -43,7 +43,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include "global.h"
+#include "lib/global.h"
 #include "background.h"
 #include "wtools.h"
 #include "layout.h"	/* repaint_screen() */

src/boxes.c

@@ -34,7 +34,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"
 #include "lib/skin/skin.h"		/* INPUT_COLOR */

src/charsets.c

@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "global.h"
+#include "lib/global.h"
 #include "charsets.h"
 #include "strutil.h"		/* utf-8 functions */
 #include "main.h"

src/chmod.c

@@ -31,7 +31,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"
 #include "lib/skin/skin.h"

src/chown.c

@@ -32,7 +32,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"
 #include "lib/skin/skin.h"

src/cmd.c

@@ -45,7 +45,7 @@
 #include <grp.h>
 #include <sys/time.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"		/* LINES, tty_touch_screen() */
 #include "lib/tty/key.h"		/* ALT() macro */

src/command.c

@@ -32,7 +32,7 @@
 #include <errno.h>
 #include <string.h>
 
-#include "global.h"		/* home_dir */
+#include "lib/global.h"		/* home_dir */
 #include "lib/tty/tty.h"
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "widget.h"		/* WInput */

src/complete.c

@@ -36,7 +36,7 @@
 #include <pwd.h>
 #include <unistd.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"		/* XCTRL and ALT macros */

src/cons.handler.c

@@ -34,7 +34,7 @@
 #endif
 #include <unistd.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"
 #include "lib/skin/skin.h"		/* tty_set_normal_attrs */

src/dialog.c

@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"
 #include "lib/skin/skin.h"

src/dialog.h

@@ -24,7 +24,6 @@
 #define MC_DIALOG_H
 
 #include "lib/tty/mouse.h"
-#include "util.h" /* Hook */
 
 /* Common return values */
 #define B_EXIT		0

src/dir.c

@@ -30,12 +30,12 @@
 #include "lib/tty/tty.h"
 #include "lib/search/search.h"
 #include "lib/vfs/mc-vfs/vfs.h"
+#include "lib/fs.h"
 
-#include "global.h"
+#include "lib/global.h"
 #include "wtools.h"
 #include "treestore.h"
 #include "strutil.h"
-#include "fs.h"
 #include "util.h"		/* canonicalize_pathname () */
 #include "dir.h"
 

src/dir.h

@@ -8,7 +8,7 @@
 
 #include <sys/stat.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #define MIN_FILES 128
 #define RESIZE_STEPS 128

src/ecs-test.c

@@ -33,7 +33,7 @@
 #include <locale.h>
 #include <stdio.h>
 
-#include "global.h"
+#include "lib/global.h"
 #include "ecs.h"
 
 #ifdef EXTCHARSET_ENABLED

src/ecs.c

@@ -31,7 +31,7 @@
 #include <assert.h>
 #include <ctype.h>
 
-#include "global.h"
+#include "lib/global.h"
 #include "ecs.h"
 
 /*

src/ecs.h

@@ -37,7 +37,7 @@
 
 #include <sys/types.h>		/* size_t */
 
-#include "global.h"		/* include <glib.h> */
+#include "lib/global.h"		/* include <glib.h> */
 
 /* Use the macros ECS_CHAR and ECS_STR to bring character and string
  * literals to the correct form required by the C compiler. */

src/editor/Makefile.am

@@ -1,15 +1,16 @@
-AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) $(PCRE_CFLAGS)
+EXTRA_DIST =
 
 if USE_EDIT
-noinst_LIBRARIES = libedit.a
+noinst_LTLIBRARIES = libedit.la
 else
-noinst_LIBRARIES =
+noinst_LTLIBRARIES = 
 endif
 
-libedit_a_SOURCES = \
+libedit_la_SOURCES = \
 	bookmark.c edit.c editcmd.c editwidget.c editdraw.c editkeys.c \
 	editmenu.c editoptions.c edit-impl.h edit.h edit-widget.h \
 	editlock.c editlock.h syntax.c wordproc.c \
 	choosesyntax.c etags.c etags.h editcmd_dialogs.c editcmd_dialogs.h
 
-EXTRA_DIST =
+libedit_la_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) $(PCRE_CFLAGS)
+

src/editor/bookmark.c

@@ -39,7 +39,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "edit-impl.h"
 #include "edit-widget.h"

src/editor/choosesyntax.c

@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "src/wtools.h"
 
 #include "edit-impl.h"

src/editor/edit.c

@@ -39,7 +39,7 @@
 #include <stdlib.h>
 #include <fcntl.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "lib/tty/color.h"	
 #include "lib/tty/tty.h"	/* attrset() */

src/editor/edit.h

@@ -32,7 +32,7 @@
 #ifndef MC_EDIT_H
 #define MC_EDIT_H
 
-#include "src/global.h"	/* PATH_SEP_STR */
+#include "lib/global.h"	/* PATH_SEP_STR */
 #include "src/fileloc.h"
 
 /* Editor widget */

src/editor/editcmd.c

@@ -45,7 +45,7 @@
 #include <stdlib.h>
 #include <fcntl.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"	/* XCTRL */

src/editor/editcmd_dialogs.c

@@ -26,7 +26,7 @@
 
 #include <config.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"
 #include "lib/skin/skin.h"		/* INPUT_COLOR */

src/editor/editdraw.c

@@ -38,7 +38,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "edit-impl.h"
 #include "edit-widget.h"

src/editor/editkeys.c

@@ -39,7 +39,7 @@
 
 #include <stdlib.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "edit-impl.h"
 #include "edit-widget.h"	/* edit->macro_i */

src/editor/editlock.c

@@ -52,7 +52,7 @@
 #include <pwd.h>
 #include <stdlib.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "edit-impl.h"
 #include "editlock.h"

src/editor/editmenu.c

@@ -39,7 +39,7 @@
 #include <sys/stat.h>
 #include <stdlib.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"	/* KEY_F */
 #include "lib/tty/key.h"	/* XCTRL */

src/editor/editoptions.c

@@ -31,7 +31,7 @@
 
 #include <stdlib.h> /* atoi(), NULL */
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "edit-impl.h"
 #include "src/dialog.h"	/* B_CANCEL */

src/editor/editwidget.c

@@ -39,7 +39,7 @@
 #include <sys/stat.h>
 #include <stdlib.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"		/* LINES, COLS */
 #include "lib/tty/key.h"		/* is_idle() */

src/editor/etags.c

@@ -38,7 +38,7 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "src/util.h"	/* canonicalize_pathname() */
 #include "src/editor/etags.h"
 

src/editor/etags.h

@@ -2,7 +2,7 @@
 #define MC_EDIT_ETAGS_H 1
 
 #include <sys/types.h>		/* size_t */
-#include "src/global.h"	/* include <glib.h> */
+#include "lib/global.h"	/* include <glib.h> */
 
 #define MAX_WIDTH_DEF_DIALOG 60	/* max width def dialog */
 #define MAX_DEFINITIONS 60	/* count found entries show */

src/editor/syntax.c

@@ -46,7 +46,7 @@
 #include <sys/stat.h>
 #include <stdlib.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "lib/search/search.h"	/* search engine */
 

src/editor/wordproc.c

@@ -37,7 +37,7 @@
 
 #include <stdlib.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "edit-impl.h"
 #include "edit-widget.h"

src/execute.c

@@ -25,7 +25,7 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"