shl: move log.[ch] to shl_log.[ch]

We want to avoid any static files that are shared between multiple
programs but are not part of SHL. These make the build-process just more
complex.
Move log.[ch] to SHL so we have a known context.

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

Makefile.am

@@ -163,6 +163,8 @@ libshl_la_SOURCES = \
 	src/shl_ring.h \
 	src/shl_timer.h \
 	src/shl_llog.h \
+	src/shl_log.h \
+	src/shl_log.c \
 	src/shl_hook.h \
 	src/shl_misc.h \
 	src/shl_register.h
@@ -601,8 +603,6 @@ kmscon_SOURCES = \
 	src/githead.h \
 	src/conf.h \
 	src/conf.c \
-	src/log.h \
-	src/log.c \
 	src/pty.h \
 	src/pty.c \
 	src/font.h \
@@ -670,8 +670,6 @@ wlterm_SOURCES = \
 	src/wlt_theme.c \
 	src/wlt_terminal.h \
 	src/wlt_terminal.c \
-	src/log.h \
-	src/log.c \
 	src/conf.h \
 	src/conf.c \
 	src/pty.h \
@@ -699,8 +697,6 @@ wlterm_LDADD = \
 #
 
 test_sources = \
-	src/log.h \
-	src/log.c \
 	src/conf.h \
 	src/conf.c \
 	tests/test_include.h

src/conf.c

@@ -39,7 +39,7 @@
 #include <unistd.h>
 #include <xkbcommon/xkbcommon.h>
 #include "conf.h"
-#include "log.h"
+#include "shl_log.h"
 #include "shl_misc.h"
 
 #define LOG_SUBSYSTEM "conf"

src/font.c

@@ -58,8 +58,8 @@
 #include <string.h>
 #include "font.h"
 #include "kmscon_module.h"
-#include "log.h"
 #include "shl_dlist.h"
+#include "shl_log.h"
 #include "shl_misc.h"
 #include "shl_register.h"
 

src/font_8x16.c

@@ -48,7 +48,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "font.h"
-#include "log.h"
+#include "shl_log.h"
 #include "uterm_video.h"
 
 #define LOG_SUBSYSTEM "font_8x16"

src/font_freetype2.c

@@ -45,9 +45,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include "font.h"
-#include "log.h"
 #include "shl_dlist.h"
 #include "shl_hashtable.h"
+#include "shl_log.h"
 #include "tsm_unicode.h"
 #include "uterm_video.h"
 

src/font_pango.c

@@ -52,9 +52,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include "font.h"
-#include "log.h"
 #include "shl_dlist.h"
 #include "shl_hashtable.h"
+#include "shl_log.h"
 #include "tsm_unicode.h"
 #include "uterm_video.h"
 

src/font_unifont.c

@@ -43,8 +43,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include "font.h"
-#include "log.h"
 #include "shl_hashtable.h"
+#include "shl_log.h"
 #include "uterm_video.h"
 
 #define LOG_SUBSYSTEM "font_unifont"

src/kmscon_cdev.c

@@ -44,9 +44,9 @@
 #include <unistd.h>
 #include "kmscon_cdev.h"
 #include "kmscon_seat.h"
-#include "log.h"
 #include "shl_array.h"
 #include "shl_dlist.h"
+#include "shl_log.h"
 #include "shl_ring.h"
 #include "tsm_screen.h"
 #include "tsm_vte.h"

src/kmscon_conf.c

@@ -34,7 +34,7 @@
 #include <xkbcommon/xkbcommon-keysyms.h>
 #include "conf.h"
 #include "kmscon_conf.h"
-#include "log.h"
+#include "shl_log.h"
 #include "shl_misc.h"
 #include "uterm_video.h"
 

src/kmscon_dummy.c

@@ -32,8 +32,8 @@
 #include <string.h>
 #include "kmscon_dummy.h"
 #include "kmscon_seat.h"
-#include "log.h"
 #include "shl_dlist.h"
+#include "shl_log.h"
 
 #define LOG_SUBSYSTEM "dummy"
 

src/kmscon_main.c

@@ -36,8 +36,8 @@
 #include "kmscon_conf.h"
 #include "kmscon_module.h"
 #include "kmscon_seat.h"
-#include "log.h"
 #include "shl_dlist.h"
+#include "shl_log.h"
 #include "shl_misc.h"
 #include "text.h"
 #include "uterm_input.h"

src/kmscon_mod_bbulk.c

@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include "text.h"
 #include "kmscon_module_interface.h"
-#include "log.h"
+#include "shl_log.h"
 
 #define LOG_SUBSYSTEM "mod_bbulk"
 

src/kmscon_mod_cairo.c

@@ -31,7 +31,7 @@
 #include <stdlib.h>
 #include "text.h"
 #include "kmscon_module_interface.h"
-#include "log.h"
+#include "shl_log.h"
 
 #define LOG_SUBSYSTEM "mod_cairo"
 

src/kmscon_mod_freetype2.c

@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include "font.h"
 #include "kmscon_module_interface.h"
