X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=a9f186d0ce22859fea007c9f5ffc08033dde503f;hb=4cd886e5188549ab48a11b70cb40b65efe916b6c;hp=f84dc6fe14d47346a761fd06239f6af0777274e7;hpb=a354b0f5a93b711c0eb70d52ba8fe5b42ff4ae36;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index f84dc6fe..a9f186d0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ plugindir       = $(libdir)/openbox/plugins
 desktopfilesdir = $(datadir)/gnome/wm-properties
 pixmapdir       = $(datadir)/pixmaps
 
-theme = operation
+theme = thebear
 
 AUTOMAKE_OPTIONS = subdir-objects
 ACLOCAL_AMFLAGS = -I m4
@@ -22,7 +22,8 @@ lib_LTLIBRARIES = \
 	parser/libobparser.la
 
 bin_PROGRAMS = \
-	kernel/openbox
+	kernel/openbox \
+	tools/kdetrayproxy/kdetrayproxy
 
 plugin_LTLIBRARIES = \
 	plugins/resistance/resistance.la \
@@ -351,72 +352,90 @@ tools_obconf_obconf_LDADD = \
 	parser/libobparser.la
 tools_obconf_obconf_SOURCES = \
 	gettext.h \
-	tools/obconf/main.c
+	tools/obconf/main.c \
+	plugins/obconf_interface.h
+
+
+## kdetrayproxy ##
+
+tools_kdetrayproxy_kdetrayproxy_CPPFLAGS = \
+	$(X_CFLAGS)
+tools_kdetrayproxy_kdetrayproxy_LDADD = \
+	$(X_LIBS)
+tools_kdetrayproxy_kdetrayproxy_SOURCES = \
+	tools/kdetrayproxy/kdetrayproxy.c
 
 
 ## themes ##
 
-dist_theme_DATA = \
-	themes/artwiz \
-	themes/bbs \
-	themes/bluebox \
-	themes/cthulhain \
-	themes/deep \
-	themes/ebox \
-	themes/fieron \
-	themes/fieron2 \
-	themes/flux \
-	themes/frobozz \
-	themes/frobust \
-	themes/mbdtex \
-	themes/miklos \
-	themes/nyz \
-	themes/nyzclone \
-	themes/ob20 \
-	themes/operation \
-	themes/outcomes \
-	themes/paper \
-	themes/purplehaaze \
-	themes/shade \
-	themes/steelblue \
-	themes/steelblue2 \
-	themes/the_orange \
-	themes/trisb \
-	themes/twice \
-	themes/warp-xp
-
-fieronthemedir = $(themedir)/fieron_data
-dist_fierontheme_DATA = \
-	themes/fieron_data/close.xbm \
-	themes/fieron_data/iconify.xbm \
-	themes/fieron_data/max.xbm \
-	themes/fieron_data/stick.xbm
-
-fieron2themedir = $(themedir)/fieron2_data
-dist_fieron2theme_DATA = \
-	themes/fieron2_data/close.xbm \
-	themes/fieron2_data/iconify.xbm \
-	themes/fieron2_data/max.xbm \
-	themes/fieron2_data/stick.xbm
-
-eboxthemedir = $(themedir)/ebox_data
-dist_eboxtheme_DATA = \
-	themes/ebox_data/close.xbm \
-	themes/ebox_data/iconify.xbm \
-	themes/ebox_data/max.xbm
+thebear_themedir = $(themedir)/thebear
+dist_thebear_theme_DATA = \
+	themes/thebear/themerc
+
+planton_themedir = $(themedir)/planton
+dist_planton_theme_DATA = \
+	themes/planton/themerc \
+	themes/planton/max.xbm \
+	themes/planton/max_toggled.xbm \
+	themes/planton/desk.xbm \
+	themes/planton/desk_toggled.xbm \
+	themes/planton/shade.xbm \
+	themes/planton/shade_toggled.xbm \
+	themes/planton/iconify.xbm \
+	themes/planton/close.xbm
+
+lightindustry_themedir = $(themedir)/Light-Industry
+dist_lightindustry_theme_DATA = \
+	themes/Light-Industry/themerc \
+	themes/Light-Industry/max.xbm \
+	themes/Light-Industry/iconify.xbm \
+	themes/Light-Industry/close.xbm
+
+lightindustrybig_themedir = $(themedir)/Light-Industry-big
+dist_lightindustrybig_theme_DATA = \
+	themes/Light-Industry-big/themerc \
+	themes/Light-Industry-big/max.xbm \
+	themes/Light-Industry-big/iconify.xbm \
+	themes/Light-Industry-big/close.xbm
+
+imerry_themedir = $(themedir)/I-merry
+dist_imerry_theme_DATA = \
+	themes/I-merry/themerc \
+	themes/I-merry/max.xbm \
+	themes/I-merry/iconify.xbm \
+	themes/I-merry/close.xbm
+
+greenz_themedir = $(themedir)/greenz
+dist_greenz_theme_DATA = \
+	themes/greenz/themerc
+
+bbstyle_themedir = $(themedir)/BBstylE
+dist_bbstyle_theme_DATA = \
+	themes/BBstylE/themerc \
+	themes/BBstylE/max.xbm \
+	themes/BBstylE/max_toggled.xbm \
+	themes/BBstylE/desk.xbm \
+	themes/BBstylE/desk_toggled.xbm \
+	themes/BBstylE/shade.xbm \
+	themes/BBstylE/shade_toggled.xbm \
+	themes/BBstylE/iconify.xbm \
+	themes/BBstylE/close.xbm
+
 
 ## data ##
 
 dist_rc_DATA = \
 	data/rc3
 
+dist_desktopfiles_DATA = \
+	data/openbox.desktop
+
 EXTRA_DIST = \
 	config.rpath \
 	mkinstalldirs \
 	README \
 	COPYING \
-	AUTHORS \
-	plugins/obconf_interface.h
+	AUTHORS
 
 #doc:
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc