changes to the client menu, which entries are there, and reorganizing, and renaming.

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2eac7313fa70147bfe33037ad7867c07e396684a..b879c0178e76722a8ccef8d9b10ee93d8ee604da 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,7 @@ pubincludedir   = $(includedir)/openbox/@OB_VERSION@/openbox
 pixmapdir       = $(datadir)/pixmaps
 xsddir          = $(datadir)/openbox
 
-theme = bear2
+theme = Clearlooks
 
 AUTOMAKE_OPTIONS = subdir-objects foreign
 
@@ -182,6 +182,8 @@ openbox_openbox_SOURCES = \
        openbox/menu.c \
        openbox/menu.h \
        openbox/misc.h \
+       openbox/modkeys.c \
+       openbox/modkeys.h \
        openbox/mouse.c \
        openbox/mouse.h \
        openbox/moveresize.c \
@@ -240,6 +242,28 @@ tools_gnome_panel_control_gnome_panel_control_SOURCES = \
 
 ## themes ##
 
+clearlooks_themedir = $(themedir)/Clearlooks/openbox-3
+dist_clearlooks_theme_DATA= \
+       themes/Clearlooks/openbox-3/bullet.xbm \
+       themes/Clearlooks/openbox-3/close.xbm \
+       themes/Clearlooks/openbox-3/desk_toggled.xbm \
+       themes/Clearlooks/openbox-3/desk.xbm \
+       themes/Clearlooks/openbox-3/iconify.xbm \
+       themes/Clearlooks/openbox-3/max_toggled.xbm \
+       themes/Clearlooks/openbox-3/max.xbm \
+       themes/Clearlooks/openbox-3/themerc.xml
+
+clearlooksolive_themedir = $(themedir)/Clearlooks-Olive/openbox-3
+dist_clearlooksolive_theme_DATA= \
+       themes/Clearlooks-Olive/openbox-3/bullet.xbm \
+       themes/Clearlooks-Olive/openbox-3/close.xbm \
+       themes/Clearlooks-Olive/openbox-3/desk_toggled.xbm \
+       themes/Clearlooks-Olive/openbox-3/desk.xbm \
+       themes/Clearlooks-Olive/openbox-3/iconify.xbm \
+       themes/Clearlooks-Olive/openbox-3/max_toggled.xbm \
+       themes/Clearlooks-Olive/openbox-3/max.xbm \
+       themes/Clearlooks-Olive/openbox-3/themerc.xml
+
 mikachu_themedir = $(themedir)/Mikachu/openbox-3
 dist_mikachu_theme_DATA= \
        themes/Mikachu/openbox-3/bullet.xbm \
@@ -266,52 +290,51 @@ dist_natura_theme_DATA= \
        themes/Natura/openbox-3/shade.xbm \
        themes/Natura/openbox-3/themerc.xml
 
-artwizboxed_themedir = $(themedir)/artwiz-boxed/openbox-3
+artwizboxed_themedir = $(themedir)/Artwiz-boxed/openbox-3
 dist_artwizboxed_theme_DATA= \
-       themes/artwiz-boxed/openbox-3/bullet.xbm \
-       themes/artwiz-boxed/openbox-3/close.xbm \
-       themes/artwiz-boxed/openbox-3/desk_toggled.xbm \
-       themes/artwiz-boxed/openbox-3/desk.xbm \
-       themes/artwiz-boxed/openbox-3/iconify.xbm \
-       themes/artwiz-boxed/openbox-3/max_toggled.xbm \
-       themes/artwiz-boxed/openbox-3/max.xbm \
-       themes/artwiz-boxed/openbox-3/themerc.xml
- 
-bear2_themedir = $(themedir)/bear2/openbox-3
+       themes/Artwiz-boxed/openbox-3/close.xbm \
+       themes/Artwiz-boxed/openbox-3/desk_toggled.xbm \
+       themes/Artwiz-boxed/openbox-3/desk.xbm \
+       themes/Artwiz-boxed/openbox-3/iconify.xbm \
+       themes/Artwiz-boxed/openbox-3/max_toggled.xbm \
+       themes/Artwiz-boxed/openbox-3/max.xbm \
+       themes/Artwiz-boxed/openbox-3/themerc.xml
+
+bear2_themedir = $(themedir)/Bear2/openbox-3
 dist_bear2_theme_DATA= \