-#include "log.h"
+#include "shl_log.h"
 
 #define LOG_SUBSYSTEM "mod_freetype2"
 

src/kmscon_mod_gltex.c

@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include "text.h"
 #include "kmscon_module_interface.h"
-#include "log.h"
+#include "shl_log.h"
 
 #define LOG_SUBSYSTEM "mod_gltex"
 

src/kmscon_mod_pango.c

@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include "font.h"
 #include "kmscon_module_interface.h"
-#include "log.h"
+#include "shl_log.h"
 
 #define LOG_SUBSYSTEM "mod_pango"
 

src/kmscon_mod_pixman.c

@@ -31,7 +31,7 @@
 #include <stdlib.h>
 #include "text.h"
 #include "kmscon_module_interface.h"
-#include "log.h"
+#include "shl_log.h"
 
 #define LOG_SUBSYSTEM "mod_pixman"
 

src/kmscon_mod_unifont.c

@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include "font.h"
 #include "kmscon_module_interface.h"
-#include "log.h"
+#include "shl_log.h"
 
 #define LOG_SUBSYSTEM "mod_unifont"
 

src/kmscon_module.c

@@ -33,8 +33,8 @@
 #include "githead.h"
 #include "kmscon_module.h"
 #include "kmscon_module_interface.h"
-#include "log.h"
 #include "shl_dlist.h"
+#include "shl_log.h"
 #include "shl_misc.h"
 
 #define LOG_SUBSYSTEM "module"

src/kmscon_seat.c

@@ -39,8 +39,8 @@
 #include "kmscon_dummy.h"
 #include "kmscon_seat.h"
 #include "kmscon_terminal.h"
-#include "log.h"
 #include "shl_dlist.h"
+#include "shl_log.h"
 #include "uterm_input.h"
 #include "uterm_video.h"
 #include "uterm_vt.h"

src/kmscon_terminal.c

@@ -39,9 +39,9 @@
 #include "kmscon_conf.h"
 #include "kmscon_seat.h"
 #include "kmscon_terminal.h"
-#include "log.h"
 #include "pty.h"
 #include "shl_dlist.h"
+#include "shl_log.h"
 #include "text.h"
 #include "tsm_screen.h"
 #include "tsm_vte.h"

src/pty.c

@@ -37,8 +37,8 @@
 #include <termios.h>
 #include <unistd.h>
 #include "eloop.h"
-#include "log.h"
 #include "pty.h"
+#include "shl_log.h"
 #include "shl_misc.h"
 #include "shl_ring.h"
 

src/shl_log.c

@@ -20,7 +20,7 @@
 #include <string.h>
 #include <sys/time.h>
 #include "githead.h"
-#include "log.h"
+#include "shl_log.h"
 #include "shl_misc.h"
 
 /*

src/shl_log.h

@@ -22,8 +22,8 @@
  * debug-messages for this file.
  */
 
-#ifndef LOG_H_INCLUDED
+#ifndef SHL_LOG_H_INCLUDED
-#define LOG_H_INCLUDED
+#define SHL_LOG_H_INCLUDED
 
 #include <stdarg.h>
 #include <stdbool.h>
@@ -295,4 +295,4 @@ extern const char *LOG_SUBSYSTEM;
 #define log_err log_error
 #define log_crit log_critical
 
-#endif /* LOG_H_INCLUDED */
+#endif /* SHL_LOG_H_INCLUDED */

src/text.c

@@ -35,8 +35,8 @@
 #include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
-#include "log.h"
 #include "shl_dlist.h"
+#include "shl_log.h"
 #include "shl_misc.h"
 #include "shl_register.h"
 #include "text.h"

src/text_bblit.c

@@ -36,7 +36,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
-#include "log.h"
+#include "shl_log.h"
 #include "text.h"
 #include "uterm_video.h"
 

src/text_bbulk.c

@@ -36,7 +36,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
-#include "log.h"
+#include "shl_log.h"
 #include "text.h"
 #include "uterm_video.h"
 

src/text_cairo.c

@@ -32,8 +32,8 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
-#include "log.h"
 #include "shl_hashtable.h"
+#include "shl_log.h"
 #include "text.h"
 #include "uterm_video.h"
 

src/text_gltex.c

@@ -45,9 +45,9 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
-#include "log.h"
 #include "shl_dlist.h"
 #include "shl_hashtable.h"
+#include "shl_log.h"
 #include "shl_misc.h"
 #include "static_gl.h"
 #include "text.h"

src/text_pixman.c

@@ -32,8 +32,8 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
-#include "log.h"
 #include "shl_hashtable.h"
+#include "shl_log.h"
 #include "text.h"
 #include "uterm_video.h"
 

src/uterm_drm2d_render.c

@@ -38,7 +38,7 @@
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 #include "eloop.h"
-#include "log.h"
+#include "shl_log.h"
 #include "uterm_drm_shared_internal.h"
 #include "uterm_drm2d_internal.h"
 #include "uterm_video.h"

src/uterm_drm2d_video.c

@@ -38,7 +38,7 @@
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 #include "eloop.h"
-#include "log.h"
+#include "shl_log.h"
 #include "shl_misc.h"
 #include "uterm_drm_shared_internal.h"
 #include "uterm_drm2d_internal.h"

src/uterm_drm3d_render.c

@@ -45,7 +45,7 @@
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 #include "eloop.h"
-#include "log.h"
+#include "shl_log.h"
 #include "static_gl.h"
 #include "uterm_drm_shared_internal.h"
 #include "uterm_drm3d_internal.h"

src/uterm_drm3d_video.c

@@ -45,7 +45,7 @@
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 #include "eloop.h"
-#include "log.h"
+#include "shl_log.h"
 #include "shl_misc.h"
 #include "static_gl.h"
 #include "uterm_drm_shared_internal.h"

src/uterm_drm_shared.c

@@ -36,7 +36,7 @@
 #include <unistd.h>
 #include <xf86drm.h>
 #include <xf86drmMode.h>
-#include "log.h"
+#include "shl_log.h"
 #include "shl_timer.h"
 #include "uterm_drm_shared_internal.h"
 #include "uterm_video.h"

src/uterm_fbdev_render.c

@@ -31,7 +31,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
-#include "log.h"
+#include "shl_log.h"
 #include "uterm_fbdev_internal.h"
 #include "uterm_video.h"
 #include "uterm_video_internal.h"

src/uterm_fbdev_video.c

@@ -36,7 +36,7 @@
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <unistd.h>
-#include "log.h"
+#include "shl_log.h"
 #include "shl_misc.h"
 #include "uterm_fbdev_internal.h"
 #include "uterm_video.h"

src/uterm_input.c

@@ -37,9 +37,9 @@
 #include <string.h>
 #include <unistd.h>
 #include "eloop.h"
-#include "log.h"
 #include "shl_dlist.h"
 #include "shl_hook.h"
+#include "shl_log.h"
 #include "shl_misc.h"
 #include "uterm_input.h"
 #include "uterm_input_internal.h"

src/uterm_input_uxkb.c

@@ -32,8 +32,8 @@
 #include <string.h>
 #include <unistd.h>
 #include <xkbcommon/xkbcommon.h>
-#include "log.h"
 #include "shl_hook.h"
+#include "shl_log.h"
 #include "shl_misc.h"
 #include "uterm_input.h"
 #include "uterm_input_internal.h"

src/uterm_monitor.c

@@ -40,8 +40,8 @@
 #include <string.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
-#include "log.h"
 #include "shl_dlist.h"
+#include "shl_log.h"
 #include "shl_misc.h"
 #include "uterm_monitor.h"
 #include "uterm_systemd_internal.h"

src/uterm_systemd.c

@@ -36,7 +36,7 @@
 #include <string.h>
 #include <systemd/sd-daemon.h>
 #include <systemd/sd-login.h>
-#include "log.h"
+#include "shl_log.h"
 #include "uterm_monitor.h"
 #include "uterm_systemd_internal.h"
 

src/uterm_video.c

@@ -35,9 +35,9 @@
 #include <string.h>
 #include <unistd.h>
 #include "eloop.h"
-#include "log.h"
 #include "shl_dlist.h"
 #include "shl_hook.h"
+#include "shl_log.h"
 #include "shl_misc.h"
 #include "uterm_video.h"
 #include "uterm_video_internal.h"

src/uterm_vt.c

@@ -45,8 +45,8 @@
 #include <unistd.h>
 #include <xkbcommon/xkbcommon-keysyms.h>
 #include "eloop.h"
-#include "log.h"
 #include "shl_dlist.h"
+#include "shl_log.h"
 #include "shl_misc.h"
 #include "uterm_input.h"
 #include "uterm_vt.h"

src/wlt_main.c

@@ -38,8 +38,8 @@
 #include "conf.h"
 #include "eloop.h"
 #include "font.h"
-#include "log.h"
 #include "shl_dlist.h"
+#include "shl_log.h"
 #include "shl_misc.h"
 #include "wlt_main.h"
 #include "wlt_terminal.h"

src/wlt_terminal.c

@@ -38,8 +38,8 @@
 #include "conf.h"
 #include "eloop.h"
 #include "font.h"
-#include "log.h"
 #include "pty.h"
+#include "shl_log.h"
 #include "shl_misc.h"
 #include "tsm_unicode.h"
 #include "tsm_screen.h"

src/wlt_theme.c

@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wayland-client.h>
-#include "log.h"
+#include "shl_log.h"
 #include "shl_misc.h"
 #include "wlt_main.h"
 #include "wlt_theme.h"

src/wlt_toolkit.c

@@ -37,10 +37,10 @@
 #include <wayland-cursor.h>
 #include <xkbcommon/xkbcommon.h>
 #include "eloop.h"
-#include "log.h"
 #include "shl_array.h"
 #include "shl_dlist.h"
 #include "shl_hook.h"
+#include "shl_log.h"
 #include "shl_misc.h"
 #include "tsm_vte.h"
 #include "wlt_main.h"