X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=fd9ea7a2af2c50b08f05925b21cd4fa5e8c6df0a;hb=45520c3244dd37982916f896a78a201fcf40457f;hp=edfb202bca1dab02d93881e88aa3e88b4dce4e69;hpb=7fbf1f4bd82d4b7dd738bd04fa7677494d645875;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index edfb202b..fd9ea7a2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -146,6 +146,8 @@ openbox_openbox_SOURCES = \
 	openbox/keyboard.h \
 	openbox/keytree.c \
 	openbox/keytree.h \
+	openbox/mainloop.c \
+	openbox/mainloop.h \
 	openbox/menuframe.c \
 	openbox/menuframe.h \
 	openbox/menu.c \
@@ -174,8 +176,6 @@ openbox_openbox_SOURCES = \
 	openbox/stacking.h \
 	openbox/startup.c \
 	openbox/startup.h \
-	openbox/timer.c \
-	openbox/timer.h \
 	openbox/translate.c \
 	openbox/translate.h \
 	openbox/window.c \
@@ -190,7 +190,6 @@ tools_obconf_obconf_CPPFLAGS = \
 	$(GDK_PIXBUF_CFLAGS) \
 	$(XML_CFLAGS) \
 	-DLOCALEDIR=\"$(localedir)\" \
-	-DPLUGINDIR=\"$(plugindir)\" \
 	-DRCDIR=\"$(rcdir)\" \
 	-DPIXMAPDIR=\"$(pixmapdir)\" \
 	-DG_LOG_DOMAIN=\"Obconf\"
@@ -202,8 +201,7 @@ tools_obconf_obconf_LDADD = \
 	parser/libobparser.la
 tools_obconf_obconf_SOURCES = \
 	gettext.h \
-	tools/obconf/main.c \
-	plugins/obconf_interface.h
+	tools/obconf/main.c
 
 
 ## kdetrayproxy ##