From aed1373bc6dd6c09eb49e0308671f88853e58a81 Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Sat, 15 Sep 2012 19:48:38 +0200 Subject: [PATCH] shl: move dlist to shl_dlist.h Instead of including dlist in the static library, we now move it to SHL. Signed-off-by: David Herrmann --- Makefile.am | 9 ++++++--- src/eloop.c | 2 +- src/main.c | 1 + src/{static_dlist.h => shl_dlist.h} | 2 +- src/static_misc.h | 1 - src/terminal.c | 1 + src/text.c | 1 + src/text_font.c | 1 + src/text_font_freetype2.c | 1 + src/text_font_pango.c | 1 + src/text_gltex.c | 1 + src/ui.c | 1 + src/uterm_input.c | 1 + src/uterm_monitor.c | 1 + src/uterm_vt.c | 1 + 15 files changed, 19 insertions(+), 6 deletions(-) rename src/{static_dlist.h => shl_dlist.h} (98%) diff --git a/Makefile.am b/Makefile.am index 85035fb..287288f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -83,8 +83,8 @@ lib_LTLIBRARIES += \ libeloop.la libeloop_la_SOURCES = \ + src/shl_dlist.h \ src/static_llog.h \ - src/static_dlist.h \ src/static_hook.h \ src/eloop.h \ src/eloop.c @@ -121,6 +121,7 @@ lib_LTLIBRARIES += \ libuterm.la libuterm_la_SOURCES = \ + src/shl_dlist.h \ src/uterm.h \ src/uterm_keysyms.h \ src/uterm_input.h \ @@ -238,6 +239,7 @@ src/text_font_unifont_data.c: $(UNIFONT) genunifont$(EXEEXT) # libkmscon_core_la_SOURCES = \ + src/shl_dlist.h \ src/main.h \ src/conf.c src/conf.h \ src/ui.c src/ui.h \ @@ -313,7 +315,6 @@ libkmscon_core_la_LIBADD = \ libkmscon_static_la_SOURCES = \ src/static_llog.h \ - src/static_dlist.h \ src/static_hook.h \ src/static_misc.h \ src/static_misc.c \ @@ -344,7 +345,9 @@ endif # built as part of kmscon. # -kmscon_SOURCES = src/main.c +kmscon_SOURCES = \ + src/shl_dlist.h \ + src/main.c kmscon_LDADD = \ libuterm.la \ libeloop.la \ diff --git a/src/eloop.c b/src/eloop.c index cb876ed..3bbfea4 100644 --- a/src/eloop.c +++ b/src/eloop.c @@ -172,7 +172,7 @@ #include #include #include "eloop.h" -#include "static_dlist.h" +#include "shl_dlist.h" #include "static_hook.h" #include "static_llog.h" diff --git a/src/main.c b/src/main.c index e7eabe1..9f4de6d 100644 --- a/src/main.c +++ b/src/main.c @@ -35,6 +35,7 @@ #include "eloop.h" #include "log.h" #include "main.h" +#include "shl_dlist.h" #include "static_misc.h" #include "text.h" #include "ui.h" diff --git a/src/static_dlist.h b/src/shl_dlist.h similarity index 98% rename from src/static_dlist.h rename to src/shl_dlist.h index 226eb01..17ca8b3 100644 --- a/src/static_dlist.h +++ b/src/shl_dlist.h @@ -109,4 +109,4 @@ static inline bool shl_dlist_empty(struct shl_dlist *head) for (iter = (head)->next, tmp = iter->next; iter != (head); \ iter = tmp, tmp = iter->next) -#endif /* SHL_STATIC_DLIST_H */ +#endif /* SHL_DLIST_H */ diff --git a/src/static_misc.h b/src/static_misc.h index 3e3ea84..96d8e7c 100644 --- a/src/static_misc.h +++ b/src/static_misc.h @@ -36,7 +36,6 @@ #include #include #include -#include "static_dlist.h" #include "static_hook.h" /* ring buffer for arbitrary byte-streams */ diff --git a/src/terminal.c b/src/terminal.c index 231827a..c0218c7 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -38,6 +38,7 @@ #include "log.h" #include "main.h" #include "pty.h" +#include "shl_dlist.h" #include "static_misc.h" #include "terminal.h" #include "text.h" diff --git a/src/text.c b/src/text.c index bbdfeab..e831c6e 100644 --- a/src/text.c +++ b/src/text.c @@ -36,6 +36,7 @@ #include #include #include "log.h" +#include "shl_dlist.h" #include "static_misc.h" #include "text.h" #include "uterm.h" diff --git a/src/text_font.c b/src/text_font.c index ecd4e3c..9d15f59 100644 --- a/src/text_font.c +++ b/src/text_font.c @@ -57,6 +57,7 @@ #include #include #include "log.h" +#include "shl_dlist.h" #include "static_misc.h" #include "text.h" #include "uterm.h" diff --git a/src/text_font_freetype2.c b/src/text_font_freetype2.c index 74bd33c..f17775d 100644 --- a/src/text_font_freetype2.c +++ b/src/text_font_freetype2.c @@ -45,6 +45,7 @@ #include #include #include "log.h" +#include "shl_dlist.h" #include "static_misc.h" #include "text.h" #include "unicode.h" diff --git a/src/text_font_pango.c b/src/text_font_pango.c index cca2332..134e1bf 100644 --- a/src/text_font_pango.c +++ b/src/text_font_pango.c @@ -52,6 +52,7 @@ #include #include #include "log.h" +#include "shl_dlist.h" #include "static_misc.h" #include "text.h" #include "unicode.h" diff --git a/src/text_gltex.c b/src/text_gltex.c index 68f0586..6ec57ad 100644 --- a/src/text_gltex.c +++ b/src/text_gltex.c @@ -46,6 +46,7 @@ #include #include #include "log.h" +#include "shl_dlist.h" #include "static_gl.h" #include "static_misc.h" #include "text.h" diff --git a/src/ui.c b/src/ui.c index 81253b4..41c7b2d 100644 --- a/src/ui.c +++ b/src/ui.c @@ -33,6 +33,7 @@ #include #include "eloop.h" #include "log.h" +#include "shl_dlist.h" #include "static_misc.h" #include "terminal.h" #include "ui.h" diff --git a/src/uterm_input.c b/src/uterm_input.c index 6a111ee..2a55318 100644 --- a/src/uterm_input.c +++ b/src/uterm_input.c @@ -38,6 +38,7 @@ #include #include "eloop.h" #include "log.h" +#include "shl_dlist.h" #include "static_misc.h" #include "uterm.h" #include "uterm_input.h" diff --git a/src/uterm_monitor.c b/src/uterm_monitor.c index 6f13851..2176dec 100644 --- a/src/uterm_monitor.c +++ b/src/uterm_monitor.c @@ -38,6 +38,7 @@ #include #include #include "log.h" +#include "shl_dlist.h" #include "static_misc.h" #include "uterm.h" diff --git a/src/uterm_vt.c b/src/uterm_vt.c index 93a03eb..a0e4a2c 100644 --- a/src/uterm_vt.c +++ b/src/uterm_vt.c @@ -42,6 +42,7 @@ #include #include "eloop.h" #include "log.h" +#include "shl_dlist.h" #include "static_misc.h" #include "uterm.h"