X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=fd9ea7a2af2c50b08f05925b21cd4fa5e8c6df0a;hb=48cc1758e4bd5f85140f9f52888e3eb5e3934b22;hp=036575297457cf5aedc71c3728dfb11d2bb2f895;hpb=a6532c3b2f00851db3aff05c381b308732350f86;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 03657529..fd9ea7a2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -91,7 +91,6 @@ openbox_openbox_CPPFLAGS = \
 	$(SM_CFLAGS) \
 	$(XFT_CFLAGS) \
 	$(GLIB_CFLAGS) \
-	$(GMODULE_CFLAGS) \
 	$(LIBSN_CFLAGS) \
 	$(XML_CFLAGS) \
 	-DLOCALEDIR=\"$(localedir)\" \
@@ -105,7 +104,6 @@ openbox_openbox_LDADD = \
 	$(VIDMODE_LIBS) \
 	$(XSHAPE_LIBS) \
 	$(GLIB_LIBS) \
-	$(GMODULE_LIBS) \
 	$(LIBSN_LIBS) \
 	$(XML_LIBS) \
 	$(EFENCE_LIBS) \
@@ -148,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 \
@@ -176,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 \
@@ -192,7 +190,6 @@ tools_obconf_obconf_CPPFLAGS = \
 	$(GDK_PIXBUF_CFLAGS) \
 	$(XML_CFLAGS) \
 	-DLOCALEDIR=\"$(localedir)\" \
-	-DPLUGINDIR=\"$(plugindir)\" \
 	-DRCDIR=\"$(rcdir)\" \
 	-DPIXMAPDIR=\"$(pixmapdir)\" \
 	-DG_LOG_DOMAIN=\"Obconf\"
@@ -204,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 ##