X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=62570bd096bc725e550506ac9824e27b95502b22;hb=624ffe397bb52757f486208b754489cdb77fd923;hp=d919f65b49e4d74883ab9c177c1488f4ac4df560;hpb=0d90bd57abe304ffca4bf5cd1a647d30dea882b7;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index d919f65b..62570bd0 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 \
@@ -126,13 +128,12 @@ obt_libobt_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(XML_LIBS)
 obt_libobt_la_SOURCES = \
+	obt/bsearch.h \
 	obt/display.h \
 	obt/display.c \
 	obt/internal.h \
 	obt/keyboard.h \
 	obt/keyboard.c \
-	obt/mainloop.h \
-	obt/mainloop.c \
 	obt/xml.h \
 	obt/xml.c \
 	obt/ddparse.h \
@@ -143,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 ##
 
@@ -158,7 +163,6 @@ openbox_openbox_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(LIBSN_CFLAGS) \
 	$(XML_CFLAGS) \
-	$(IMLIB2_CFLAGS) \
 	-DLOCALEDIR=\"$(localedir)\" \
 	-DDATADIR=\"$(datadir)\" \
 	-DCONFIGDIR=\"$(configdir)\" \
@@ -172,7 +176,6 @@ openbox_openbox_LDADD = \
 	$(XML_LIBS) \
 	$(EFENCE_LIBS) \
 	$(LIBINTL) \
-	$(IMLIB2_LIBS) \
 	obrender/libobrender.la \
 	obt/libobt.la
 openbox_openbox_LDFLAGS = -export-dynamic
@@ -187,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 \
@@ -434,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 \