aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--doc/doxy.config.in2
-rwxr-xr-xobj/build_make.sh (renamed from build/build_make.sh)0
3 files changed, 2 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index c3c0e572..f6b09c9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,6 @@
.*
*.swp
*~$
-build
+obj
cscope.*
tags
diff --git a/doc/doxy.config.in b/doc/doxy.config.in
index 4da9b2c9..a7a9ffbb 100644
--- a/doc/doxy.config.in
+++ b/doc/doxy.config.in
@@ -721,7 +721,7 @@ EXCLUDE_SYMLINKS = NO
EXCLUDE_PATTERNS = */.git/* \
*/.svn/* \
*/cmake/* \
- */build/*
+ */obj/*
# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
# (namespaces, classes, functions, etc.) that should be excluded from the
diff --git a/build/build_make.sh b/obj/build_make.sh
index 2f2e4a6c..2f2e4a6c 100755
--- a/build/build_make.sh
+++ b/obj/build_make.sh