X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=a9f186d0ce22859fea007c9f5ffc08033dde503f;hb=960a7f0184a84f99545fa2d3dd22cefc77f2cbc6;hp=059255046de67d193cc89e6b1ec5832f069a5cc0;hpb=375b504905908fb129f52b52ae7270deefda12f7;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 05925504..a9f186d0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,8 +5,9 @@ localedir       = $(datadir)/locale
 rcdir           = $(datadir)/openbox
 plugindir       = $(libdir)/openbox/plugins
 desktopfilesdir = $(datadir)/gnome/wm-properties
+pixmapdir       = $(datadir)/pixmaps
 
-theme = operation
+theme = thebear
 
 AUTOMAKE_OPTIONS = subdir-objects
 ACLOCAL_AMFLAGS = -I m4
@@ -21,7 +22,8 @@ lib_LTLIBRARIES = \
 	parser/libobparser.la
 
 bin_PROGRAMS = \
-	kernel/openbox
+	kernel/openbox \
+	tools/kdetrayproxy/kdetrayproxy
 
 plugin_LTLIBRARIES = \
 	plugins/resistance/resistance.la \
@@ -30,11 +32,15 @@ plugin_LTLIBRARIES = \
 	plugins/keyboard/keyboard.la \
 	plugins/menu/timed_menu.la \
 	plugins/menu/fifo_menu.la \
-	plugins/menu/client_menu.la
+	plugins/menu/client_menu.la \
+	plugins/menu/include_menu.la
 
 if OBCONF
-plugin_LTLIBRARIES += \
-	plugins/resistance/resistance-config.la
+bin_PROGRAMS += \
+	tools/obconf/obconf
+
+#plugin_LTLIBRARIES += \
+#	plugins/resistance/resistance-config.la
 endif
 
 ## render ##
@@ -168,6 +174,8 @@ kernel_openbox_SOURCES = \
 	kernel/prop.h \
 	kernel/screen.c \
 	kernel/screen.h \
+	kernel/session.c \
+	kernel/session.h \
 	kernel/stacking.c \
 	kernel/stacking.h \
 	kernel/startup.c \
@@ -309,71 +317,125 @@ plugins_menu_client_menu_la_LDFLAGS = \
 	-module \
 	-avoid-version
 plugins_menu_client_menu_la_SOURCES = \
-	plugins/menu/client_menu.c \
-	plugins/menu/client_menu.h
+	plugins/menu/client_menu.c
+
+plugins_menu_include_menu_la_CPPFLAGS = \
+	$(XFT_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(LIBSN_CFLAGS) \
+	$(XML_CFLAGS) \
+	-DPLUGINDIR=\"$(plugindir)\" \
+	-DG_LOG_DOMAIN=\"Plugin-Include-Menu\"
+plugins_menu_include_menu_la_LDFLAGS = \
+	-module \
+	-avoid-version
+plugins_menu_include_menu_la_SOURCES = \
+	plugins/menu/include_menu.c
+
+
+## obconf ##
+
+tools_obconf_obconf_CPPFLAGS = \
+	$(GTK_CFLAGS) \
+	$(GDK_PIXBUF_CFLAGS) \
+	$(XML_CFLAGS) \
+	-DLOCALEDIR=\"$(localedir)\" \
+	-DPLUGINDIR=\"$(plugindir)\" \
+	-DRCDIR=\"$(rcdir)\" \
+	-DPIXMAPDIR=\"$(pixmapdir)\" \
+	-DG_LOG_DOMAIN=\"Obconf\"
+tools_obconf_obconf_LDADD = \
+	$(GTK_LIBS) \
+	$(GDK_PIXBUF_LIBS) \
+	$(LIBINTL) \
+	render/libobrender.la \
+	parser/libobparser.la
+tools_obconf_obconf_SOURCES = \
+	gettext.h \
+	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 \
-	AUTHOR
+	AUTHORS
 
 #doc:
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc
@@ -381,7 +443,7 @@ EXTRA_DIST = \
 distclean-local:
 	for d in . m4 po render; do \
 		for p in core core.* gmon.out *\~ *.orig *.rej .\#*; do \
-			$(RM) "$$d/$$p"; \
+			rm -f "$$d/$$p"; \
 		done \
 	done