X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=d8594793daa9f0b6afb228f2e836bfb9ddfbd3f1;hb=a9567a816385f8f66ed0f827bb4af78cdb10cd6d;hp=6ab3dc2de21d7bc2ee469f09aaa35b460788ed08;hpb=759565a70e9bdd9bb842533f1c01df792d0bd1a4;p=chaz%2Fopenbox diff --git a/Makefile.am b/Makefile.am index 6ab3dc2d..d8594793 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,11 +3,10 @@ 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 -theme = operation +theme = thebear AUTOMAKE_OPTIONS = subdir-objects ACLOCAL_AMFLAGS = -I m4 @@ -25,22 +24,9 @@ bin_PROGRAMS = \ kernel/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 ## @@ -109,7 +95,6 @@ kernel_openbox_CPPFLAGS = \ $(LIBSN_CFLAGS) \ $(XML_CFLAGS) \ -DLOCALEDIR=\"$(localedir)\" \ - -DPLUGINDIR=\"$(plugindir)\" \ -DRCDIR=\"$(rcdir)\" \ -DG_LOG_DOMAIN=\"Openbox\" kernel_openbox_LDADD = \ @@ -134,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 \ @@ -157,21 +144,30 @@ 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 \ 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 \ kernel/prop.h \ + kernel/resist.c \ + kernel/resist.h \ kernel/screen.c \ kernel/screen.h \ kernel/session.c \ @@ -182,156 +178,12 @@ 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 = \ - $(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 - + kernel/xerror.h ## obconf ## @@ -352,7 +204,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 ## @@ -367,67 +220,96 @@ tools_kdetrayproxy_kdetrayproxy_SOURCES = \ ## themes ## -dist_theme_DATA = \ - themes/artwiz \ - themes/bbs \ - themes/bluebox \ - themes/cthulhain \ - themes/deep \ - themes/ebox \ - themes/fieron \ - themes/fieron2 \ - themes/flux \ - themes/frobozz \ - themes/frobust \ - themes/mbdtex \ - themes/miklos \ - themes/nyz \ - themes/nyzclone \ - themes/ob20 \ - themes/operation \ - themes/outcomes \ - themes/paper \ - themes/purplehaaze \ - themes/shade \ - themes/steelblue \ - themes/steelblue2 \ - themes/the_orange \ - themes/trisb \ - themes/twice \ - themes/warp-xp - -fieronthemedir = $(themedir)/fieron_data -dist_fierontheme_DATA = \ - themes/fieron_data/close.xbm \ - themes/fieron_data/iconify.xbm \ - themes/fieron_data/max.xbm \ - themes/fieron_data/stick.xbm - -fieron2themedir = $(themedir)/fieron2_data -dist_fieron2theme_DATA = \ - themes/fieron2_data/close.xbm \ - themes/fieron2_data/iconify.xbm \ - themes/fieron2_data/max.xbm \ - themes/fieron2_data/stick.xbm - -eboxthemedir = $(themedir)/ebox_data -dist_eboxtheme_DATA = \ - themes/ebox_data/close.xbm \ - themes/ebox_data/iconify.xbm \ - themes/ebox_data/max.xbm +thebear_themedir = $(themedir)/thebear +dist_thebear_theme_DATA = \ + themes/thebear/themerc + +planton_themedir = $(themedir)/planton +dist_planton_theme_DATA = \ + themes/planton/themerc \ + themes/planton/max.xbm \ + themes/planton/max_toggled.xbm \ + themes/planton/desk.xbm \ + themes/planton/desk_toggled.xbm \ + themes/planton/shade.xbm \ + themes/planton/shade_toggled.xbm \ + themes/planton/iconify.xbm \ + themes/planton/close.xbm + +lightindustry_themedir = $(themedir)/Light-Industry +dist_lightindustry_theme_DATA = \ + themes/Light-Industry/themerc \ + themes/Light-Industry/max.xbm \ + themes/Light-Industry/iconify.xbm \ + themes/Light-Industry/close.xbm + +lightindustrybig_themedir = $(themedir)/Light-Industry-big +dist_lightindustrybig_theme_DATA = \ + themes/Light-Industry-big/themerc \ + themes/Light-Industry-big/max.xbm \ + themes/Light-Industry-big/iconify.xbm \ + themes/Light-Industry-big/close.xbm + +imerry_themedir = $(themedir)/I-merry +dist_imerry_theme_DATA = \ + themes/I-merry/themerc \ + themes/I-merry/max.xbm \ + themes/I-merry/iconify.xbm \ + themes/I-merry/close.xbm + +greenz_themedir = $(themedir)/greenz +dist_greenz_theme_DATA = \ + themes/greenz/themerc + +bbstyle_themedir = $(themedir)/BBstylE +dist_bbstyle_theme_DATA = \ + themes/BBstylE/themerc \ + themes/BBstylE/max.xbm \ + themes/BBstylE/max_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