aboutsummaryrefslogtreecommitdiffstats
path: root/src/build-data
diff options
context:
space:
mode:
authorsimon <[email protected]>2015-06-02 11:16:04 +0000
committerlloyd <[email protected]>2015-06-02 11:16:04 +0000
commitbc61db15678d01c9ff0aaabdc5fbe767232badca (patch)
tree50a8f39e4b24b4b41e79b3e71357d1d876a64445 /src/build-data
parentc1d4458aa3c0af01a77a58997f8fdf8648d7ddef (diff)
Fix nmake clean target. GH #104
Diffstat (limited to 'src/build-data')
-rw-r--r--src/build-data/makefile/gmake.in7
-rw-r--r--src/build-data/makefile/nmake.in10
2 files changed, 12 insertions, 5 deletions
diff --git a/src/build-data/makefile/gmake.in b/src/build-data/makefile/gmake.in
index e8c480a21..01ceb82e9 100644
--- a/src/build-data/makefile/gmake.in
+++ b/src/build-data/makefile/gmake.in
@@ -48,8 +48,11 @@ WEBSITE_SRC_DIR=%{doc_output_dir}/website-src
.PHONY = clean distclean docs website install valgrind
clean:
- $(RM) %{libobj_dir}/* %{testobj_dir}/* %{appobj_dir}/*
- $(RM) $(LIBRARIES) $(SYMLINK) $(SONAME) $(APP) $(TEST)
+ -$(RM) %{libobj_dir}/*
+ -$(RM) %{testobj_dir}/*
+ -$(RM) %{appobj_dir}/*
+ -$(RM) $(SONAME) $(SYMLINK)
+ -$(RM) $(LIBRARIES) $(APP) $(TEST)
distclean: clean
$(RM) Makefile
diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in
index 83192b365..0f1152262 100644
--- a/src/build-data/makefile/nmake.in
+++ b/src/build-data/makefile/nmake.in
@@ -57,9 +57,13 @@ docs:
%{build_doc_commands}
clean:
- $(RM) %{build_dir}\obj\* %{build_dir}\tests\*
- $(RM) *.manifest *.exp *.dll
- $(RM) $(LIBRARIES) $(APP) $(TEST)
+ -$(RM) %{libobj_dir}\*
+ -$(RM) %{testobj_dir}\*
+ -$(RM) %{appobj_dir}\*
+ -$(RM) %{out_dir}\*.manifest
+ -$(RM) %{out_dir}\*.exp
+ -$(RM) %{out_dir}\*.dll
+ -$(RM) $(LIBRARIES) $(APP) $(TEST)
distclean: clean
$(RM_R) %{build_dir}