Prefix kmscon sources with kmscon_*

We will be adding more applications to this repository, so to keep better
overview, we prefix kmscon sources with kmscon_*.

The only sources that have no prefix are either shared between
applications (i.e., statically linked) or they were not cleaned up, yet.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>

Makefile.am

@@ -357,11 +357,8 @@ libkmscon_core_la_SOURCES = \
 	$(SHL_TIMER) \
 	$(SHL_HOOK) \
 	$(SHL_MISC) \
-	src/main.h \
 	src/conf.c src/conf.h \
-	src/ui.c src/ui.h \
 	src/log.c src/log.h \
-	src/terminal.c src/terminal.h \
 	src/pty.c src/pty.h \
 	src/text.h \
 	src/text.c
@@ -419,7 +416,12 @@ endif
 kmscon_SOURCES = \
 	$(SHL_DLIST) \
 	$(SHL_MISC) \
-	src/main.c
+	src/kmscon_terminal.h \
+	src/kmscon_terminal.c \
+	src/kmscon_ui.h \
+	src/kmscon_ui.c \
+	src/kmscon_main.h \
+	src/kmscon_main.c
 kmscon_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	$(XKBCOMMON_CFLAGS)

configure.ac

@@ -7,7 +7,7 @@ AC_PREREQ(2.68)
 
 AC_INIT([kmscon], [5])
 AC_SUBST(PACKAGE_URL, [https://github.com/dvdhrm/kmscon])
-AC_CONFIG_SRCDIR([src/main.c])
+AC_CONFIG_SRCDIR([src/kmscon_main.c])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADER(config.h)

src/kmscon_main.c

@@ -33,12 +33,12 @@
 #include <sys/signalfd.h>
 #include "conf.h"
 #include "eloop.h"
+#include "kmscon_main.h"
+#include "kmscon_ui.h"
 #include "log.h"
-#include "main.h"
 #include "shl_dlist.h"
 #include "shl_misc.h"
 #include "text.h"
-#include "ui.h"
 #include "uterm.h"
 
 struct kmscon_app {

src/kmscon_terminal.c

@@ -35,11 +35,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include "eloop.h"
+#include "kmscon_main.h"
+#include "kmscon_terminal.h"
 #include "log.h"
-#include "main.h"
 #include "pty.h"
 #include "shl_dlist.h"
-#include "terminal.h"
 #include "text.h"
 #include "tsm_screen.h"
 #include "tsm_vte.h"

src/kmscon_ui.c

@@ -32,10 +32,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include "eloop.h"
+#include "kmscon_terminal.h"
+#include "kmscon_ui.h"
 #include "log.h"
 #include "shl_dlist.h"
-#include "terminal.h"
-#include "ui.h"
 #include "uterm.h"
 
 #define LOG_SUBSYSTEM "ui"