X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=dbecc4346bd3b59c64242ea4afabb5f50b43b2ca;hb=d158b642820910adf2d4f73370cf3537749230a6;hp=2eac7313fa70147bfe33037ad7867c07e396684a;hpb=cf3427b2e38c47b9ae39051703ef958b4d7f44e4;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 2eac7313..dbecc434 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,16 +1,18 @@
 SUBDIRS = m4 po
 
+docxbmdir       = $(docdir)/xbm
 themedir        = $(datadir)/themes
 localedir       = $(datadir)/locale
 configdir       = $(sysconfdir)/xdg
 rcdir           = $(configdir)/openbox
-desktopfilesdir = $(datadir)/gnome/wm-properties
+xsessionsdir    = $(datadir)/xsessions
+gnomewmfilesdir = $(datadir)/gnome/wm-properties
 pkgconfigdir    = $(libdir)/pkgconfig
 pubincludedir   = $(includedir)/openbox/@OB_VERSION@/openbox
 pixmapdir       = $(datadir)/pixmaps
 xsddir          = $(datadir)/openbox
 
-theme = bear2
+theme = Clearlooks
 
 AUTOMAKE_OPTIONS = subdir-objects foreign
 
@@ -29,13 +31,16 @@ bin_PROGRAMS = \
 	openbox/openbox \
 	tools/gnome-panel-control/gnome-panel-control
 
-noinst_PROGRAMS = \
-	tools/themetoxml/themetoxml
+nodist_bin_SCRIPTS = \
+	data/xsession/openbox-session \
+	data/xsession/openbox-gnome-session \
+	data/xsession/openbox-kde-session
 
 ## render ##
 
 render_rendertest_CPPFLAGS = \
 	$(PANGO_CFLAGS) \
