Merge branch 'master' into richardgv-dev

Conflicts:
	bin/compton-trans
	man/compton-trans.1

- Add some explaination in README.md.

- Rename CMakeLists.txt to _CMakeLists.txt to avoid confusion.
This commit is contained in:
Richard Grenville
2012-11-14 18:42:09 +08:00
4 changed files with 69 additions and 54 deletions

View File

@ -57,13 +57,21 @@ __R__ for runtime
* libGL (B,R) (Will probably be made optional soon)
* asciidoc (B) (if you wish to run `make docs`)
To build, make sure you have the above dependencies:
### How to build
To build, make sure you have the dependencies above:
``` bash
# Make the main program
$ make
# Make the newer man pages
$ make docs
# Install
$ make install
```
(Compton does include a `_CMakeLists.txt` in the tree, but we haven't decided whether we should switch to CMake yet. The `Makefile` is fully usable right now.)
## Example Usage
``` bash