aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlloyd <[email protected]>2014-01-18 17:33:50 +0000
committerlloyd <[email protected]>2014-01-18 17:33:50 +0000
commit6b457468faa88180142de9bd2ba0fee90be43463 (patch)
tree27c31e039de723f8f8cf9ce1b6b1f3489efc2ed5
parent4917f26a2b154e841cd27c1bcecdd41d2bdeb6ce (diff)
Fix make clean, removed too much
-rwxr-xr-xconfigure.py5
-rw-r--r--src/build-data/makefile/gmake.in2
2 files changed, 6 insertions, 1 deletions
diff --git a/configure.py b/configure.py
index b711d11e3..86753ba4c 100755
--- a/configure.py
+++ b/configure.py
@@ -1190,6 +1190,11 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo):
'docdir': options.docdir or osinfo.doc_dir,
'build_dir': build_config.build_dir,
+
+ 'appobj_dir': build_config.appobj_dir,
+ 'libobj_dir': build_config.libobj_dir,
+ 'testobj_dir': build_config.testobj_dir,
+
'doc_output_dir': build_config.doc_output_dir,
'build_doc_commands': build_config.build_doc_commands,
diff --git a/src/build-data/makefile/gmake.in b/src/build-data/makefile/gmake.in
index 40896a321..ab7676635 100644
--- a/src/build-data/makefile/gmake.in
+++ b/src/build-data/makefile/gmake.in
@@ -56,7 +56,7 @@ WEBSITE_DIR=%{doc_output_dir}/website
WEBSITE_SRC_DIR=%{doc_output_dir}/website-src
clean:
- $(RM_R) %{build_dir}/obj
+ $(RM) %{libobj_dir}/* %{testobj_dir}/* %{appobj_dir}/*
$(RM) $(LIBRARIES) $(SYMLINK) $(SONAME) $(APP) $(TEST)
distclean: clean