this includes a number of things since my magnificent return....

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 74c243237cc4ce48ea9b98630fb16f4516922c45..2c2ba0207a7f7c32c46b7ba2e3c69854510a3b4d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -138,7 +138,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 +287,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 \