X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=cb82d10f9c523865e1e2d4ca631ebdd263f250b0;hb=35181125f185102f37b53af92a4dbc251d1a6e19;hp=422fccb29e821266484f042155c0da10bf697dcd;hpb=4d9bd88f12d917ee105ccde0a3b5ed87bf0788ad;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 422fccb2..cb82d10f 100644
--- 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 = \
@@ -352,7 +320,8 @@ tools_obconf_obconf_LDADD = \
 	parser/libobparser.la
 tools_obconf_obconf_SOURCES = \
 	gettext.h \
-	tools/obconf/main.c
+	tools/obconf/main.c \
+	plugins/obconf_interface.h
 
 
 ## kdetrayproxy ##
@@ -375,11 +344,11 @@ planton_themedir = $(themedir)/planton
 dist_planton_theme_DATA = \
 	themes/planton/themerc \
 	themes/planton/max.xbm \
-	themes/planton/max_t.xbm \
-	themes/planton/stick.xbm \
-	themes/planton/stick_t.xbm \
+	themes/planton/max_toggled.xbm \
+	themes/planton/desk.xbm \
+	themes/planton/desk_toggled.xbm \
 	themes/planton/shade.xbm \
-	themes/planton/shade_t.xbm \
+	themes/planton/shade_toggled.xbm \
 	themes/planton/iconify.xbm \
 	themes/planton/close.xbm
 
@@ -404,35 +373,58 @@ dist_imerry_theme_DATA = \
 	themes/I-merry/iconify.xbm \
 	themes/I-merry/close.xbm
 
-greenz_themedir = $(themedir)/I-merry
+greenz_themedir = $(themedir)/greenz
 dist_greenz_theme_DATA = \
-	themes/I-merry/themerc
+	themes/greenz/themerc
 
 bbstyle_themedir = $(themedir)/BBstylE
 dist_bbstyle_theme_DATA = \
 	themes/BBstylE/themerc \
 	themes/BBstylE/max.xbm \
-	themes/BBstylE/max_t.xbm \
-	themes/BBstylE/stick.xbm \
-	themes/BBstylE/stick_t.xbm \
+	themes/BBstylE/max_toggled.xbm \
+	themes/BBstylE/desk.xbm \
+	themes/BBstylE/desk_toggled.xbm \
 	themes/BBstylE/shade.xbm \
-	themes/BBstylE/shade_t.xbm \
+	themes/BBstylE/shade_toggled.xbm \
 	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
 
+dist_desktopfiles_DATA = \
+	data/openbox.desktop
+
 EXTRA_DIST = \
 	config.rpath \
 	mkinstalldirs \
 	README \
 	COPYING \
-	AUTHORS \
-	plugins/obconf_interface.h
+	AUTHORS
 
 #doc:
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc