Skip to content

Commit

Permalink
Merge branch 'feature/improved-build' into develop
Browse files Browse the repository at this point in the history
Fixes #67
  • Loading branch information
Kim Silkebækken committed May 4, 2014
2 parents 356606c + a072424 commit cabe5d4
Show file tree
Hide file tree
Showing 6 changed files with 88 additions and 464 deletions.
2 changes: 2 additions & 0 deletions docs/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
candybar.1
candybar.5
8 changes: 4 additions & 4 deletions docs/CONTRIBUTING.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ doesn't have to be installed system-wide for widgets to work.

[source,sh]
----
./waf configure build install \ # <1>
./waf configure clean build install \ # <1>
--debug \ # <2>
--prefix=/ \ # <3>
--libdir=`pwd`/out/lib/candybar \ # <4>
--rootdir=`pwd`/out \ # <4>
--destdir=out/ # <5>
out/bin/candybar
Expand All @@ -61,9 +61,9 @@ out/bin/candybar
./waf build install # <6>
----
<1> the +configure+ action is optional after the initial build
<1> the +configure+ and +clean+ actions are optional after the initial build
<2> enable debug build (disable optimizations, enable debug logging)
<3> disable prefixing the destination directory with +/usr/+
<4> tell +candybar+ to search for widget libraries in the +out/lib/+ directory
<4> tell +candybar+ to search for the default theme and widget libraries in the +out/+ directory
<5> installs into +out/+, remember to change +--libdir+ if you change this directory
<5> rebuild project, this command only recompiles changed files and is very fast
134 changes: 0 additions & 134 deletions docs/candybar.1

This file was deleted.

0 comments on commit cabe5d4

Please sign in to comment.