X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=c056e25f4d9a62739d1272b177b6d0e01de5edfa;hb=615cbd96075905d75533f9b615c4ee6a75f4f9a4;hp=0f1b2b7d00febf5c151fb8511135a5af36c498a9;hpb=d6559d02a8fbf59be960b1bd4ec9144aa6d45950;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 0f1b2b7d..c056e25f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,21 +26,16 @@ bin_PROGRAMS = \
 	tools/kdetrayproxy/kdetrayproxy
 
 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 \
-	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 ##
@@ -157,10 +152,17 @@ 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/menuframe.c \
+	kernel/menuframe.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 \
@@ -172,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 \
@@ -182,45 +186,14 @@ 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 \
 	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 = \
@@ -238,44 +211,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 = \
@@ -332,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 ##
 
@@ -352,7 +300,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 ##
@@ -376,8 +325,8 @@ dist_planton_theme_DATA = \
 	themes/planton/themerc \
 	themes/planton/max.xbm \
 	themes/planton/max_toggled.xbm \
-	themes/planton/stick.xbm \
-	themes/planton/stick_toggled.xbm \
+	themes/planton/desk.xbm \
+	themes/planton/desk_toggled.xbm \
 	themes/planton/shade.xbm \
 	themes/planton/shade_toggled.xbm \
 	themes/planton/iconify.xbm \
@@ -413,26 +362,50 @@ dist_bbstyle_theme_DATA = \
 	themes/BBstylE/themerc \
 	themes/BBstylE/max.xbm \
 	themes/BBstylE/max_toggled.xbm \
-	themes/BBstylE/stick.xbm \
-	themes/BBstylE/stick_toggled.xbm \
+	themes/BBstylE/desk.xbm \
+	themes/BBstylE/desk_toggled.xbm \
 	themes/BBstylE/shade.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
+	data/rc3 \
+	data/menu
+
+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