X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=4b162ed471c8af8f2c3a91da04eecd368e0e6cf1;hb=9e85e930da614ebef4e714ec890644d6e7241871;hp=ae8cf62e23fb71affcce9b6bae3f9af4fa25341a;hpb=cbd0e4d308e6761740ca1561108ffe97453a054d;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index ae8cf62e..4b162ed4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,11 +27,11 @@ bin_PROGRAMS = \
 
 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/menu/timed_menu.la \
+#	plugins/menu/fifo_menu.la \
+#	plugins/menu/include_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 ##