add onyx themes to install. make non-active stuff grey

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ae23fd67be9880bd00bfb9c8ec451f05cf9cfcea..6fa3a8e6ac4ea7a22c40fd83f51a0fbfcc758b3c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,9 +36,6 @@ nodist_bin_SCRIPTS = \
        data/xsession/openbox-gnome-session \
        data/xsession/openbox-kde-session
 
-noinst_PROGRAMS = \
-       tools/themetoxml/themetoxml
-
 ## render ##
 
 render_rendertest_CPPFLAGS = \
@@ -175,6 +172,10 @@ openbox_openbox_SOURCES = \
        openbox/focus.h \
        openbox/focus_cycle.c \
        openbox/focus_cycle.h \
+       openbox/focus_cycle_indicator.c \
+       openbox/focus_cycle_indicator.h \
+       openbox/focus_cycle_popup.c \
+       openbox/focus_cycle_popup.h \
        openbox/frame.c \
        openbox/frame.h \
        openbox/framerender.c \
@@ -230,21 +231,6 @@ openbox_openbox_SOURCES = \
        openbox/xerror.h
 
 
-## themetoxml ##
-
-tools_themetoxml_themetoxml_CPPFLAGS = \
-       $(X_CFLAGS) \
-       $(GLIB_CFLAGS) \
-       $(XML_CFLAGS)
-tools_themetoxml_themetoxml_LDADD = \
-       $(X_LIBS) \
-       $(GLIB_LIBS) \
-       $(XML_LIBS)
-tools_themetoxml_themetoxml_SOURCES = \
-       tools/themetoxml/themetoxml.c \
-       tools/themetoxml/rgb.h
-
-
 ## gnome-panel-control ##
 
 tools_gnome_panel_control_gnome_panel_control_CPPFLAGS = \
@@ -272,11 +258,11 @@ dist_docxbm_DATA = \
 
 clearlooks_themedir = $(themedir)/Clearlooks/openbox-3
 dist_clearlooks_theme_DATA= \
-       themes/Clearlooks/openbox-3/themerc.xml
+       themes/Clearlooks/openbox-3/themerc
 
 clearlooksolive_themedir = $(themedir)/Clearlooks-Olive/openbox-3
 dist_clearlooksolive_theme_DATA= \
-       themes/Clearlooks-Olive/openbox-3/themerc.xml
+       themes/Clearlooks-Olive/openbox-3/themerc
 
 mikachu_themedir = $(themedir)/Mikachu/openbox-3
 dist_mikachu_theme_DATA= \
@@ -285,7 +271,7 @@ dist_mikachu_theme_DATA= \
        themes/Mikachu/openbox-3/desk.xbm \
        themes/Mikachu/openbox-3/iconify.xbm \
        themes/Mikachu/openbox-3/max.xbm \
-       themes/Mikachu/openbox-3/themerc.xml
+       themes/Mikachu/openbox-3/themerc
 
 
 natura_themedir = $(themedir)/Natura/openbox-3
@@ -302,11 +288,11 @@ dist_natura_theme_DATA= \
        themes/Natura/openbox-3/max.xbm \
        themes/Natura/openbox-3/shade.xbm \
        themes/Natura/openbox-3/shade_hover.xbm \
-       themes/Natura/openbox-3/themerc.xml
+       themes/Natura/openbox-3/themerc
 
 artwizboxed_themedir = $(themedir)/Artwiz-boxed/openbox-3
 dist_artwizboxed_theme_DATA= \
-       themes/Artwiz-boxed/openbox-3/themerc.xml
+       themes/Artwiz-boxed/openbox-3/themerc
 
 bear2_themedir = $(themedir)/Bear2/openbox-3
 dist_bear2_theme_DATA= \
@@ -321,11 +307,19 @@ dist_bear2_theme_DATA= \
        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
+       themes/Bear2/openbox-3/themerc
 
 orang_themedir = $(themedir)/Orang/openbox-3
 dist_orang_theme_DATA= \
-       themes/Orang/openbox-3/themerc.xml
+       themes/Orang/openbox-3/themerc
+
+onyx_themedir = $(themedir)/Onyx/openbox-3
+dist_onyx_theme_DATA= \
+       themes/Onyx/openbox-3/themerc
+
+onyxcitrus_themedir = $(themedir)/Onyx-Citrus/openbox-3
+dist_onyxcitrus_theme_DATA= \
+       themes/Onyx-Citrus/openbox-3/themerc
 
 syscrash_themedir = $(themedir)/Syscrash/openbox-3
 dist_syscrash_theme_DATA= \
