diff options
-rw-r--r-- | build.conf | 14 | ||||
-rwxr-xr-x | checkinst.sh | 2 |
2 files changed, 8 insertions, 8 deletions
@@ -5,7 +5,7 @@ | |||
5 | # This file is part of the libbu++ library and is released under the | 5 | # This file is part of the libbu++ library and is released under the |
6 | # terms of the license contained in the file LICENSE. | 6 | # terms of the license contained in the file LICENSE. |
7 | 7 | ||
8 | default action: check group "lnhdrs", check "libbu++.a", check "libbu++.so", check group "tools" | 8 | default action: check group "lnhdrs", check "libbu++.a", check group "tools" |
9 | "tests" action: check group "lnhdrs", check group "tests" | 9 | "tests" action: check group "lnhdrs", check group "tests" |
10 | "all" action: check group "lnhdrs", check targets() | 10 | "all" action: check group "lnhdrs", check targets() |
11 | 11 | ||
@@ -27,12 +27,12 @@ filesIn("src") filter regexp("^src/(.*)\\.h$", "bu/{re:1}.h"): | |||
27 | set "CXXFLAGS" += "-I. -fPIC", | 27 | set "CXXFLAGS" += "-I. -fPIC", |
28 | input filesIn("src") filter regexp("^.*\\.cpp$") | 28 | input filesIn("src") filter regexp("^.*\\.cpp$") |
29 | 29 | ||
30 | "libbu++.so": | 30 | #"libbu++.so": |
31 | rule "so", | 31 | # rule "so", |
32 | target file, | 32 | # target file, |
33 | set "CXXFLAGS" += "-I. -fPIC", | 33 | # set "CXXFLAGS" += "-I. -fPIC", |
34 | set "LDFLAGS" += "-lpthread -lbz2", | 34 | # set "LDFLAGS" += "-lpthread -lbz2", |
35 | input filesIn("src") filter regexp("^.*\\.cpp$") | 35 | # input filesIn("src") filter regexp("^.*\\.cpp$") |
36 | 36 | ||
37 | 37 | ||
38 | directoriesIn("src/tests","tests/"): | 38 | directoriesIn("src/tests","tests/"): |
diff --git a/checkinst.sh b/checkinst.sh index cc0d0e9..e5490bc 100755 --- a/checkinst.sh +++ b/checkinst.sh | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | 2 | ||
3 | CMD="ln -svf $PWD/libbu++.so /usr/lib; ln -svf $PWD/bu /usr/include; ln -svf $PWD/libbu++.a /usr/lib" | 3 | CMD="ln -svf $PWD/bu /usr/include; ln -svf $PWD/libbu++.a /usr/lib" |
4 | 4 | ||
5 | if [ $UID == 0 ]; then | 5 | if [ $UID == 0 ]; then |
6 | bash -c "$CMD" | 6 | bash -c "$CMD" |