don't assert, users can bind stuff however they like. but if they do something that...

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index cce5c3c88a82d14ece395e2dfd405b94378090f2..6cbf0cc0c9501c96ba1014689db43296f547caad 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,6 +32,7 @@ bin_PROGRAMS = \
        tools/gnome-panel-control/gnome-panel-control
 
 bin_SCRIPTS = \
+       data/xsession/openbox-session \
        data/xsession/openbox-gnome-session \
        data/xsession/openbox-kde-session
 
@@ -367,41 +368,49 @@ edit = $(SED) \
        -e 's!@configdir\@!$(configdir)!' \
        -e 's!@bindir\@!$(bindir)!'
 
-data/xsession/openbox-gnome-session: Makefile data \
+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
+data/xsession/openbox-session: \
+               $(srcdir)/data/xsession/openbox-session.in
+       @echo make: creating $@
+       @mkdir data 2>/dev/null || true
+       @mkdir data/xsession 2>/dev/null || true
+       @$(edit) $< >$@
+       @chmod a+x $@
+
+doc/openbox.1.in: $(srcdir)/doc/openbox.1.sgml
        @echo make: creating $@
        @mkdir doc 2>/dev/null || true
-       @docbook-to-man $(srcdir)/doc/openbox.1.sgml > $@
+       @docbook-to-man $< > $@
 
-doc/openbox.1: Makefile doc doc/openbox.1.in
+doc/openbox.1: doc/openbox.1.in
        @echo make: creating $@
        @mkdir doc 2>/dev/null || true
-       @$(edit) $(srcdir)/doc/openbox.1.in >$@
+       @$(edit) $< >$@
 
-doc/openbox-gnome-session.1: Makefile doc doc/openbox-gnome-session.1.sgml
+doc/openbox-gnome-session.1: $(srcdir)/doc/openbox-gnome-session.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
+doc/openbox-kde-session.1: $(srcdir)/doc/openbox-kde-session.1.sgml
        @echo make: creating $@
        @mkdir doc 2>/dev/null || true
-       @docbook-to-man $(srcdir)/doc/openbox-kde-session.1.sgml > $@
+       @docbook-to-man $< > $@
 
 dist_gnomewmfiles_DATA = \
        data/gnome-wm-properties/openbox.desktop
@@ -425,6 +434,7 @@ dist_noinst_DATA = \
        data/rc.xsd \
        data/menu.xsd \
        data/themerc.xsd \
+       data/xsession/openbox-session.in \
        data/xsession/openbox-gnome-session.in \
        data/xsession/openbox-kde-session.in \
        render/obrender-3.0.pc.in \
@@ -453,7 +463,8 @@ dist_doc_DATA = \
        AUTHORS \
        data/rc.xsd \
        data/menu.xsd \
-       data/themerc.xsd
+       data/themerc.xsd \
+       doc/rc-mouse-focus.xml
 
 dist_man_MANS = \
        doc/openbox.1 \