X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=8fad996c1946b2bff8e68d84a41a9e33527d2920;hb=3addcd8bb9c65db54c43d6c829c2b041e4959ca9;hp=cce5c3c88a82d14ece395e2dfd405b94378090f2;hpb=71f4dad2706a4988fb796ee5bbc9723938d627fe;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index cce5c3c8..8fad996c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,8 @@ bin_PROGRAMS = \
 	openbox/openbox \
 	tools/gnome-panel-control/gnome-panel-control
 
-bin_SCRIPTS = \
+nodist_bin_SCRIPTS = \
+	data/xsession/openbox-session \
 	data/xsession/openbox-gnome-session \
 	data/xsession/openbox-kde-session
 
@@ -359,6 +360,7 @@ dist_pixmap_DATA = \
 	data/openbox.png
 
 dist_rc_DATA = \
+	data/autostart.sh \
 	data/rc.xml \
 	data/menu.xml
 
@@ -367,66 +369,88 @@ edit = $(SED) \
 	-e 's!@configdir\@!$(configdir)!' \
 	-e 's!@bindir\@!$(bindir)!'
 
-data/xsession/openbox-gnome-session: Makefile data \
+data/xsession/openbox-gnome.desktop: \
+		$(srcdir)/data/xsession/openbox-gnome.desktop.in
+	@echo make: creating $@
+	@mkdir data 2>/dev/null || true
+	@mkdir data/xsession 2>/dev/null || true
+	@$(edit) $< >$@
+
+data/xsession/openbox-kde.desktop: \
+		$(srcdir)/data/xsession/openbox-kde.desktop.in
+	@echo make: creating $@
+	@mkdir data 2>/dev/null || true
+	@mkdir data/xsession 2>/dev/null || true
+	@$(edit) $< >$@
+
+data/xsession/openbox.desktop: \
+		$(srcdir)/data/xsession/openbox.desktop.in
+	@echo make: creating $@
+	@mkdir data 2>/dev/null || true
+	@mkdir data/xsession 2>/dev/null || true
+	@$(edit) $< >$@
+
+data/xsession/openbox-gnome-session: \
 		$(srcdir)/data/xsession/openbox-gnome-session.in
 	@echo make: creating $@
 	@mkdir data 2>/dev/null || true
 	@mkdir data/xsession 2>/dev/null || true
-	@$(edit) $(srcdir)/data/xsession/openbox-gnome-session.in >$@
+	@$(edit) $< >$@
 	@chmod a+x $@
 
-data/xsession/openbox-kde-session: Makefile data \
+data/xsession/openbox-kde-session: \
 		$(srcdir)/data/xsession/openbox-kde-session.in
 	@echo make: creating $@
 	@mkdir data 2>/dev/null || true
 	@mkdir data/xsession 2>/dev/null || true
-	@$(edit) $(srcdir)/data/xsession/openbox-kde-session.in >$@
+	@$(edit) $< >$@
 	@chmod a+x $@
 
-doc/openbox.1.in: Makefile doc $(srcdir)/doc/openbox.1.sgml
-	@echo make: creating $@
-	@mkdir doc 2>/dev/null || true
-	@docbook-to-man $(srcdir)/doc/openbox.1.sgml > $@
-
-doc/openbox.1: Makefile doc doc/openbox.1.in
+data/xsession/openbox-session: \
+		$(srcdir)/data/xsession/openbox-session.in
 	@echo make: creating $@
-	@mkdir doc 2>/dev/null || true
-	@$(edit) $(srcdir)/doc/openbox.1.in >$@
+	@mkdir data 2>/dev/null || true
+	@mkdir data/xsession 2>/dev/null || true
+	@$(edit) $< >$@
+	@chmod a+x $@
 
-doc/openbox-gnome-session.1: Makefile doc doc/openbox-gnome-session.1.sgml
+%.1.in: %.1.sgml
 	@echo make: creating $@
 	@mkdir doc 2>/dev/null || true
-	@docbook-to-man $(srcdir)/doc/openbox-gnome-session.1.sgml > $@
+	@docbook-to-man $< >$@
 
-doc/openbox-kde-session.1: Makefile doc doc/openbox-kde-session.1.sgml
+%.1: %.1.in
 	@echo make: creating $@
 	@mkdir doc 2>/dev/null || true
-	@docbook-to-man $(srcdir)/doc/openbox-kde-session.1.sgml > $@
+	@$(edit) $< >$@	
 
 dist_gnomewmfiles_DATA = \
 	data/gnome-wm-properties/openbox.desktop
 
-dist_xsessions_DATA = \
+nodist_xsessions_DATA = \
 	data/xsession/openbox.desktop \
 	data/xsession/openbox-gnome.desktop \
 	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/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 \
@@ -451,20 +475,31 @@ dist_doc_DATA = \
 	COMPLIANCE \
 	README \
 	AUTHORS \
+	CHANGELOG \
+	COPYING \
 	data/rc.xsd \
 	data/menu.xsd \
-	data/themerc.xsd
+	data/themerc.xsd \
+	doc/rc-mouse-focus.xml
 
 dist_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 \
-	CHANGELOG \
-	COPYING
+	mkinstalldirs
 
 #doc:
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc