build: make eloop independent of libkmscon-static

This removes the nasty dependency to libkmscon-static for libeloop.
Otherwise, we might end up with GLESv2 dependencies here which is really
not what we want.

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

diff --git a/Makefile.am b/Makefile.am
index 95b2d17..3ca40b7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -267,6 +267,8 @@ include_HEADERS += \
 #
 
 libeloop_la_SOURCES = \
+       src/static_dlist.h \
+       src/static_hook.h \
        src/eloop.h \
        src/eloop.c
 
@@ -280,7 +282,6 @@ libeloop_la_CPPFLAGS = \
        $(AM_CPPFLAGS) \
        $(DBUS_CFLAGS)
 libeloop_la_LIBADD = \
-       libkmscon-static.la \
        $(DBUS_LIBS)
 libeloop_la_LDFLAGS = \
        -version-info 1:0:0

diff --git a/src/eloop.c b/src/eloop.c
index e8ace7f..82b61fa 100644 (file)
--- a/src/eloop.c
+++ b/src/eloop.c
@@ -172,8 +172,9 @@
 #include <time.h>
 #include <unistd.h>
 #include "eloop.h"
+#include "static_dlist.h"
+#include "static_hook.h"
 #include "static_llog.h"
-#include "static_misc.h"
 
 #define LLOG_SUBSYSTEM "eloop"