Move all interface includes from subdirs lib/*/*.h into lib/*.h

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

lib/Makefile.am

@@ -2,6 +2,11 @@ SUBDIRS = filehighlight mcconfig search skin tty vfs strutil
 
 noinst_LTLIBRARIES = libmc.la
 
+SUBLIB_includes = \
+	filehighlight.h \
+	mcconfig.h \
+	search.h \
+	strutil.h
 
 SRC_mc_utils = \
 	utilunix.c \
@@ -10,6 +15,7 @@ SRC_mc_utils = \
 
 
 libmc_la_SOURCES = \
+	$(SUBLIB_includes) \
 	$(SRC_mc_utils) \
 	fileloc.h \
 	fs.h \

lib/filehighlight/Makefile.am

@@ -2,7 +2,6 @@ noinst_LTLIBRARIES = libmcfilehighlight.la
 
 libmcfilehighlight_la_SOURCES = \
 	common.c \
-	fhl.h \
 	get-color.c \
 	ini-file-read.c \
 	internal.h

lib/filehighlight/common.c

@@ -29,7 +29,7 @@
 
 
 #include "lib/global.h"
-#include "lib/filehighlight/fhl.h"
+#include "lib/filehighlight.h"
 #include "internal.h"
 
 /*** global variables ****************************************************************************/

lib/filehighlight/get-color.c

@@ -30,8 +30,8 @@
 
 
 #include "lib/global.h"
-#include "lib/skin/skin.h"
-#include "lib/filehighlight/fhl.h"
+#include "lib/skin.h"
+#include "lib/filehighlight.h"
 #include "internal.h"
 
 /*** global variables ****************************************************************************/

lib/filehighlight/ini-file-read.c

@@ -32,8 +32,8 @@
 #include "src/main.h"
 #include "lib/fileloc.h"
 #include "src/strescape.h"
-#include "lib/skin/skin.h"
-#include "fhl.h"
+#include "lib/skin.h"
+#include "lib/filehighlight.h"
 #include "internal.h"
 
 /*** global variables ****************************************************************************/

lib/mcconfig/Makefile.am

@@ -2,7 +2,6 @@
 noinst_LTLIBRARIES = libmcconfig.la
 
 libmcconfig_la_SOURCES = \
-	mcconfig.h \
 	common.c \
 	get.c \
 	set.c

lib/mcconfig/common.c

@@ -25,12 +25,9 @@
 #include <fcntl.h>
 #include <errno.h> /* extern int errno */
 
-
 #include "lib/global.h"
-
 #include "lib/vfs/mc-vfs/vfs.h"      /* mc_stat */
-
-#include "mcconfig.h"
+#include "lib/mcconfig.h"
 
 /*** global variables **************************************************/
 

lib/mcconfig/get.c

@@ -21,8 +21,7 @@
 
 #include "lib/global.h"
 #include "lib/strutil.h"
-
-#include "mcconfig.h"
+#include "lib/mcconfig.h"
 
 /*** global variables **************************************************/