@@ -333,7 +327,7 @@ dist_syscrash_theme_DATA= \
        themes/Syscrash/openbox-3/max_pressed.xbm \
        themes/Syscrash/openbox-3/max_toggled.xbm \
        themes/Syscrash/openbox-3/max.xbm \
-       themes/Syscrash/openbox-3/themerc.xml
+       themes/Syscrash/openbox-3/themerc
 
 ## public headers ##
 
@@ -371,59 +365,20 @@ edit = $(SED) \
        -e 's!@configdir\@!$(configdir)!' \
        -e 's!@bindir\@!$(bindir)!'
 
-data/xsession/openbox-gnome.desktop: \
-               $(srcdir)/data/xsession/openbox-gnome.desktop.in
-       @echo make: creating $@
-       @mkdir data 2>/dev/null || true
-       @mkdir data/xsession 2>/dev/null || true
-       @$(edit) $< >$@
-
-data/xsession/openbox-kde.desktop: \
-               $(srcdir)/data/xsession/openbox-kde.desktop.in
-       @echo make: creating $@
-       @mkdir data 2>/dev/null || true
-       @mkdir data/xsession 2>/dev/null || true
-       @$(edit) $< >$@
-
-data/xsession/openbox.desktop: \
-               $(srcdir)/data/xsession/openbox.desktop.in
+%.desktop: %.desktop.in Makefile
        @echo make: creating $@
-       @mkdir data 2>/dev/null || true
-       @mkdir data/xsession 2>/dev/null || true
-       @$(edit) $< >$@
-
-data/xsession/openbox-gnome-session: \
-               $(srcdir)/data/xsession/openbox-gnome-session.in
-       @echo make: creating $@
-       @mkdir data 2>/dev/null || true
-       @mkdir data/xsession 2>/dev/null || true
-       @$(edit) $< >$@
-       @chmod a+x $@
-
-data/xsession/openbox-kde-session: \
-               $(srcdir)/data/xsession/openbox-kde-session.in
-       @echo make: creating $@
-       @mkdir data 2>/dev/null || true
-       @mkdir data/xsession 2>/dev/null || true
-       @$(edit) $< >$@
-       @chmod a+x $@
+       @$(edit) $< >$@ 
 
-data/xsession/openbox-session: \
-               $(srcdir)/data/xsession/openbox-session.in
+%-session: %-session.in Makefile
        @echo make: creating $@
-       @mkdir data 2>/dev/null || true
-       @mkdir data/xsession 2>/dev/null || true
-       @$(edit) $< >$@
-       @chmod a+x $@
+       @$(edit) $< >$@ 
 
 %.1.in: %.1.sgml
        @echo make: creating $@
-       @mkdir doc 2>/dev/null || true
        @docbook-to-man $< >$@
 
-%.1: %.1.in
+%.1: %.1.in Makefile
        @echo make: creating $@
-       @mkdir doc 2>/dev/null || true
        @$(edit) $< >$@ 
 
 dist_gnomewmfiles_DATA = \
@@ -438,7 +393,6 @@ dist_noinst_DATA = \
        version.h.in \
        data/rc.xsd \
        data/menu.xsd \
-       data/themerc.xsd \
        data/xsession/openbox.desktop.in \
        data/xsession/openbox-gnome.desktop.in \
        data/xsession/openbox-kde.desktop.in \
@@ -481,10 +435,9 @@ dist_doc_DATA = \
        COPYING \
        data/rc.xsd \
        data/menu.xsd \
-       data/themerc.xsd \
        doc/rc-mouse-focus.xml
 
-dist_man_MANS = \
+nodist_man_MANS = \
        doc/openbox.1 \
        doc/openbox-session.1 \
        doc/openbox-gnome-session.1 \
@@ -503,6 +456,20 @@ EXTRA_DIST = \
        config.rpath \
        mkinstalldirs
 
+# make clean doesn't delete these for some reason, even though they are
+# built by make
+CLEANFILES = \
+       doc/openbox.1 \
+       doc/openbox-session.1 \
+       doc/openbox-gnome-session.1 \
+       doc/openbox-kde-session.1 \
+       data/xsession/openbox-session \
+       data/xsession/openbox-gnome-session \
+       data/xsession/openbox-kde-session \
+       data/xsession/openbox.desktop \
+       data/xsession/openbox-gnome.desktop \
+       data/xsession/openbox-kde.desktop
+
 #doc:
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc