adjust for changes to the parsing api.

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a9f186d0ce22859fea007c9f5ffc08033dde503f..b4aeea1952395bfaacd75a5b8f47910dccead66b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,8 +28,6 @@ bin_PROGRAMS = \
 plugin_LTLIBRARIES = \
        plugins/resistance/resistance.la \
        plugins/placement/placement.la \
-       plugins/mouse/mouse.la \
-       plugins/keyboard/keyboard.la \
        plugins/menu/timed_menu.la \
        plugins/menu/fifo_menu.la \
        plugins/menu/client_menu.la \
@@ -157,10 +155,16 @@ kernel_openbox_SOURCES = \
        kernel/grab.h \
        kernel/group.c \
        kernel/group.h \
+       kernel/keyboard.c \
+       kernel/keyboard.h \
+       kernel/keytree.c \
+       kernel/keytree.h \
        kernel/menu.c \
        kernel/menu.h \
        kernel/menu_render.c \
        kernel/misc.h \
+       kernel/mouse.c \
+       kernel/mouse.h \
        kernel/moveresize.c \
        kernel/moveresize.h \
        kernel/mwm.h \
@@ -182,6 +186,8 @@ kernel_openbox_SOURCES = \
        kernel/startup.h \
        kernel/timer.c \
        kernel/timer.h \
+       kernel/translate.c \
+       kernel/translate.h \
        kernel/window.c \
        kernel/window.h \
        kernel/xerror.c \
@@ -238,44 +244,6 @@ plugins_placement_placement_la_SOURCES = \
        plugins/placement/history.c \
        plugins/placement/history.h
 
-## plugins/mouse ##
-
-plugins_mouse_mouse_la_CPPFLAGS = \
-       $(XFT_CFLAGS) \
-       $(GLIB_CFLAGS) \
-       $(LIBSN_CFLAGS) \
-       $(XML_CFLAGS) \
-       -DPLUGINDIR=\"$(plugindir)\" \
-       -DG_LOG_DOMAIN=\"Plugin-Mouse\"
-plugins_mouse_mouse_la_LDFLAGS = \
-       -module \
-       -avoid-version
-plugins_mouse_mouse_la_SOURCES = \
-       plugins/mouse/mouse.c \
-       plugins/mouse/mouse.h \
-       plugins/mouse/translate.c \
-       plugins/mouse/translate.h
-
-## plugins/mouse ##
-
-plugins_keyboard_keyboard_la_CPPFLAGS = \
-       $(XFT_CFLAGS) \
-       $(GLIB_CFLAGS) \
-       $(LIBSN_CFLAGS) \
-       $(XML_CFLAGS) \
-       -DPLUGINDIR=\"$(plugindir)\" \
-       -DG_LOG_DOMAIN=\"Plugin-Keyboard\"
-plugins_keyboard_keyboard_la_LDFLAGS = \
-       -module \
-       -avoid-version
-plugins_keyboard_keyboard_la_SOURCES = \
-       plugins/keyboard/keyboard.c \
-       plugins/keyboard/keyboard.h \
-       plugins/keyboard/tree.c \
-       plugins/keyboard/tree.h \
-       plugins/keyboard/translate.c \
-       plugins/keyboard/translate.h
-
 ## plugins/menu ##
 
 plugins_menu_timed_menu_la_CPPFLAGS = \
@@ -421,11 +389,33 @@ dist_bbstyle_theme_DATA = \
        themes/BBstylE/iconify.xbm \
        themes/BBstylE/close.xbm
 
+om4ob_themedir = $(themedir)/om4ob
+dist_om4ob_theme_DATA = \
+       themes/om4ob/themerc \
+       themes/om4ob/close_hover.xbm \
+       themes/om4ob/close.xbm \
+       themes/om4ob/desk_hover.xbm \
+       themes/om4ob/desk_toggled.xbm \
+       themes/om4ob/desk.xbm \
+       themes/om4ob/iconify_hover.xbm \
+       themes/om4ob/iconify_pressed.xbm \
+       themes/om4ob/iconify.xbm \
+       themes/om4ob/max_disabled.xbm \
+       themes/om4ob/max_hover.xbm \
+       themes/om4ob/max_pressed.xbm \
+       themes/om4ob/max_toggled.xbm \
+       themes/om4ob/max.xbm \
+       themes/om4ob/shade_disabled.xbm \
+       themes/om4ob/shade_hover.xbm \
+       themes/om4ob/shade_toggled.xbm \
+       themes/om4ob/shade.xbm
+
 
 ## data ##
 
 dist_rc_DATA = \
-       data/rc3
+       data/rc3 \
+       data/menu
 
 dist_desktopfiles_DATA = \
        data/openbox.desktop