From 0249b2cb0b0da272a78b4967b9c9f6f02d73cad5 Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Mon, 4 Mar 2013 14:40:36 +0100 Subject: [PATCH] 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 --- Makefile.am | 8 ++------ src/conf.c | 2 +- src/font.c | 2 +- src/font_8x16.c | 2 +- src/font_freetype2.c | 2 +- src/font_pango.c | 2 +- src/font_unifont.c | 2 +- src/kmscon_cdev.c | 2 +- src/kmscon_conf.c | 2 +- src/kmscon_dummy.c | 2 +- src/kmscon_main.c | 2 +- src/kmscon_mod_bbulk.c | 2 +- src/kmscon_mod_cairo.c | 2 +- src/kmscon_mod_freetype2.c | 2 +- src/kmscon_mod_gltex.c | 2 +- src/kmscon_mod_pango.c | 2 +- src/kmscon_mod_pixman.c | 2 +- src/kmscon_mod_unifont.c | 2 +- src/kmscon_module.c | 2 +- src/kmscon_seat.c | 2 +- src/kmscon_terminal.c | 2 +- src/pty.c | 2 +- src/{log.c => shl_log.c} | 2 +- src/{log.h => shl_log.h} | 6 +++--- src/text.c | 2 +- src/text_bblit.c | 2 +- src/text_bbulk.c | 2 +- src/text_cairo.c | 2 +- src/text_gltex.c | 2 +- src/text_pixman.c | 2 +- src/uterm_drm2d_render.c | 2 +- src/uterm_drm2d_video.c | 2 +- src/uterm_drm3d_render.c | 2 +- src/uterm_drm3d_video.c | 2 +- src/uterm_drm_shared.c | 2 +- src/uterm_fbdev_render.c | 2 +- src/uterm_fbdev_video.c | 2 +- src/uterm_input.c | 2 +- src/uterm_input_uxkb.c | 2 +- src/uterm_monitor.c | 2 +- src/uterm_systemd.c | 2 +- src/uterm_video.c | 2 +- src/uterm_vt.c | 2 +- src/wlt_main.c | 2 +- src/wlt_terminal.c | 2 +- src/wlt_theme.c | 2 +- src/wlt_toolkit.c | 2 +- 47 files changed, 50 insertions(+), 54 deletions(-) rename src/{log.c => shl_log.c} (99%) rename src/{log.h => shl_log.h} (99%) diff --git a/Makefile.am b/Makefile.am index 91e48e4..bce78ed 100644 --- a/Makefile.am +++ b/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 diff --git a/src/conf.c b/src/conf.c index 936e36f..890e599 100644 --- a/src/conf.c +++ b/src/conf.c @@ -39,7 +39,7 @@ #include #include #include "conf.h" -#include "log.h" +#include "shl_log.h" #include "shl_misc.h" #define LOG_SUBSYSTEM "conf" diff --git a/src/font.c b/src/font.c index a9a734e..c6ad8c1 100644 --- a/src/font.c +++ b/src/font.c @@ -58,8 +58,8 @@ #include #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" diff --git a/src/font_8x16.c b/src/font_8x16.c index 24f8935..830bc30 100644 --- a/src/font_8x16.c +++ b/src/font_8x16.c @@ -48,7 +48,7 @@ #include #include #include "font.h" -#include "log.h" +#include "shl_log.h" #include "uterm_video.h" #define LOG_SUBSYSTEM "font_8x16" diff --git a/src/font_freetype2.c b/src/font_freetype2.c index 55e7cb1..37800dd 100644 --- a/src/font_freetype2.c +++ b/src/font_freetype2.c @@ -45,9 +45,9 @@ #include #include #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" diff --git a/src/font_pango.c b/src/font_pango.c index 664b99e..c2954c6 100644 --- a/src/font_pango.c +++ b/src/font_pango.c @@ -52,9 +52,9 @@ #include #include #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" diff --git a/src/font_unifont.c b/src/font_unifont.c index b0ab693..cdedbca 100644 --- a/src/font_unifont.c +++ b/src/font_unifont.c @@ -43,8 +43,8 @@ #include #include #include "font.h" -#include "log.h" #include "shl_hashtable.h" +#include "shl_log.h" #include "uterm_video.h" #define LOG_SUBSYSTEM "font_unifont" diff --git a/src/kmscon_cdev.c b/src/kmscon_cdev.c index 1faee8f..d26629a 100644 --- a/src/kmscon_cdev.c +++ b/src/kmscon_cdev.c @@ -44,9 +44,9 @@ #include #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" diff --git a/src/kmscon_conf.c b/src/kmscon_conf.c index e3bd225..8edd5ee 100644 --- a/src/kmscon_conf.c +++ b/src/kmscon_conf.c @@ -34,7 +34,7 @@ #include #include "conf.h" #include "kmscon_conf.h" -#include "log.h" +#include "shl_log.h" #include "shl_misc.h" #include "uterm_video.h" diff --git a/src/kmscon_dummy.c b/src/kmscon_dummy.c index 38432ce..df8ecb2 100644 --- a/src/kmscon_dummy.c +++ b/src/kmscon_dummy.c @@ -32,8 +32,8 @@ #include #include "kmscon_dummy.h" #include "kmscon_seat.h" -#include "log.h" #include "shl_dlist.h" +#include "shl_log.h" #define LOG_SUBSYSTEM "dummy" diff --git a/src/kmscon_main.c b/src/kmscon_main.c index e8662da..c3c94ca 100644 --- a/src/kmscon_main.c +++ b/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" diff --git a/src/kmscon_mod_bbulk.c b/src/kmscon_mod_bbulk.c index fe2ad31..f0a2052 100644 --- a/src/kmscon_mod_bbulk.c +++ b/src/kmscon_mod_bbulk.c @@ -32,7 +32,7 @@ #include #include "text.h" #include "kmscon_module_interface.h" -#include "log.h" +#include "shl_log.h" #define LOG_SUBSYSTEM "mod_bbulk" diff --git a/src/kmscon_mod_cairo.c b/src/kmscon_mod_cairo.c index 3232c51..ecdcf62 100644 --- a/src/kmscon_mod_cairo.c +++ b/src/kmscon_mod_cairo.c @@ -31,7 +31,7 @@ #include #include "text.h" #include "kmscon_module_interface.h" -#include "log.h" +#include "shl_log.h" #define LOG_SUBSYSTEM "mod_cairo" diff --git a/src/kmscon_mod_freetype2.c b/src/kmscon_mod_freetype2.c index 8b821fd..39e4fe6 100644 --- a/src/kmscon_mod_freetype2.c +++ b/src/kmscon_mod_freetype2.c @@ -32,7 +32,7 @@ #include #include "font.h" #include "kmscon_module_interface.h" -#include "log.h" +#include "shl_log.h" #define LOG_SUBSYSTEM "mod_freetype2" diff --git a/src/kmscon_mod_gltex.c b/src/kmscon_mod_gltex.c index 7e92dd8..9f4579d 100644 --- a/src/kmscon_mod_gltex.c +++ b/src/kmscon_mod_gltex.c @@ -32,7 +32,7 @@ #include #include "text.h" #include "kmscon_module_interface.h" -#include "log.h" +#include "shl_log.h" #define LOG_SUBSYSTEM "mod_gltex" diff --git a/src/kmscon_mod_pango.c b/src/kmscon_mod_pango.c index 12a6ed2..de8b1e7 100644 --- a/src/kmscon_mod_pango.c +++ b/src/kmscon_mod_pango.c @@ -32,7 +32,7 @@ #include #include "font.h" #include "kmscon_module_interface.h" -#include "log.h" +#include "shl_log.h" #define LOG_SUBSYSTEM "mod_pango" diff --git a/src/kmscon_mod_pixman.c b/src/kmscon_mod_pixman.c index a5adfe1..f229e55 100644 --- a/src/kmscon_mod_pixman.c +++ b/src/kmscon_mod_pixman.c @@ -31,7 +31,7 @@ #include #include "text.h" #include "kmscon_module_interface.h" -#include "log.h" +#include "shl_log.h" #define LOG_SUBSYSTEM "mod_pixman" diff --git a/src/kmscon_mod_unifont.c b/src/kmscon_mod_unifont.c index ea2cba9..4b19954 100644 --- a/src/kmscon_mod_unifont.c +++ b/src/kmscon_mod_unifont.c @@ -32,7 +32,7 @@ #include #include "font.h" #include "kmscon_module_interface.h" -#include "log.h" +#include "shl_log.h" #define LOG_SUBSYSTEM "mod_unifont" diff --git a/src/kmscon_module.c b/src/kmscon_module.c index 87a0d1e..471f5af 100644 --- a/src/kmscon_module.c +++ b/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" diff --git a/src/kmscon_seat.c b/src/kmscon_seat.c index ab248fb..be8a5ab 100644 --- a/src/kmscon_seat.c +++ b/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" diff --git a/src/kmscon_terminal.c b/src/kmscon_terminal.c index 0b9af07..768b1ed 100644 --- a/src/kmscon_terminal.c +++ b/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" diff --git a/src/pty.c b/src/pty.c index bbd6d76..3e17512 100644 --- a/src/pty.c +++ b/src/pty.c @@ -37,8 +37,8 @@ #include #include #include "eloop.h" -#include "log.h" #include "pty.h" +#include "shl_log.h" #include "shl_misc.h" #include "shl_ring.h" diff --git a/src/log.c b/src/shl_log.c similarity index 99% rename from src/log.c rename to src/shl_log.c index 200a879..d35a31f 100644 --- a/src/log.c +++ b/src/shl_log.c @@ -20,7 +20,7 @@ #include #include #include "githead.h" -#include "log.h" +#include "shl_log.h" #include "shl_misc.h" /* diff --git a/src/log.h b/src/shl_log.h similarity index 99% rename from src/log.h rename to src/shl_log.h index 2db3d21..fe62397 100644 --- a/src/log.h +++ b/src/shl_log.h @@ -22,8 +22,8 @@ * debug-messages for this file. */ -#ifndef LOG_H_INCLUDED -#define LOG_H_INCLUDED +#ifndef SHL_LOG_H_INCLUDED +#define SHL_LOG_H_INCLUDED #include #include @@ -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 */ diff --git a/src/text.c b/src/text.c index c829bef..5f3c07a 100644 --- a/src/text.c +++ b/src/text.c @@ -35,8 +35,8 @@ #include #include #include -#include "log.h" #include "shl_dlist.h" +#include "shl_log.h" #include "shl_misc.h" #include "shl_register.h" #include "text.h" diff --git a/src/text_bblit.c b/src/text_bblit.c index ca19fb4..8cf9bfd 100644 --- a/src/text_bblit.c +++ b/src/text_bblit.c @@ -36,7 +36,7 @@ #include #include #include -#include "log.h" +#include "shl_log.h" #include "text.h" #include "uterm_video.h" diff --git a/src/text_bbulk.c b/src/text_bbulk.c index 298d252..3f238c1 100644 --- a/src/text_bbulk.c +++ b/src/text_bbulk.c @@ -36,7 +36,7 @@ #include #include #include -#include "log.h" +#include "shl_log.h" #include "text.h" #include "uterm_video.h" diff --git a/src/text_cairo.c b/src/text_cairo.c index 6859aff..715bfb4 100644 --- a/src/text_cairo.c +++ b/src/text_cairo.c @@ -32,8 +32,8 @@ #include #include #include -#include "log.h" #include "shl_hashtable.h" +#include "shl_log.h" #include "text.h" #include "uterm_video.h" diff --git a/src/text_gltex.c b/src/text_gltex.c index 9e864a0..e767096 100644 --- a/src/text_gltex.c +++ b/src/text_gltex.c @@ -45,9 +45,9 @@ #include #include #include -#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" diff --git a/src/text_pixman.c b/src/text_pixman.c index a06209a..fc10f71 100644 --- a/src/text_pixman.c +++ b/src/text_pixman.c @@ -32,8 +32,8 @@ #include #include #include -#include "log.h" #include "shl_hashtable.h" +#include "shl_log.h" #include "text.h" #include "uterm_video.h" diff --git a/src/uterm_drm2d_render.c b/src/uterm_drm2d_render.c index 6e50bd2..cfe4d75 100644 --- a/src/uterm_drm2d_render.c +++ b/src/uterm_drm2d_render.c @@ -38,7 +38,7 @@ #include #include #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" diff --git a/src/uterm_drm2d_video.c b/src/uterm_drm2d_video.c index 0c3154a..bd103b3 100644 --- a/src/uterm_drm2d_video.c +++ b/src/uterm_drm2d_video.c @@ -38,7 +38,7 @@ #include #include #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" diff --git a/src/uterm_drm3d_render.c b/src/uterm_drm3d_render.c index 881c379..6080d2c 100644 --- a/src/uterm_drm3d_render.c +++ b/src/uterm_drm3d_render.c @@ -45,7 +45,7 @@ #include #include #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" diff --git a/src/uterm_drm3d_video.c b/src/uterm_drm3d_video.c index c8797b9..cc60685 100644 --- a/src/uterm_drm3d_video.c +++ b/src/uterm_drm3d_video.c @@ -45,7 +45,7 @@ #include #include #include "eloop.h" -#include "log.h" +#include "shl_log.h" #include "shl_misc.h" #include "static_gl.h" #include "uterm_drm_shared_internal.h" diff --git a/src/uterm_drm_shared.c b/src/uterm_drm_shared.c index 9071b9c..cfa8a80 100644 --- a/src/uterm_drm_shared.c +++ b/src/uterm_drm_shared.c @@ -36,7 +36,7 @@ #include #include #include -#include "log.h" +#include "shl_log.h" #include "shl_timer.h" #include "uterm_drm_shared_internal.h" #include "uterm_video.h" diff --git a/src/uterm_fbdev_render.c b/src/uterm_fbdev_render.c index ad96ad3..a06bf08 100644 --- a/src/uterm_fbdev_render.c +++ b/src/uterm_fbdev_render.c @@ -31,7 +31,7 @@ #include #include #include -#include "log.h" +#include "shl_log.h" #include "uterm_fbdev_internal.h" #include "uterm_video.h" #include "uterm_video_internal.h" diff --git a/src/uterm_fbdev_video.c b/src/uterm_fbdev_video.c index 1d06138..06bddca 100644 --- a/src/uterm_fbdev_video.c +++ b/src/uterm_fbdev_video.c @@ -36,7 +36,7 @@ #include #include #include -#include "log.h" +#include "shl_log.h" #include "shl_misc.h" #include "uterm_fbdev_internal.h" #include "uterm_video.h" diff --git a/src/uterm_input.c b/src/uterm_input.c index ba95771..1ba8812 100644 --- a/src/uterm_input.c +++ b/src/uterm_input.c @@ -37,9 +37,9 @@ #include #include #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" diff --git a/src/uterm_input_uxkb.c b/src/uterm_input_uxkb.c index 582151e..3053dfc 100644 --- a/src/uterm_input_uxkb.c +++ b/src/uterm_input_uxkb.c @@ -32,8 +32,8 @@ #include #include #include -#include "log.h" #include "shl_hook.h" +#include "shl_log.h" #include "shl_misc.h" #include "uterm_input.h" #include "uterm_input_internal.h" diff --git a/src/uterm_monitor.c b/src/uterm_monitor.c index b3a78fc..c6e0a6d 100644 --- a/src/uterm_monitor.c +++ b/src/uterm_monitor.c @@ -40,8 +40,8 @@ #include #include #include -#include "log.h" #include "shl_dlist.h" +#include "shl_log.h" #include "shl_misc.h" #include "uterm_monitor.h" #include "uterm_systemd_internal.h" diff --git a/src/uterm_systemd.c b/src/uterm_systemd.c index 0240370..c316bed 100644 --- a/src/uterm_systemd.c +++ b/src/uterm_systemd.c @@ -36,7 +36,7 @@ #include #include #include -#include "log.h" +#include "shl_log.h" #include "uterm_monitor.h" #include "uterm_systemd_internal.h" diff --git a/src/uterm_video.c b/src/uterm_video.c index c35b622..0323ecf 100644 --- a/src/uterm_video.c +++ b/src/uterm_video.c @@ -35,9 +35,9 @@ #include #include #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" diff --git a/src/uterm_vt.c b/src/uterm_vt.c index 55a9e54..d0f18ea 100644 --- a/src/uterm_vt.c +++ b/src/uterm_vt.c @@ -45,8 +45,8 @@ #include #include #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" diff --git a/src/wlt_main.c b/src/wlt_main.c index 2c8d509..f3caa58 100644 --- a/src/wlt_main.c +++ b/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" diff --git a/src/wlt_terminal.c b/src/wlt_terminal.c index 478ce5e..f90f574 100644 --- a/src/wlt_terminal.c +++ b/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" diff --git a/src/wlt_theme.c b/src/wlt_theme.c index 4872da7..c76693c 100644 --- a/src/wlt_theme.c +++ b/src/wlt_theme.c @@ -32,7 +32,7 @@ #include #include #include -#include "log.h" +#include "shl_log.h" #include "shl_misc.h" #include "wlt_main.h" #include "wlt_theme.h" diff --git a/src/wlt_toolkit.c b/src/wlt_toolkit.c index 104def2..548cb1e 100644 --- a/src/wlt_toolkit.c +++ b/src/wlt_toolkit.c @@ -37,10 +37,10 @@ #include #include #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"