X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=9bef49a53b342360385a0185704dfe09ede185a6;hb=7e946f68d9f8ec7c880664b437edbbaa5d49ac10;hp=795c18bb27d298afc4da411f0677d896ce443696;hpb=ec4f685b82293120a47488bd6f7545caae27ea05;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 795c18bb..9bef49a5 100644
--- 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
 
@@ -104,6 +104,12 @@ parser_libobparser_la_SOURCES = \
 ## openbox ##
 
 openbox_openbox_CPPFLAGS = \
+	$(SM_CFLAGS) \
+	$(XINERAMA_CFLAGS) \
+	$(XKB_CFLAGS) \
+	$(XRANDR_CFLAGS) \
+	$(XSHAPE_CFLAGS) \
+	$(XSYNC_CFLAGS) \
 	$(X_CFLAGS) \
 	$(XCURSOR_CFLAGS) \
 	$(SM_CFLAGS) \
@@ -121,6 +127,7 @@ openbox_openbox_LDADD = \
 	$(XKB_LIBS) \
 	$(XRANDR_LIBS) \
 	$(XSHAPE_LIBS) \
+	$(XSYNC_LIBS) \
 	$(GLIB_LIBS) \
 	$(X_LIBS) \
 	$(XCURSOR_LIBS) \
@@ -175,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 \
@@ -233,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 \
@@ -259,52 +290,52 @@ 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/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
 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 ##