shl: move llog to shl

We might argue whether llog should be kept separate, however, shl is a
loose pile of headers and sources so pushing llog into it seems
reasonable.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This commit is contained in:
David Herrmann 2012-09-18 09:18:50 +02:00
parent 8deb82f653
commit d62b367210
5 changed files with 9 additions and 6 deletions

View File

@ -91,6 +91,8 @@ SHL_RING = \
src/shl_ring.h
SHL_TIMER = \
src/shl_timer.h
SHL_LLOG = \
src/shl_llog.h
#
# libeloop
@ -103,6 +105,7 @@ lib_LTLIBRARIES += \
libeloop_la_SOURCES = \
$(SHL_DLIST) \
$(SHL_LLOG) \
src/static_llog.h \
src/static_hook.h \
src/eloop.h \

View File

@ -173,8 +173,8 @@
#include <unistd.h>
#include "eloop.h"
#include "shl_dlist.h"
#include "shl_llog.h"
#include "static_hook.h"
#include "static_llog.h"
#define LLOG_SUBSYSTEM "eloop"

View File

@ -45,8 +45,8 @@
* args: Argument array
*/
#ifndef LLOG_H_INCLUDED
#define LLOG_H_INCLUDED
#ifndef SHL_LLOG_H_INCLUDED
#define SHL_LLOG_H_INCLUDED
#include <stdarg.h>
#include <stdlib.h>
@ -192,4 +192,4 @@ static const char *LLOG_SUBSYSTEM __attribute__((__unused__));
#define llog_vdENOMEM(obj) \
((void)llog_dENOMEM(obj))
#endif /* LLOG_H_INCLUDED */
#endif /* SHL_LLOG_H_INCLUDED */

View File

@ -38,7 +38,7 @@
#include <stdbool.h>
#include <stdlib.h>
#include <stddef.h>
#include "static_llog.h"
#include "shl_llog.h"
/*
* Math Helpers

View File

@ -38,8 +38,8 @@
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
#include "shl_llog.h"
#include "static_gl.h"
#include "static_llog.h"
#define LLOG_SUBSYSTEM "gl_shader"