X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=2eac7313fa70147bfe33037ad7867c07e396684a;hb=5d5be2ba2a6e0b3886e0076475ed9d7a2d4ac9ab;hp=fc415ba4986911e91998597fb5e1192e47365238;hpb=037fc862b0dd4535accf7b69a8c0112355bd04b1;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index fc415ba4..2eac7313 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,6 @@ pkgconfigdir    = $(libdir)/pkgconfig
 pubincludedir   = $(includedir)/openbox/@OB_VERSION@/openbox
 pixmapdir       = $(datadir)/pixmaps
 xsddir          = $(datadir)/openbox
-userscriptdir   = $(datadir)/openbox
 
 theme = bear2
 
@@ -28,9 +27,11 @@ lib_LTLIBRARIES = \
 
 bin_PROGRAMS = \
 	openbox/openbox \
-	tools/kdetrayproxy/kdetrayproxy \
 	tools/gnome-panel-control/gnome-panel-control
 
+noinst_PROGRAMS = \
+	tools/themetoxml/themetoxml
+
 ## render ##
 
 render_rendertest_CPPFLAGS = \
@@ -103,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) \
@@ -119,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) \
@@ -135,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 \
@@ -202,14 +213,19 @@ openbox_openbox_SOURCES = \
 	openbox/xerror.h
 
 
-## kdetrayproxy ##
+## themetoxml ##
 
-tools_kdetrayproxy_kdetrayproxy_CPPFLAGS = \
-	$(X_CFLAGS)
-tools_kdetrayproxy_kdetrayproxy_LDADD = \
-	$(X_LIBS)
-tools_kdetrayproxy_kdetrayproxy_SOURCES = \
-	tools/kdetrayproxy/kdetrayproxy.c
+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 ##
@@ -231,7 +247,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
+	themes/Mikachu/openbox-3/themerc.xml
 
 
 natura_themedir = $(themedir)/Natura/openbox-3
@@ -248,7 +264,7 @@ dist_natura_theme_DATA= \
 	themes/Natura/openbox-3/max_toggled.xbm \
 	themes/Natura/openbox-3/max.xbm \
 	themes/Natura/openbox-3/shade.xbm \
-	themes/Natura/openbox-3/themerc
+	themes/Natura/openbox-3/themerc.xml
 
 artwizboxed_themedir = $(themedir)/artwiz-boxed/openbox-3
 dist_artwizboxed_theme_DATA= \
@@ -259,7 +275,7 @@ dist_artwizboxed_theme_DATA= \
 	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
+	themes/artwiz-boxed/openbox-3/themerc.xml
  
 bear2_themedir = $(themedir)/bear2/openbox-3
 dist_bear2_theme_DATA= \
@@ -276,11 +292,11 @@ 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
+	themes/bear2/openbox-3/themerc.xml
  
 orang_themedir = $(themedir)/orang/openbox-3
 dist_orang_theme_DATA= \
-	themes/orang/openbox-3/themerc
+	themes/orang/openbox-3/themerc.xml
 
 syscrash_themedir = $(themedir)/syscrash/openbox-3
 dist_syscrash_theme_DATA= \
@@ -295,7 +311,7 @@ dist_syscrash_theme_DATA= \
 	themes/syscrash/openbox-3/max_toggled.xbm \
 	themes/syscrash/openbox-3/max.xbm \
 	themes/syscrash/openbox-3/shade.xbm \
-	themes/syscrash/openbox-3/themerc
+	themes/syscrash/openbox-3/themerc.xml
 
 ## public headers ##
 
@@ -347,12 +363,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
 
@@ -361,7 +371,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 \