-       themes/bear2/openbox-3/close_pressed.xbm \
-       themes/bear2/openbox-3/close.xbm \
-       themes/bear2/openbox-3/desk_toggled.xbm \
-       themes/bear2/openbox-3/desk.xbm \
-       themes/bear2/openbox-3/iconify_disabled.xbm \
-       themes/bear2/openbox-3/iconify_pressed.xbm \
-       themes/bear2/openbox-3/iconify.xbm \
-       themes/bear2/openbox-3/max_disabled.xbm \
-       themes/bear2/openbox-3/max_pressed.xbm \
-       themes/bear2/openbox-3/max_toggled.xbm \
-       themes/bear2/openbox-3/max.xbm \
-       themes/bear2/openbox-3/shade_pressed.xbm \
-       themes/bear2/openbox-3/shade.xbm \
-       themes/bear2/openbox-3/themerc.xml
- 
-orang_themedir = $(themedir)/orang/openbox-3
+       themes/Bear2/openbox-3/close_pressed.xbm \
+       themes/Bear2/openbox-3/close.xbm \
+       themes/Bear2/openbox-3/desk_toggled.xbm \
+       themes/Bear2/openbox-3/desk.xbm \
+       themes/Bear2/openbox-3/iconify_disabled.xbm \
+       themes/Bear2/openbox-3/iconify_pressed.xbm \
+       themes/Bear2/openbox-3/iconify.xbm \
+       themes/Bear2/openbox-3/max_disabled.xbm \
+       themes/Bear2/openbox-3/max_pressed.xbm \
+       themes/Bear2/openbox-3/max_toggled.xbm \
+       themes/Bear2/openbox-3/max.xbm \
+       themes/Bear2/openbox-3/shade_pressed.xbm \
+       themes/Bear2/openbox-3/shade.xbm \
+       themes/Bear2/openbox-3/themerc.xml
+
+orang_themedir = $(themedir)/Orang/openbox-3
 dist_orang_theme_DATA= \
-       themes/orang/openbox-3/themerc.xml
+       themes/Orang/openbox-3/themerc.xml
 
-syscrash_themedir = $(themedir)/syscrash/openbox-3
+syscrash_themedir = $(themedir)/Syscrash/openbox-3
 dist_syscrash_theme_DATA= \
-       themes/syscrash/openbox-3/bullet.xbm \
-       themes/syscrash/openbox-3/close_disabled.xbm \
-       themes/syscrash/openbox-3/close.xbm \
-       themes/syscrash/openbox-3/desk_toggled.xbm \
-       themes/syscrash/openbox-3/desk.xbm \
-       themes/syscrash/openbox-3/iconify.xbm \
-       themes/syscrash/openbox-3/max_disabled.xbm \
-       themes/syscrash/openbox-3/max_pressed.xbm \
-       themes/syscrash/openbox-3/max_toggled.xbm \
-       themes/syscrash/openbox-3/max.xbm \
-       themes/syscrash/openbox-3/shade.xbm \
-       themes/syscrash/openbox-3/themerc.xml
+       themes/Syscrash/openbox-3/bullet.xbm \
+       themes/Syscrash/openbox-3/close_disabled.xbm \
+       themes/Syscrash/openbox-3/close.xbm \
+       themes/Syscrash/openbox-3/desk_toggled.xbm \
+       themes/Syscrash/openbox-3/desk.xbm \
+       themes/Syscrash/openbox-3/iconify.xbm \
+       themes/Syscrash/openbox-3/max_disabled.xbm \
+       themes/Syscrash/openbox-3/max_pressed.xbm \
+       themes/Syscrash/openbox-3/max_toggled.xbm \
+       themes/Syscrash/openbox-3/max.xbm \
+       themes/Syscrash/openbox-3/shade.xbm \
+       themes/Syscrash/openbox-3/themerc.xml
 
 ## public headers ##