X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=1d31a73bd3c0ec3b3f3d4c119a0c859d5e3d23b9;hb=6ff520d02ad3091c7e32a3cfc11fe8d3cb9b042f;hp=a30248eb43943070eb3be346cd796563dc64e17e;hpb=51338fb53a3701d3d2b5c42c3d20d5302905ee92;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index a30248eb..1d31a73b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,9 +32,7 @@ bin_PROGRAMS = \
 
 bin_SCRIPTS = \
 	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
@@ -204,6 +202,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 \
@@ -369,25 +369,31 @@ 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!@bindir\@!$(bindir)!'
 
-data/rc.xml: Makefile $(srcdir)/data/rc.xml.in data
+data/xsession/openbox-gnome-session: Makefile data \
+		$(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) $(srcdir)/data/xsession/openbox-gnome-session.in >$@
+	@chmod +x $@
 
-data/menu.xml: Makefile $(srcdir)/data/menu.xml.in data
+data/xsession/openbox-kde-session: Makefile data \
+		$(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) $(srcdir)/data/xsession/openbox-kde-session.in >$@
+	@chmod +x $@
 
 dist_gnomewmfiles_DATA = \
 	data/gnome-wm-properties/openbox.desktop \
@@ -404,8 +410,8 @@ dist_noinst_DATA = \
 	data/rc.xsd \
 	data/menu.xsd \
 	data/themerc.xsd \
-	data/rc.xml.in \
-	data/menu.xml.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 \
@@ -435,10 +441,6 @@ EXTRA_DIST = \
 	COPYING \
 	AUTHORS
 
-CLEANFILES = \
-	data/rc.xml \
-	data/menu.xml
-
 #doc:
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc