remove the dialog option for Desktop action for now. can't change desktop during...

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c4cd977371f4dd10e1b7479d00ee4a46ffa98365..8384451827ac83acc49073e24d4420f081cb80bb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -360,48 +360,50 @@ dist_pixmap_DATA = \
 
 dist_rc_DATA = \
        data/rc.xml \
+       data/rc-gnome.xml \
+       data/rc-kde.xml \
        data/menu.xml
 
 edit = $(SED) \
        -e 's!@version\@!$(VERSION)!' \
-       -e 's!@confdir\@!$(confdir)!' \
+       -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
+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
@@ -453,9 +455,10 @@ dist_doc_DATA = \
        AUTHORS \
        data/rc.xsd \
        data/menu.xsd \
-       data/themerc.xsd
+       data/themerc.xsd \
+       doc/rc-mouse-focus.xml
 
-man_MANS = \
+dist_man_MANS = \
        doc/openbox.1 \
        doc/openbox-gnome-session.1 \
        doc/openbox-kde-session.1