half way through the changes to new menu code/design. hot shit. static menus work...

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ae8cf62e23fb71affcce9b6bae3f9af4fa25341a..4726907c2268107ed7fc5d9041016b505952ab0d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,12 +26,12 @@ bin_PROGRAMS = \
        tools/kdetrayproxy/kdetrayproxy
 
 plugin_LTLIBRARIES = \
-       plugins/placement/placement.la \
-       plugins/menu/timed_menu.la \
-       plugins/menu/fifo_menu.la \
-       plugins/menu/client_menu.la \
-       plugins/menu/include_menu.la \
-       plugins/menu/client_list_menu.la
+       plugins/placement/placement.la
+#      plugins/menu/timed_menu.la \
+#      plugins/menu/fifo_menu.la \
+#      plugins/menu/client_menu.la \
+#      plugins/menu/include_menu.la \
+#      plugins/menu/client_list_menu.la
 
 if OBCONF
 bin_PROGRAMS += \
@@ -156,9 +156,10 @@ kernel_openbox_SOURCES = \
        kernel/keyboard.h \
        kernel/keytree.c \
        kernel/keytree.h \
+       kernel/menuframe.c \
+       kernel/menuframe.h \
        kernel/menu.c \
        kernel/menu.h \
-       kernel/menu_render.c \
        kernel/misc.h \
        kernel/mouse.c \
        kernel/mouse.h \
@@ -277,7 +278,7 @@ plugins_menu_client_list_menu_la_LDFLAGS = \
        -module \
        -avoid-version
 plugins_menu_client_list_menu_la_SOURCES = \
-       plugins/menu/client_list_menu.c
+o      plugins/menu/client_list_menu.c
 
 
 ## obconf ##