move the client and client-list menus into the 'kernel'

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0b485927bcc7c84e1bd5bc8476e849dd9fe3a8ec..d8594793daa9f0b6afb228f2e836bfb9ddfbd3f1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,6 @@ SUBDIRS = m4 po
 themedir        = $(datadir)/openbox/themes
 localedir       = $(datadir)/locale
 rcdir           = $(datadir)/openbox
-plugindir       = $(libdir)/openbox/plugins
 desktopfilesdir = $(datadir)/gnome/wm-properties
 pixmapdir       = $(datadir)/pixmaps
 
@@ -25,13 +24,6 @@ bin_PROGRAMS = \
        kernel/openbox \
        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
-
 if OBCONF
 bin_PROGRAMS += \
        tools/obconf/obconf
@@ -103,7 +95,6 @@ kernel_openbox_CPPFLAGS = \
        $(LIBSN_CFLAGS) \
        $(XML_CFLAGS) \
        -DLOCALEDIR=\"$(localedir)\" \
-       -DPLUGINDIR=\"$(plugindir)\" \
        -DRCDIR=\"$(rcdir)\" \
        -DG_LOG_DOMAIN=\"Openbox\"
 kernel_openbox_LDADD = \
@@ -128,12 +119,14 @@ kernel_openbox_SOURCES = \
        kernel/action.h \
        kernel/client.c \
        kernel/client.h \
+       kernel/client_list_menu.c \
+       kernel/client_list_menu.h \
+       kernel/client_menu.c \
+       kernel/client_menu.h \
        kernel/config.c \
        kernel/config.h \
        kernel/debug.c \
        kernel/debug.h \
-       kernel/dispatch.c \
-       kernel/dispatch.h \
        kernel/dock.c \
        kernel/dock.h \
        kernel/event.c \
@@ -155,9 +148,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 \
@@ -166,8 +160,8 @@ kernel_openbox_SOURCES = \
        kernel/mwm.h \
        kernel/openbox.c \
        kernel/openbox.h \
-       kernel/plugin.c \
-       kernel/plugin.h \
+       kernel/place.c \
+       kernel/place.h \
        kernel/popup.c \
        kernel/popup.h \
        kernel/prop.c \
@@ -189,82 +183,7 @@ kernel_openbox_SOURCES = \
        kernel/window.c \
        kernel/window.h \
        kernel/xerror.c \
-       kernel/xerror.h \
-       plugins/interface.h
-
-## plugins/placement ##
-
-plugins_placement_placement_la_CPPFLAGS = \
-       $(XFT_CFLAGS) \
-       $(GLIB_CFLAGS) \
-       $(LIBSN_CFLAGS) \
-       $(XML_CFLAGS) \
-       -DPLUGINDIR=\"$(plugindir)\" \
-       -DG_LOG_DOMAIN=\"Plugin-Placement\"
-plugins_placement_placement_la_LDFLAGS = \
-       -module \
-       -avoid-version
-plugins_placement_placement_la_SOURCES = \
-       plugins/placement/placement.c \
-       plugins/placement/history.c \
-       plugins/placement/history.h
-
-## plugins/menu ##
-
-plugins_menu_timed_menu_la_CPPFLAGS = \
-       $(XFT_CFLAGS) \
-       $(GLIB_CFLAGS) \
-       $(LIBSN_CFLAGS) \
-       $(XML_CFLAGS) \
-       -DPLUGINDIR=\"$(plugindir)\" \
-       -DG_LOG_DOMAIN=\"Plugin-Timed-Menu\"
-plugins_menu_timed_menu_la_LDFLAGS = \
-       -module \
-       -avoid-version
-plugins_menu_timed_menu_la_SOURCES = \
-       plugins/menu/timed_menu.c \
-       plugins/menu/timed_menu.h
-
-plugins_menu_fifo_menu_la_CPPFLAGS = \
-       $(XFT_CFLAGS) \
-       $(GLIB_CFLAGS) \
-       $(LIBSN_CFLAGS) \
-       $(XML_CFLAGS) \
-       -DPLUGINDIR=\"$(plugindir)\" \
-       -DG_LOG_DOMAIN=\"Plugin-Fifo-Menu\"
-plugins_menu_fifo_menu_la_LDFLAGS = \
-       -module \
-       -avoid-version
-plugins_menu_fifo_menu_la_SOURCES = \
-       plugins/menu/fifo_menu.c \
-       plugins/menu/fifo_menu.h
-
-plugins_menu_client_menu_la_CPPFLAGS = \
-       $(XFT_CFLAGS) \
-       $(GLIB_CFLAGS) \
-       $(LIBSN_CFLAGS) \
-       $(XML_CFLAGS) \
-       -DPLUGINDIR=\"$(plugindir)\" \
-       -DG_LOG_DOMAIN=\"Plugin-Client-Menu\"
-plugins_menu_client_menu_la_LDFLAGS = \
-       -module \
-       -avoid-version
-plugins_menu_client_menu_la_SOURCES = \
-       plugins/menu/client_menu.c
-
-plugins_menu_include_menu_la_CPPFLAGS = \
-       $(XFT_CFLAGS) \
-       $(GLIB_CFLAGS) \
-       $(LIBSN_CFLAGS) \
-       $(XML_CFLAGS) \
-       -DPLUGINDIR=\"$(plugindir)\" \
-       -DG_LOG_DOMAIN=\"Plugin-Include-Menu\"
-plugins_menu_include_menu_la_LDFLAGS = \
-       -module \
-       -avoid-version
-plugins_menu_include_menu_la_SOURCES = \
-       plugins/menu/include_menu.c
-
+       kernel/xerror.h
 
 ## obconf ##