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

diff --git a/Makefile.am b/Makefile.am
index 0f1b2b7d..6d447a60 100644
--- 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
 
@@ -22,25 +21,12 @@ lib_LTLIBRARIES = \
 	parser/libobparser.la
 
 bin_PROGRAMS = \
-	kernel/openbox \
+	openbox/openbox \
 	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
-
 if OBCONF
 bin_PROGRAMS += \
 	tools/obconf/obconf
-
-#plugin_LTLIBRARIES += \
-#	plugins/resistance/resistance-config.la
 endif
 
 ## render ##
@@ -98,21 +84,19 @@ parser_libobparser_la_SOURCES = \
 	parser/parse.h \
 	parser/parse.c
 
-## kernel ##
+## openbox ##
 
-kernel_openbox_CPPFLAGS = \
+openbox_openbox_CPPFLAGS = \
 	$(X_CFLAGS) \
 	$(SM_CFLAGS) \
 	$(XFT_CFLAGS) \
 	$(GLIB_CFLAGS) \
-	$(GMODULE_CFLAGS) \
 	$(LIBSN_CFLAGS) \
 	$(XML_CFLAGS) \
 	-DLOCALEDIR=\"$(localedir)\" \
-	-DPLUGINDIR=\"$(plugindir)\" \
 	-DRCDIR=\"$(rcdir)\" \
 	-DG_LOG_DOMAIN=\"Openbox\"
-kernel_openbox_LDADD = \
+openbox_openbox_LDADD = \
 	$(SM_LIBS) \
 	$(XINERAMA_LIBS) \
 	$(XKB_LIBS) \
@@ -120,218 +104,84 @@ kernel_openbox_LDADD = \
 	$(VIDMODE_LIBS) \
 	$(XSHAPE_LIBS) \
 	$(GLIB_LIBS) \
-	$(GMODULE_LIBS) \
 	$(LIBSN_LIBS) \
 	$(XML_LIBS) \
 	$(EFENCE_LIBS) \
 	$(LIBINTL) \
 	render/libobrender.la \
 	parser/libobparser.la
-kernel_openbox_LDFLAGS = -export-dynamic
-kernel_openbox_SOURCES = \
+openbox_openbox_LDFLAGS = -export-dynamic
+openbox_openbox_SOURCES = \
 	gettext.h \
-	kernel/action.c \
-	kernel/action.h \
-	kernel/client.c \
-	kernel/client.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 \
-	kernel/event.h \
-	kernel/extensions.c \
-	kernel/extensions.h \
-	kernel/focus.c \
-	kernel/focus.h \
-	kernel/frame.c \
-	kernel/frame.h \
-	kernel/framerender.c \
-	kernel/framerender.h \
-	kernel/geom.h \
-	kernel/grab.c \
-	kernel/grab.h \
-	kernel/group.c \
-	kernel/group.h \
-	kernel/menu.c \
-	kernel/menu.h \
-	kernel/menu_render.c \
-	kernel/misc.h \
-	kernel/moveresize.c \
-	kernel/moveresize.h \
-	kernel/mwm.h \
-	kernel/openbox.c \
-	kernel/openbox.h \
-	kernel/plugin.c \
-	kernel/plugin.h \
-	kernel/popup.c \
-	kernel/popup.h \
-	kernel/prop.c \
-	kernel/prop.h \
-	kernel/screen.c \
-	kernel/screen.h \
-	kernel/session.c \
-	kernel/session.h \
-	kernel/stacking.c \
-	kernel/stacking.h \
-	kernel/startup.c \
-	kernel/startup.h \
-	kernel/timer.c \
-	kernel/timer.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 = \
-	$(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/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 = \
-	$(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
-
+	openbox/action.c \
+	openbox/action.h \
+	openbox/client.c \
+	openbox/client.h \
+	openbox/client_list_menu.c \
+	openbox/client_list_menu.h \
+	openbox/client_menu.c \
+	openbox/client_menu.h \
+	openbox/config.c \
+	openbox/config.h \
+	openbox/debug.c \
+	openbox/debug.h \
+	openbox/dock.c \
+	openbox/dock.h \
+	openbox/event.c \
+	openbox/event.h \
+	openbox/extensions.c \
+	openbox/extensions.h \
+	openbox/focus.c \
+	openbox/focus.h \
+	openbox/frame.c \
+	openbox/frame.h \
+	openbox/framerender.c \
+	openbox/framerender.h \
+	openbox/geom.h \
+	openbox/grab.c \
+	openbox/grab.h \
+	openbox/group.c \
+	openbox/group.h \
+	openbox/keyboard.c \
+	openbox/keyboard.h \
+	openbox/keytree.c \
+	openbox/keytree.h \
+	openbox/mainloop.c \
+	openbox/mainloop.h \
+	openbox/menuframe.c \
+	openbox/menuframe.h \
+	openbox/menu.c \
+	openbox/menu.h \
+	openbox/misc.h \
+	openbox/mouse.c \
+	openbox/mouse.h \
+	openbox/moveresize.c \
+	openbox/moveresize.h \
+	openbox/mwm.h \
+	openbox/openbox.c \
+	openbox/openbox.h \
+	openbox/place.c \
+	openbox/place.h \
+	openbox/popup.c \
+	openbox/popup.h \
+	openbox/prop.c \
+	openbox/prop.h \
+	openbox/resist.c \
+	openbox/resist.h \
+	openbox/screen.c \
+	openbox/screen.h \
+	openbox/session.c \
+	openbox/session.h \
+	openbox/stacking.c \
+	openbox/stacking.h \
+	openbox/startup.c \
+	openbox/startup.h \
+	openbox/translate.c \
+	openbox/translate.h \
+	openbox/window.c \
+	openbox/window.h \
+	openbox/xerror.c \
+	openbox/xerror.h
 
 ## obconf ##
 
@@ -352,7 +202,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 +227,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 +264,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