X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=35ccca9c577d693596ef1d0c088345e5ed49702f;hb=4b912ed24d6bcc62371dc49b4aef811dc61497f2;hp=e7802d486bc34249bad24e8b694e58664bf7f419;hpb=ee3d1b7d649252d84ef612f8dddfd92deb33baeb;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index e7802d48..35ccca9c 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
 
@@ -182,6 +189,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 +204,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 \
@@ -290,7 +301,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 \
@@ -365,10 +375,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)!'
@@ -385,11 +391,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 \