+	$(XFT_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	-DG_LOG_DOMAIN=\"RenderTest\"
 render_rendertest_LDADD = \
@@ -43,6 +48,7 @@ render_rendertest_LDADD = \
 	render/libobrender.la \
 	$(GLIB_LIBS) \
 	$(PANGO_LIBS) \
+	$(XFT_LIBS) \
 	$(XML_LIBS) \
 	$(X_LIBS)
 render_rendertest_SOURCES = render/test.c
@@ -52,6 +58,7 @@ render_libobrender_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(XML_CFLAGS) \
 	$(PANGO_CFLAGS) \
+	$(XFT_CFLAGS) \
 	-DG_LOG_DOMAIN=\"ObRender\" \
 	-DDEFAULT_THEME=\"$(theme)\"
 render_libobrender_la_LDFLAGS = \
@@ -60,6 +67,7 @@ render_libobrender_la_LIBADD = \
 	parser/libobparser.la \
 	$(X_LIBS) \
 	$(PANGO_LIBS) \
+	$(XFT_LIBS) \
 	$(GLIB_LIBS) \
 	$(XML_LIBS)
 render_libobrender_la_SOURCES = \
@@ -110,6 +118,9 @@ openbox_openbox_CPPFLAGS = \
 	$(XRANDR_CFLAGS) \
 	$(XSHAPE_CFLAGS) \
 	$(XSYNC_CFLAGS) \
+	$(XRENDER_CFLAGS) \
+	$(XDAMAGE_CFLAGS) \
+	$(XCOMPOSITE_CFLAGS) \
 	$(X_CFLAGS) \
 	$(XCURSOR_CFLAGS) \
 	$(SM_CFLAGS) \
@@ -129,6 +140,9 @@ openbox_openbox_LDADD = \
 	$(XSHAPE_LIBS) \
 	$(XSYNC_LIBS) \
 	$(GLIB_LIBS) \
+	$(XRENDER_LIBS) \
+	$(XDAMAGE_LIBS) \
+	$(XCOMPOSITE_LIBS) \
 	$(X_LIBS) \
 	$(XCURSOR_LIBS) \
 	$(LIBSN_LIBS) \
@@ -150,6 +164,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 \
@@ -162,6 +178,12 @@ openbox_openbox_SOURCES = \
 	openbox/extensions.h \
 	openbox/focus.c \
 	openbox/focus.h \
+	openbox/focus_cycle.c \
+	openbox/focus_cycle.h \
+	openbox/focus_cycle_indicator.c \
+	openbox/focus_cycle_indicator.h \
+	openbox/focus_cycle_popup.c \
+	openbox/focus_cycle_popup.h \
 	openbox/frame.c \
 	openbox/frame.h \
 	openbox/framerender.c \
@@ -182,6 +204,8 @@ openbox_openbox_SOURCES = \
 	openbox/menu.c \
 	openbox/menu.h \
 	openbox/misc.h \
+	openbox/modkeys.c \
+	openbox/modkeys.h \
 	openbox/mouse.c \
 	openbox/mouse.h \
 	openbox/moveresize.c \
@@ -195,6 +219,8 @@ openbox_openbox_SOURCES = \
 	openbox/popup.h \
 	openbox/prop.c \
 	openbox/prop.h \
+	openbox/propwin.c \
+	openbox/propwin.h \
 	openbox/resist.c \
 	openbox/resist.h \
 	openbox/screen.c \
@@ -213,21 +239,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 = \
@@ -238,8 +249,29 @@ 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/themerc
+
+clearlooksolive_themedir = $(themedir)/Clearlooks-Olive/openbox-3
+dist_clearlooksolive_theme_DATA= \
+	themes/Clearlooks-Olive/openbox-3/themerc
+
 mikachu_themedir = $(themedir)/Mikachu/openbox-3
 dist_mikachu_theme_DATA= \
 	themes/Mikachu/openbox-3/bullet.xbm \
@@ -247,7 +279,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
@@ -255,63 +287,55 @@ 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/themerc.xml
+	themes/Natura/openbox-3/shade_hover.xbm \
+	themes/Natura/openbox-3/themerc
 
-artwizboxed_themedir = $(themedir)/artwiz-boxed/openbox-3
+artwizboxed_themedir = $(themedir)/Artwiz-boxed/openbox-3
 dist_artwizboxed_theme_DATA= \
-	themes/artwiz-boxed/openbox-3/bullet.xbm \
-	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
+	themes/Artwiz-boxed/openbox-3/themerc
+
+bear2_themedir = $(themedir)/Bear2/openbox-3
 dist_bear2_theme_DATA= \
-	themes/bear2/openbox-3/close_pressed.xbm \
-	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 \
-	themes/bear2/openbox-3/shade_pressed.xbm \
-	themes/bear2/openbox-3/shade.xbm \
-	themes/bear2/openbox-3/themerc.xml
- 
-orang_themedir = $(themedir)/orang/openbox-3
+	themes/Bear2/openbox-3/close_pressed.xbm \
+	themes/Bear2/openbox-3/close.xbm \
+	themes/Bear2/openbox-3/desk_toggled.xbm \
+	themes/Bear2/openbox-3/desk.xbm \
+	themes/Bear2/openbox-3/iconify_pressed.xbm \
+	themes/Bear2/openbox-3/iconify.xbm \
+	themes/Bear2/openbox-3/max_pressed.xbm \
+	themes/Bear2/openbox-3/max_toggled.xbm \
+	themes/Bear2/openbox-3/max.xbm \
+	themes/Bear2/openbox-3/shade_pressed.xbm \
+	themes/Bear2/openbox-3/shade.xbm \
+	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
 
-syscrash_themedir = $(themedir)/syscrash/openbox-3
+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= \
-	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
+	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/themerc
 
 ## public headers ##
 
@@ -339,37 +363,58 @@ nodist_pkgconfig_DATA = \
 dist_pixmap_DATA = \
 	data/openbox.png
 
-nodist_rc_DATA = \
+dist_rc_DATA = \
+	data/autostart.sh \
 	data/rc.xml \
 	data/menu.xml
 
-dist_xsd_DATA = \
-	data/rc.xsd \
-	data/menu.xsd
-
 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
+%.desktop: %.desktop.in Makefile
 	@echo make: creating $@
-	@rm -f $@
-	@mkdir data 2>/dev/null || true
-	@$(edit) $(srcdir)/data/rc.xml.in >$@
+	@$(edit) $< >$@	
 
-data/menu.xml: Makefile $(srcdir)/data/menu.xml.in data
+%-session: %-session.in Makefile
 	@echo make: creating $@
-	@rm -f $@
-	@mkdir data 2>/dev/null || true
-	@$(edit) $(srcdir)/data/menu.xml.in >$@
+	@$(edit) $< >$@	
 
-dist_desktopfiles_DATA = \
-	data/openbox.desktop
+%.1.in: %.1.sgml
+	@echo make: creating $@
+	@docbook-to-man $< >$@
+
+%.1: %.1.in Makefile
+	@echo make: creating $@
+	@$(edit) $< >$@	
+
+dist_gnomewmfiles_DATA = \
+	data/gnome-wm-properties/openbox.desktop
+
+nodist_xsessions_DATA = \
+	data/xsession/openbox.desktop \
+	data/xsession/openbox-gnome.desktop \
+	data/xsession/openbox-kde.desktop
 
 dist_noinst_DATA = \
 	version.h.in \
-	data/rc.xml.in \
-	data/menu.xml.in \
+	data/rc.xsd \
+	data/menu.xsd \
+	data/xsession/openbox.desktop.in \
+	data/xsession/openbox-gnome.desktop.in \
+	data/xsession/openbox-kde.desktop.in \
+	data/xsession/openbox-session.in \
+	data/xsession/openbox-gnome-session.in \
+	data/xsession/openbox-kde-session.in \
+	doc/openbox.1.sgml \
+	doc/openbox.1.in \
+	doc/openbox-session.1.sgml \
+	doc/openbox-session.1.in \
+	doc/openbox-gnome-session.1.sgml \
+	doc/openbox-gnome-session.1.in \
+	doc/openbox-kde-session.1.sgml \
+	doc/openbox-kde-session.1.in \
 	render/obrender-3.0.pc.in \
 	parser/obparser-3.0.pc.in \
 	tools/themeupdate/themeupdate.py \
@@ -390,18 +435,48 @@ dist_noinst_DATA = \
 	tests/title.c \
 	tests/urgent.c
 
-EXTRA_DIST = \
-	config.rpath \
-	mkinstalldirs \
-	CHANGELOG \
+dist_doc_DATA = \
 	COMPLIANCE \
 	README \
+	AUTHORS \
+	CHANGELOG \
 	COPYING \
-	AUTHORS
+	data/rc.xsd \
+	data/menu.xsd \
+	doc/rc-mouse-focus.xml
+
+nodist_man_MANS = \
+	doc/openbox.1 \
+	doc/openbox-session.1 \
+	doc/openbox-gnome-session.1 \
+	doc/openbox-kde-session.1
+
+EXTRA_DIST = \
+	debian/changelog.in \
+	debian/compat \
+	debian/conffiles \
+	debian/control \
+	debian/copyright \
+	debian/menu \
+	debian/postinst \
+	debian/postrm \
+	debian/rules \
+	config.rpath \
+	mkinstalldirs
 
+# make clean doesn't delete these for some reason, even though they are
+# built by make
 CLEANFILES = \
-	data/rc.xml \
-	data/menu.xml
+	doc/openbox.1 \
+	doc/openbox-session.1 \
+	doc/openbox-gnome-session.1 \
+	doc/openbox-kde-session.1 \
+	data/xsession/openbox-session \
+	data/xsession/openbox-gnome-session \
+	data/xsession/openbox-kde-session \
+	data/xsession/openbox.desktop \
+	data/xsession/openbox-gnome.desktop \
+	data/xsession/openbox-kde.desktop
 
 #doc:
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc