X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=12176d67e959cd9529c31314445483115f9e6ff9;hb=c36b89ba12eae18d3011c8516906c21e9abb89dc;hp=e8d5b462039221f0fe03e4d354468ef045c09716;hpb=262591ec1adc1badfcb36e9e6876dd81f2df9492;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index e8d5b462..12176d67 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -69,6 +69,7 @@ obrender_libobrender_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(XML_CFLAGS) \
 	$(PANGO_CFLAGS) \
+	$(IMLIB2_CFLAGS) \
 	-DG_LOG_DOMAIN=\"ObRender\" \
 	-DDEFAULT_THEME=\"$(theme)\"
 obrender_libobrender_la_LDFLAGS = \
@@ -77,6 +78,7 @@ obrender_libobrender_la_LIBADD = \
 	$(X_LIBS) \
 	$(PANGO_LIBS) \
 	$(GLIB_LIBS) \
+	$(IMLIB2_LIBS) \
 	$(XML_LIBS)
 obrender_libobrender_la_SOURCES = \
 	gettext.h \
@@ -132,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 \
@@ -145,8 +145,10 @@ obt_libobt_la_SOURCES = \
 	obt/prop.h \
 	obt/prop.c \
 	obt/util.h \
-	obt/xevent.h \
-	obt/xevent.c
+	obt/watch.h \
+	obt/watch.c \
+	obt/xqueue.h \
+	obt/xqueue.c
 
 ## openbox ##
 
@@ -159,7 +161,6 @@ openbox_openbox_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(LIBSN_CFLAGS) \
 	$(XML_CFLAGS) \
-	$(IMLIB2_CFLAGS) \
 	-DLOCALEDIR=\"$(localedir)\" \
 	-DDATADIR=\"$(datadir)\" \
 	-DCONFIGDIR=\"$(configdir)\" \
@@ -173,7 +174,6 @@ openbox_openbox_LDADD = \
 	$(XML_LIBS) \
 	$(EFENCE_LIBS) \
 	$(LIBINTL) \
-	$(IMLIB2_LIBS) \
 	obrender/libobrender.la \
 	obt/libobt.la
 openbox_openbox_LDFLAGS = -export-dynamic
@@ -435,13 +435,13 @@ obtpubinclude_HEADERS = \
 	obt/link.h \
 	obt/display.h \
 	obt/keyboard.h \
-	obt/mainloop.h \
 	obt/xml.h \
 	obt/paths.h \
 	obt/prop.h \
 	obt/util.h \
 	obt/version.h \
-	obt/xevent.h
+	obt/watch.h \
+	obt/xqueue.h
 
 nodist_pkgconfig_DATA = \
 	obrender/obrender-3.5.pc \