change the menu plugin interface, no need for the create/destroy functions any more.

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b4aeea1952395bfaacd75a5b8f47910dccead66b..c056e25f4d9a62739d1272b177b6d0e01de5edfa 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,19 +26,16 @@ bin_PROGRAMS = \
        tools/kdetrayproxy/kdetrayproxy
 
 plugin_LTLIBRARIES = \
-       plugins/resistance/resistance.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_menu.la
+#      plugins/menu/timed_menu.la \
+#      plugins/menu/fifo_menu.la \
+#      plugins/menu/include_menu.la \
+#      plugins/menu/client_list_menu.la
 
 if OBCONF
 bin_PROGRAMS += \
        tools/obconf/obconf
-
-#plugin_LTLIBRARIES += \
-#      plugins/resistance/resistance-config.la
 endif
 
 ## render ##
@@ -159,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 \
@@ -176,6 +174,8 @@ kernel_openbox_SOURCES = \
        kernel/popup.h \
        kernel/prop.c \
        kernel/prop.h \
+       kernel/resist.c \
+       kernel/resist.h \
        kernel/screen.c \
        kernel/screen.h \
        kernel/session.c \
@@ -194,39 +194,6 @@ kernel_openbox_SOURCES = \
        kernel/xerror.h \
        plugins/interface.h
 
-## plugins/resistance ##
-
-plugins_resistance_resistance_la_CPPFLAGS = \
-       $(XFT_CFLAGS) \
-       $(GLIB_CFLAGS) \
-       $(LIBSN_CFLAGS) \
-       $(XML_CFLAGS) \
-       -DPLUGINDIR=\"$(plugindir)\" \
-       -DG_LOG_DOMAIN=\"Plugin-Resistance\"
-plugins_resistance_resistance_la_LDFLAGS = \
-       -module \
-       -avoid-version
-plugins_resistance_resistance_la_SOURCES = \
-       plugins/resistance/resistance.c \
-       plugins/resistance/resistance.h
-
-if OBCONF
-plugins_resistance_resistance_config_la_CPPFLAGS = \
-       $(XFT_CFLAGS) \
-       $(GLIB_CFLAGS) \
-       $(LIBSN_CFLAGS) \
-       $(XML_CFLAGS) \
-       -DPLUGINDIR=\"$(plugindir)\" \
-       -DG_LOG_DOMAIN=\"Plugin-Resistance\" \
-       $(GTK_CFLAGS) \
-       $(GLADE_CFLAGS)
-plugins_resistance_resistance_config_la_LDFLAGS = \
-       -module \
-       -avoid-version
-plugins_resistance_resistance_config_la_SOURCES = \
-       plugins/resistance/resistance_config.c
-endif
-
 ## plugins/placement ##
 
 plugins_placement_placement_la_CPPFLAGS = \
@@ -300,6 +267,19 @@ plugins_menu_include_menu_la_LDFLAGS = \
 plugins_menu_include_menu_la_SOURCES = \
        plugins/menu/include_menu.c
 
+plugins_menu_client_list_menu_la_CPPFLAGS = \
+       $(XFT_CFLAGS) \
+       $(GLIB_CFLAGS) \
+       $(LIBSN_CFLAGS) \
+       $(XML_CFLAGS) \
+       -DPLUGINDIR=\"$(plugindir)\" \
+       -DG_LOG_DOMAIN=\"Plugin-Client-List-Menu\"
+plugins_menu_client_list_menu_la_LDFLAGS = \
+       -module \
+       -avoid-version
+plugins_menu_client_list_menu_la_SOURCES = \
+o      plugins/menu/client_list_menu.c
+
 
 ## obconf ##