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 <dh.herrmann@googlemail.com>

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 \

src/eloop.c

@@ -172,7 +172,7 @@
 #include <time.h>
 #include <unistd.h>
 #include "eloop.h"
-#include "static_dlist.h"
+#include "shl_dlist.h"
 #include "static_hook.h"
 #include "static_llog.h"
 

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"

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 */

src/static_misc.h

@@ -36,7 +36,6 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include "static_dlist.h"
 #include "static_hook.h"
 
 /* ring buffer for arbitrary byte-streams */

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"

src/text.c

@@ -36,6 +36,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "log.h"
+#include "shl_dlist.h"
 #include "static_misc.h"
 #include "text.h"
 #include "uterm.h"

src/text_font.c

@@ -57,6 +57,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "log.h"
+#include "shl_dlist.h"
 #include "static_misc.h"
 #include "text.h"
 #include "uterm.h"

src/text_font_freetype2.c

@@ -45,6 +45,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "log.h"
+#include "shl_dlist.h"
 #include "static_misc.h"
 #include "text.h"
 #include "unicode.h"

src/text_font_pango.c

@@ -52,6 +52,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "log.h"
+#include "shl_dlist.h"
 #include "static_misc.h"
 #include "text.h"
 #include "unicode.h"

src/text_gltex.c

@@ -46,6 +46,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "log.h"
+#include "shl_dlist.h"
 #include "static_gl.h"
 #include "static_misc.h"
 #include "text.h"

src/ui.c

@@ -33,6 +33,7 @@
 #include <string.h>
 #include "eloop.h"
 #include "log.h"
+#include "shl_dlist.h"
 #include "static_misc.h"
 #include "terminal.h"
 #include "ui.h"

src/uterm_input.c

@@ -38,6 +38,7 @@
 #include <unistd.h>
 #include "eloop.h"
 #include "log.h"
+#include "shl_dlist.h"
 #include "static_misc.h"
 #include "uterm.h"
 #include "uterm_input.h"

src/uterm_monitor.c

@@ -38,6 +38,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "log.h"
+#include "shl_dlist.h"
 #include "static_misc.h"
 #include "uterm.h"
 

src/uterm_vt.c

@@ -42,6 +42,7 @@
 #include <unistd.h>
 #include "eloop.h"
 #include "log.h"
+#include "shl_dlist.h"
 #include "static_misc.h"
 #include "uterm.h"