X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=3cd5bf96b3de5ba4b3f298b9fd1a840e14b3ff6f;hb=c02c825cb8f18f0170b312ea8d4b3f4d491bff40;hp=00d7998ae91a169d967d20d4d0bd2573784ebde8;hpb=9676757a08b3e2e508c47f7795326bda8e54dc53;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 00d7998a..3cd5bf96 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,7 +46,6 @@ nodist_bin_SCRIPTS = \
 
 render_rendertest_CPPFLAGS = \
 	$(PANGO_CFLAGS) \
-	$(XFT_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	-DG_LOG_DOMAIN=\"RenderTest\"
 render_rendertest_LDADD = \
@@ -54,7 +53,6 @@ render_rendertest_LDADD = \
 	render/libobrender.la \
 	$(GLIB_LIBS) \
 	$(PANGO_LIBS) \
-	$(XFT_LIBS) \
 	$(XML_LIBS) \
 	$(X_LIBS)
 render_rendertest_SOURCES = render/test.c
@@ -64,7 +62,6 @@ render_libobrender_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(XML_CFLAGS) \
 	$(PANGO_CFLAGS) \
-	$(XFT_CFLAGS) \
 	-DG_LOG_DOMAIN=\"ObRender\" \
 	-DDEFAULT_THEME=\"$(theme)\"
 render_libobrender_la_LDFLAGS = \
@@ -73,7 +70,6 @@ render_libobrender_la_LIBADD = \
 	obt/libobt.la \
 	$(X_LIBS) \
 	$(PANGO_LIBS) \
-	$(XFT_LIBS) \
 	$(GLIB_LIBS) \
 	$(XML_LIBS)
 render_libobrender_la_SOURCES = \
@@ -206,6 +202,7 @@ openbox_openbox_SOURCES = \
 	openbox/actions/resizerelative.c \
 	openbox/actions/restart.c \
 	openbox/actions/shade.c \
+	openbox/actions/shadelowerraise.c \
 	openbox/actions/showdesktop.c \
 	openbox/actions/showmenu.c \
 	openbox/actions/unfocus.c \
@@ -244,8 +241,6 @@ openbox_openbox_SOURCES = \
 	openbox/grab.h \
 	openbox/group.c \
 	openbox/group.h \
-	openbox/hooks.c \
-	openbox/hooks.h \
 	openbox/keyboard.c \
 	openbox/keyboard.h \
 	openbox/keytree.c \