diff options
author | Paul Tagliamonte <paultag@ubuntu.com> | 2011-04-15 18:48:05 (GMT) |
---|---|---|
committer | Paul Tagliamonte <tag@loki.(none)> | 2011-09-24 15:48:47 (GMT) |
commit | cc5c30c9cbdce2693d284c57ae4671017bf0660c (patch) | |
tree | ce85451dd72abc0dfc8475c20c86e496805110f2 /doc/Makefile.am | |
parent | 0e1ee49603a565427fa833a4136c586a0e816c47 (diff) | |
download | fluxbox_paul-cc5c30c9cbdce2693d284c57ae4671017bf0660c.zip fluxbox_paul-cc5c30c9cbdce2693d284c57ae4671017bf0660c.tar.bz2 |
Integrating fbautostart into the Fluxbox tree.
This change merges fbautostart into fluxbox. fbautostart has been
re-licensed under MIT to allow for this.
I've added the util/fbautostart directory, and tweeked the build
chain to include fbautostart. I've also added in a few docs.
Those are the only changes outside the util/fbautostart folder.
It's been noted in the ChangeLog, but fbautostart changes (since it might be
a bit more "high-volume") should be maintained in util/fbautostart/ChangeLog.
The XDG spec can be found at:
- http://standards.freedesktop.org/autostart-spec/autostart-spec-latest.html
Diffstat (limited to 'doc/Makefile.am')
-rw-r--r-- | doc/Makefile.am | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 008e318..07c1f93 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am | |||
@@ -1,15 +1,18 @@ | |||
1 | # doc/Makefile.am for Fluxbox 0.9 - an X11 Window manager | 1 | # doc/Makefile.am for Fluxbox 0.9 - an X11 Window manager |
2 | # Makefile.am for fluxbox/doc | 2 | # Makefile.am for fluxbox/doc |
3 | 3 | ||
4 | CLEANFILES = fluxbox.1 fbrun.1 fbsetbg.1 fbsetroot.1 startfluxbox.1 fluxbox-apps.5 \ | 4 | CLEANFILES = fluxbox.1 fbrun.1 fbsetbg.1 fbsetroot.1 startfluxbox.1 fluxbox-remote.1 \ |
5 | fluxbox-keys.5 fluxbox-menu.5 fluxbox-remote.1 fluxbox-style.5 | 5 | fbautostart.1 fluxbox-apps.5 fluxbox-keys.5 fluxbox-menu.5 fluxbox-style.5 |
6 | |||
6 | MAINTAINERCLEANFILES = Makefile.in | 7 | MAINTAINERCLEANFILES = Makefile.in |
7 | man_MANS = fluxbox.1 fbrun.1 fbsetbg.1 fbsetroot.1 fluxbox-apps.5 \ | 8 | |
8 | fluxbox-keys.5 fluxbox-menu.5 fluxbox-remote.1 fluxbox-style.5 \ | 9 | man_MANS = fluxbox.1 fbrun.1 fbsetbg.1 fbsetroot.1 startfluxbox.1 fluxbox-remote.1 \ |
9 | startfluxbox.1 | 10 | fbautostart.1 fluxbox-apps.5 fluxbox-keys.5 fluxbox-menu.5 fluxbox-style.5 |
11 | |||
10 | EXTRA_DIST=startfluxbox.1.in CODESTYLE \ | 12 | EXTRA_DIST=startfluxbox.1.in CODESTYLE \ |
11 | fluxbox.1.in fbrun.1.in fbsetbg.1.in fbsetroot.1.in fluxbox-apps.5.in \ | 13 | fluxbox.1.in fbrun.1.in fbsetbg.1.in fbsetroot.1.in fluxbox-remote.1.in fbautostart.1.in \ |
12 | fluxbox-keys.5.in fluxbox-menu.5.in fluxbox-remote.1.in fluxbox-style.5.in | 14 | fluxbox-keys.5.in fluxbox-menu.5.in fluxbox-apps.5.in fluxbox-style.5.in |
15 | |||
13 | distclean-local: | 16 | distclean-local: |
14 | rm -f *\~ | 17 | rm -f *\~ |
15 | 18 | ||