add new Clearlooks themes. Make Clearlooks the default theme.

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f1b1b9f84bde898728d05893ec12982fa9ad4963..98e436a9cf191c8a18678ae900f53f2aab1fb914 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,9 +9,8 @@ pkgconfigdir    = $(libdir)/pkgconfig
 pubincludedir   = $(includedir)/openbox/@OB_VERSION@/openbox
 pixmapdir       = $(datadir)/pixmaps
 xsddir          = $(datadir)/openbox
-userscriptdir   = $(datadir)/openbox
 
-theme = bear2
+theme = Clearlooks
 
 AUTOMAKE_OPTIONS = subdir-objects foreign
 
@@ -105,7 +104,14 @@ 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) \
        $(PANGO_CFLAGS) \
        $(GLIB_CFLAGS) \
@@ -121,8 +127,10 @@ openbox_openbox_LDADD = \
        $(XKB_LIBS) \
        $(XRANDR_LIBS) \
        $(XSHAPE_LIBS) \
+       $(XSYNC_LIBS) \
        $(GLIB_LIBS) \
        $(X_LIBS) \
+       $(XCURSOR_LIBS) \
        $(LIBSN_LIBS) \
        $(XML_LIBS) \
        $(EFENCE_LIBS) \
@@ -137,6 +145,7 @@ openbox_openbox_SOURCES = \
        openbox/client.c \
        openbox/client.h \
        openbox/client_list_menu.c \
+       openbox/client_list_menu.h \
        openbox/client_list_combined_menu.c \
        openbox/client_list_combined_menu.h \
        openbox/client_menu.c \
@@ -216,7 +225,6 @@ tools_themetoxml_themetoxml_LDADD = \
        $(XML_LIBS)
 tools_themetoxml_themetoxml_SOURCES = \
        tools/themetoxml/themetoxml.c \
-       tools/themetoxml/themetoxml.h \
        tools/themetoxml/rgb.h
 
 
@@ -232,6 +240,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 \
@@ -268,7 +298,7 @@ dist_artwizboxed_theme_DATA= \
        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 \
@@ -285,7 +315,7 @@ dist_bear2_theme_DATA= \
        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
@@ -355,12 +385,6 @@ data/menu.xml: Makefile $(srcdir)/data/menu.xml.in data
        @mkdir data 2>/dev/null || true
        @$(edit) $(srcdir)/data/menu.xml.in >$@
 
-dist_userscript_DATA = \
-       tools/themeupdate/themeupdate.py
-
-install-data-hook:
-       chmod +x $(DESTDIR)$(userscriptdir)/themeupdate.py
-
 dist_desktopfiles_DATA = \
        data/openbox.desktop
 
@@ -369,7 +393,24 @@ dist_noinst_DATA = \
        data/rc.xml.in \
        data/menu.xml.in \
        render/obrender-3.0.pc.in \
-       parser/obparser-3.0.pc.in
+       parser/obparser-3.0.pc.in \
+       tools/themeupdate/themeupdate.py \
+       tests/hideshow.py \
+       tests/Makefile \
+       tests/aspect.c \
+       tests/fullscreen.c \
+       tests/grav.c \
+       tests/grouptran.c \
+       tests/icons.c \
+       tests/modal2.c \
+       tests/modal3.c \
+       tests/modal.c \
+       tests/noresize.c \
+       tests/override.c \
+       tests/positioned.c \
+       tests/strut.c \
+       tests/title.c \
+       tests/urgent.c
 
 EXTRA_DIST = \
        config.rpath \