X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=a30248eb43943070eb3be346cd796563dc64e17e;hb=de82c4a5dfd771b89b6f48b56fcb578d91bd6bed;hp=9bef49a53b342360385a0185704dfe09ede185a6;hpb=7e946f68d9f8ec7c880664b437edbbaa5d49ac10;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 9bef49a5..a30248eb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,8 @@ 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
@@ -29,6 +30,12 @@ bin_PROGRAMS = \
 	openbox/openbox \
 	tools/gnome-panel-control/gnome-panel-control
 
+bin_SCRIPTS = \
+	data/xsession/openbox-gnome-session \
+	data/xsession/openbox-kde-session \
+	data/xsession/openbox-gnome \
+	data/xsession/openbox-kde
+
 noinst_PROGRAMS = \
 	tools/themetoxml/themetoxml
 
@@ -292,7 +299,6 @@ dist_natura_theme_DATA= \
 
 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 \
@@ -367,10 +373,6 @@ nodist_rc_DATA = \
 	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)!'
@@ -387,11 +389,21 @@ data/menu.xml: Makefile $(srcdir)/data/menu.xml.in data
 	@mkdir data 2>/dev/null || true
 	@$(edit) $(srcdir)/data/menu.xml.in >$@
 
-dist_desktopfiles_DATA = \
-	data/openbox.desktop
+dist_gnomewmfiles_DATA = \
+	data/gnome-wm-properties/openbox.desktop \
+	data/gnome-wm-properties/openbox-gnome.desktop \
+	data/gnome-wm-properties/openbox-kde.desktop
+
+dist_xsessions_DATA = \
+	data/xsession/openbox.desktop \
+	data/xsession/openbox-gnome.desktop \
+	data/xsession/openbox-kde.desktop
 
 dist_noinst_DATA = \
 	version.h.in \
+	data/rc.xsd \
+	data/menu.xsd \
+	data/themerc.xsd \
 	data/rc.xml.in \
 	data/menu.xml.in \
 	render/obrender-3.0.pc.in \