Revert "add XFlush to g_timeout callbacks"

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index fb61494133649c4aa6653651c52f935d7812ac35..62570bd096bc725e550506ac9824e27b95502b22 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -134,8 +134,6 @@ obt_libobt_la_SOURCES = \
        obt/internal.h \
        obt/keyboard.h \
        obt/keyboard.c \
-       obt/mainloop.h \
-       obt/mainloop.c \
        obt/xml.h \
        obt/xml.c \
        obt/ddparse.h \
@@ -146,9 +144,13 @@ obt_libobt_la_SOURCES = \
        obt/paths.c \
        obt/prop.h \
        obt/prop.c \
+       obt/signal.h \
+       obt/signal.c \
        obt/util.h \
-       obt/xevent.h \
-       obt/xevent.c
+       obt/watch.h \
+       obt/watch.c \
+       obt/xqueue.h \
+       obt/xqueue.c
 
 ## openbox ##
 
@@ -188,6 +190,7 @@ openbox_openbox_SOURCES = \
        openbox/actions/debug.c \
        openbox/actions/decorations.c \
        openbox/actions/desktop.c \
+       openbox/actions/dock.c \
        openbox/actions/dockautohide.c \
        openbox/actions/directionalwindows.c \
        openbox/actions/execute.c \
@@ -435,13 +438,14 @@ obtpubinclude_HEADERS = \
        obt/link.h \
        obt/display.h \
        obt/keyboard.h \
-       obt/mainloop.h \
        obt/xml.h \
        obt/paths.h \
        obt/prop.h \
+       obt/signal.h \
        obt/util.h \
        obt/version.h \
-       obt/xevent.h
+       obt/watch.h \
+       obt/xqueue.h
 
 nodist_pkgconfig_DATA = \
        obrender/obrender-3.5.pc \