X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=6cbf0cc0c9501c96ba1014689db43296f547caad;hb=47c8d407295bd910b2482f472d0a7e3892031647;hp=35ccca9c577d693596ef1d0c088345e5ed49702f;hpb=851555348ec39a01a0e150d2e12b71212b8d338b;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 35ccca9c..6cbf0cc0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,6 @@
 SUBDIRS = m4 po
 
+docxbmdir       = $(docdir)/xbm
 themedir        = $(datadir)/themes
 localedir       = $(datadir)/locale
 configdir       = $(sysconfdir)/xdg
@@ -31,10 +32,9 @@ bin_PROGRAMS = \
 	tools/gnome-panel-control/gnome-panel-control
 
 bin_SCRIPTS = \
+	data/xsession/openbox-session \
 	data/xsession/openbox-gnome-session \
-	data/xsession/openbox-kde-session \
-	data/xsession/openbox-gnome \
-	data/xsession/openbox-kde
+	data/xsession/openbox-kde-session
 
 noinst_PROGRAMS = \
 	tools/themetoxml/themetoxml
@@ -43,6 +43,7 @@ noinst_PROGRAMS = \
 
 render_rendertest_CPPFLAGS = \
 	$(PANGO_CFLAGS) \
+	$(XFT_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	-DG_LOG_DOMAIN=\"RenderTest\"
 render_rendertest_LDADD = \
@@ -50,6 +51,7 @@ render_rendertest_LDADD = \
 	render/libobrender.la \
 	$(GLIB_LIBS) \
 	$(PANGO_LIBS) \
+	$(XFT_LIBS) \
 	$(XML_LIBS) \
 	$(X_LIBS)
 render_rendertest_SOURCES = render/test.c
@@ -59,6 +61,7 @@ render_libobrender_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(XML_CFLAGS) \
 	$(PANGO_CFLAGS) \
+	$(XFT_CFLAGS) \
 	-DG_LOG_DOMAIN=\"ObRender\" \
 	-DDEFAULT_THEME=\"$(theme)\"
 render_libobrender_la_LDFLAGS = \
@@ -67,6 +70,7 @@ render_libobrender_la_LIBADD = \
 	parser/libobparser.la \
 	$(X_LIBS) \
 	$(PANGO_LIBS) \
+	$(XFT_LIBS) \
 	$(GLIB_LIBS) \
 	$(XML_LIBS)
 render_libobrender_la_SOURCES = \
@@ -249,28 +253,27 @@ tools_gnome_panel_control_gnome_panel_control_SOURCES = \
 	tools/gnome-panel-control/gnome-panel-control.c
 
 
+## default button masks ##
+dist_docxbm_DATA = \
+        data/xbm/bullet.xbm \
+        data/xbm/close.xbm \
+        data/xbm/desk_toggled.xbm \
+        data/xbm/desk.xbm \
+        data/xbm/iconify.xbm \
+        data/xbm/max_toggled.xbm \
+        data/xbm/max.xbm \
+        data/xbm/shade_toggled.xbm \
+        data/xbm/shade.xbm
+
+
 ## themes ##
 
 clearlooks_themedir = $(themedir)/Clearlooks/openbox-3
 dist_clearlooks_theme_DATA= \
-	themes/Clearlooks/openbox-3/bullet.xbm \
-	themes/Clearlooks/openbox-3/close.xbm \
-	themes/Clearlooks/openbox-3/desk_toggled.xbm \
-	themes/Clearlooks/openbox-3/desk.xbm \
-	themes/Clearlooks/openbox-3/iconify.xbm \
-	themes/Clearlooks/openbox-3/max_toggled.xbm \
-	themes/Clearlooks/openbox-3/max.xbm \
 	themes/Clearlooks/openbox-3/themerc.xml
 
 clearlooksolive_themedir = $(themedir)/Clearlooks-Olive/openbox-3
 dist_clearlooksolive_theme_DATA= \
-	themes/Clearlooks-Olive/openbox-3/bullet.xbm \
-	themes/Clearlooks-Olive/openbox-3/close.xbm \
-	themes/Clearlooks-Olive/openbox-3/desk_toggled.xbm \
-	themes/Clearlooks-Olive/openbox-3/desk.xbm \
-	themes/Clearlooks-Olive/openbox-3/iconify.xbm \
-	themes/Clearlooks-Olive/openbox-3/max_toggled.xbm \
-	themes/Clearlooks-Olive/openbox-3/max.xbm \
 	themes/Clearlooks-Olive/openbox-3/themerc.xml
 
 mikachu_themedir = $(themedir)/Mikachu/openbox-3
@@ -288,25 +291,19 @@ dist_natura_theme_DATA= \
 	themes/Natura/openbox-3/close_hover.xbm \
 	themes/Natura/openbox-3/close.xbm \
 	themes/Natura/openbox-3/desk_toggled.xbm \
+	themes/Natura/openbox-3/desk_hover.xbm \
 	themes/Natura/openbox-3/desk.xbm \
-	themes/Natura/openbox-3/iconify_disabled.xbm \
 	themes/Natura/openbox-3/iconify_hover.xbm \
 	themes/Natura/openbox-3/iconify.xbm \
-	themes/Natura/openbox-3/max_disabled.xbm \
 	themes/Natura/openbox-3/max_hover.xbm \
 	themes/Natura/openbox-3/max_toggled.xbm \
 	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
 
 artwizboxed_themedir = $(themedir)/Artwiz-boxed/openbox-3
 dist_artwizboxed_theme_DATA= \
-	themes/Artwiz-boxed/openbox-3/close.xbm \
-	themes/Artwiz-boxed/openbox-3/desk_toggled.xbm \
-	themes/Artwiz-boxed/openbox-3/desk.xbm \
-	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.xml
 
 bear2_themedir = $(themedir)/Bear2/openbox-3
@@ -315,10 +312,8 @@ dist_bear2_theme_DATA= \
 	themes/Bear2/openbox-3/close.xbm \
 	themes/Bear2/openbox-3/desk_toggled.xbm \
 	themes/Bear2/openbox-3/desk.xbm \
-	themes/Bear2/openbox-3/iconify_disabled.xbm \
 	themes/Bear2/openbox-3/iconify_pressed.xbm \
 	themes/Bear2/openbox-3/iconify.xbm \
-	themes/Bear2/openbox-3/max_disabled.xbm \
 	themes/Bear2/openbox-3/max_pressed.xbm \
 	themes/Bear2/openbox-3/max_toggled.xbm \
 	themes/Bear2/openbox-3/max.xbm \
@@ -332,17 +327,10 @@ dist_orang_theme_DATA= \
 
 syscrash_themedir = $(themedir)/Syscrash/openbox-3
 dist_syscrash_theme_DATA= \
-	themes/Syscrash/openbox-3/bullet.xbm \
-	themes/Syscrash/openbox-3/close_disabled.xbm \
-	themes/Syscrash/openbox-3/close.xbm \
-	themes/Syscrash/openbox-3/desk_toggled.xbm \
-	themes/Syscrash/openbox-3/desk.xbm \
-	themes/Syscrash/openbox-3/iconify.xbm \
 	themes/Syscrash/openbox-3/max_disabled.xbm \
 	themes/Syscrash/openbox-3/max_pressed.xbm \
 	themes/Syscrash/openbox-3/max_toggled.xbm \
 	themes/Syscrash/openbox-3/max.xbm \
-	themes/Syscrash/openbox-3/shade.xbm \
 	themes/Syscrash/openbox-3/themerc.xml
 
 ## public headers ##
@@ -371,30 +359,61 @@ nodist_pkgconfig_DATA = \
 dist_pixmap_DATA = \
 	data/openbox.png
 
-nodist_rc_DATA = \
+dist_rc_DATA = \
 	data/rc.xml \
 	data/menu.xml
 
 edit = $(SED) \
 	-e 's!@version\@!$(VERSION)!' \
-	-e 's!@xsddir\@!$(xsddir)!'
+	-e 's!@configdir\@!$(configdir)!' \
+	-e 's!@bindir\@!$(bindir)!'
 
-data/rc.xml: Makefile $(srcdir)/data/rc.xml.in data
+data/xsession/openbox-gnome-session: \
+		$(srcdir)/data/xsession/openbox-gnome-session.in
 	@echo make: creating $@
-	@rm -f $@
 	@mkdir data 2>/dev/null || true
-	@$(edit) $(srcdir)/data/rc.xml.in >$@
+	@mkdir data/xsession 2>/dev/null || true
+	@$(edit) $< >$@
+	@chmod a+x $@
 
-data/menu.xml: Makefile $(srcdir)/data/menu.xml.in data
+data/xsession/openbox-kde-session: \
+		$(srcdir)/data/xsession/openbox-kde-session.in
 	@echo make: creating $@
-	@rm -f $@
 	@mkdir data 2>/dev/null || true
-	@$(edit) $(srcdir)/data/menu.xml.in >$@
+	@mkdir data/xsession 2>/dev/null || true
+	@$(edit) $< >$@
+	@chmod a+x $@
+
+data/xsession/openbox-session: \
+		$(srcdir)/data/xsession/openbox-session.in
+	@echo make: creating $@
+	@mkdir data 2>/dev/null || true
+	@mkdir data/xsession 2>/dev/null || true
+	@$(edit) $< >$@
+	@chmod a+x $@
+
+doc/openbox.1.in: $(srcdir)/doc/openbox.1.sgml
+	@echo make: creating $@
+	@mkdir doc 2>/dev/null || true
+	@docbook-to-man $< > $@
+
+doc/openbox.1: doc/openbox.1.in
+	@echo make: creating $@
+	@mkdir doc 2>/dev/null || true
+	@$(edit) $< >$@
+
+doc/openbox-gnome-session.1: $(srcdir)/doc/openbox-gnome-session.1.sgml
+	@echo make: creating $@
+	@mkdir doc 2>/dev/null || true
+	@docbook-to-man $< > $@
+
+doc/openbox-kde-session.1: $(srcdir)/doc/openbox-kde-session.1.sgml
+	@echo make: creating $@
+	@mkdir doc 2>/dev/null || true
+	@docbook-to-man $< > $@
 
 dist_gnomewmfiles_DATA = \
-	data/gnome-wm-properties/openbox.desktop \
-	data/gnome-wm-properties/openbox-gnome.desktop \
-	data/gnome-wm-properties/openbox-kde.desktop
+	data/gnome-wm-properties/openbox.desktop
 
 dist_xsessions_DATA = \
 	data/xsession/openbox.desktop \
@@ -402,12 +421,22 @@ dist_xsessions_DATA = \
 	data/xsession/openbox-kde.desktop
 
 dist_noinst_DATA = \
+	debian/changelog.in \
+	debian/compat \
+	debian/conffiles \
+	debian/control \
+	debian/copyright \
+	debian/menu \
+	debian/postinst \
+	debian/postrm \
+	debian/rules \
 	version.h.in \
 	data/rc.xsd \
 	data/menu.xsd \
 	data/themerc.xsd \
-	data/rc.xml.in \
-	data/menu.xml.in \
+	data/xsession/openbox-session.in \
+	data/xsession/openbox-gnome-session.in \
+	data/xsession/openbox-kde-session.in \
 	render/obrender-3.0.pc.in \
 	parser/obparser-3.0.pc.in \
 	tools/themeupdate/themeupdate.py \
@@ -428,18 +457,25 @@ dist_noinst_DATA = \
 	tests/title.c \
 	tests/urgent.c
 
+dist_doc_DATA = \
+	COMPLIANCE \
+	README \
+	AUTHORS \
+	data/rc.xsd \
+	data/menu.xsd \
+	data/themerc.xsd \
+	doc/rc-mouse-focus.xml
+
+dist_man_MANS = \
+	doc/openbox.1 \
+	doc/openbox-gnome-session.1 \
+	doc/openbox-kde-session.1
+
 EXTRA_DIST = \
 	config.rpath \
 	mkinstalldirs \
 	CHANGELOG \
-	COMPLIANCE \
-	README \
-	COPYING \
-	AUTHORS
-
-CLEANFILES = \
-	data/rc.xml \
-	data/menu.xml
+	COPYING
 
 #doc:
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc