X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=fc415ba4986911e91998597fb5e1192e47365238;hb=48a7c32512db4358dc7c2928174bccc203d30e69;hp=74c243237cc4ce48ea9b98630fb16f4516922c45;hpb=c10b4e6b3f1b76efc3e29f7a03d782916822a159;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 74c24323..fc415ba4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,13 +34,12 @@ bin_PROGRAMS = \
 ## render ##
 
 render_rendertest_CPPFLAGS = \
-	$(XFT_CFLAGS) \
+	$(PANGO_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	-DG_LOG_DOMAIN=\"RenderTest\"
 render_rendertest_LDADD = \
 	parser/libobparser.la \
 	render/libobrender.la \
-	$(XFT_LIBS) \
 	$(GLIB_LIBS) \
 	$(PANGO_LIBS) \
 	$(XML_LIBS) \
@@ -49,7 +48,6 @@ render_rendertest_SOURCES = render/test.c
 
 render_libobrender_la_CPPFLAGS = \
 	$(X_CFLAGS) \
-	$(XFT_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(XML_CFLAGS) \
 	$(PANGO_CFLAGS) \
@@ -60,7 +58,6 @@ render_libobrender_la_LDFLAGS = \
 render_libobrender_la_LIBADD = \
 	parser/libobparser.la \
 	$(X_LIBS) \
-	$(XFT_LIBS) \
 	$(PANGO_LIBS) \
 	$(GLIB_LIBS) \
 	$(XML_LIBS)
@@ -108,7 +105,7 @@ parser_libobparser_la_SOURCES = \
 openbox_openbox_CPPFLAGS = \
 	$(X_CFLAGS) \
 	$(SM_CFLAGS) \
-	$(XFT_CFLAGS) \
+	$(PANGO_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(LIBSN_CFLAGS) \
 	$(XML_CFLAGS) \
@@ -138,7 +135,8 @@ openbox_openbox_SOURCES = \
 	openbox/client.c \
 	openbox/client.h \
 	openbox/client_list_menu.c \
-	openbox/client_list_menu.h \
+	openbox/client_list_combined_menu.c \
+	openbox/client_list_combined_menu.h \
 	openbox/client_menu.c \
 	openbox/client_menu.h \
 	openbox/config.c \
@@ -286,21 +284,13 @@ dist_orang_theme_DATA= \
 
 syscrash_themedir = $(themedir)/syscrash/openbox-3
 dist_syscrash_theme_DATA= \
-	themes/syscrash/openbox-3/bullet-small.xbm \
 	themes/syscrash/openbox-3/bullet.xbm \
-	themes/syscrash/openbox-3/close-cross.xbm \
 	themes/syscrash/openbox-3/close_disabled.xbm \
-	themes/syscrash/openbox-3/close_hover.xbm \
-	themes/syscrash/openbox-3/close_pressed.xbm \
 	themes/syscrash/openbox-3/close.xbm \
 	themes/syscrash/openbox-3/desk_toggled.xbm \
-	themes/syscrash/openbox-3/desk_toggle.xbm \
 	themes/syscrash/openbox-3/desk.xbm \
-	themes/syscrash/openbox-3/iconify_hover.xbm \
-	themes/syscrash/openbox-3/iconify_pressed.xbm \
 	themes/syscrash/openbox-3/iconify.xbm \
 	themes/syscrash/openbox-3/max_disabled.xbm \
-	themes/syscrash/openbox-3/max_hover.xbm \
 	themes/syscrash/openbox-3/max_pressed.xbm \
 	themes/syscrash/openbox-3/max_toggled.xbm \
 	themes/syscrash/openbox-3/max.xbm \