X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=230862a9f20e37dbfc3707c1a6b18cc9f3f34e97;hb=e5b94e6072287d39a777a3cedd0f10a66c58a2b5;hp=8f4c14e2018e81a0c57f04cfb917ef5526fa225c;hpb=d608649e8540db6842b1fd57d5f23c230346167e;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 8f4c14e2..230862a9 100644
--- 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 = \
@@ -121,6 +118,9 @@ openbox_openbox_CPPFLAGS = \
 	$(XRANDR_CFLAGS) \
 	$(XSHAPE_CFLAGS) \
 	$(XSYNC_CFLAGS) \
+	$(XRENDER_CFLAGS) \
+	$(XDAMAGE_CFLAGS) \
+	$(XCOMPOSITE_CFLAGS) \
 	$(X_CFLAGS) \
 	$(XCURSOR_CFLAGS) \
 	$(SM_CFLAGS) \
@@ -140,6 +140,9 @@ openbox_openbox_LDADD = \
 	$(XSHAPE_LIBS) \
 	$(XSYNC_LIBS) \
 	$(GLIB_LIBS) \
+	$(XRENDER_LIBS) \
+	$(XDAMAGE_LIBS) \
+	$(XCOMPOSITE_LIBS) \
 	$(X_LIBS) \
 	$(XCURSOR_LIBS) \
 	$(LIBSN_LIBS) \
@@ -153,6 +156,8 @@ openbox_openbox_SOURCES = \
 	gettext.h \
 	openbox/action.c \
 	openbox/action.h \
+	openbox/actions.c \
+	openbox/actions.h \
 	openbox/client.c \
 	openbox/client.h \
 	openbox/client_list_menu.c \
@@ -161,6 +166,8 @@ openbox_openbox_SOURCES = \
 	openbox/client_list_combined_menu.h \
 	openbox/client_menu.c \
 	openbox/client_menu.h \
+	openbox/composite.c \
+	openbox/composite.h \
 	openbox/config.c \
 	openbox/config.h \
 	openbox/debug.c \
@@ -234,21 +241,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 = \
@@ -276,11 +268,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= \
@@ -289,7 +281,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
@@ -306,11 +298,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= \
@@ -325,11 +317,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= \
@@ -337,7 +337,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 ##
 
@@ -403,7 +403,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 \
@@ -446,7 +445,6 @@ dist_doc_DATA = \
 	COPYING \
 	data/rc.xsd \
 	data/menu.xsd \
-	data/themerc.xsd \
 	doc/rc-mouse-focus.xml
 
 nodist_man_MANS = \