summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2012-07-01 18:49:21 +0200
committerBruno Haible <bruno@clisp.org>2012-07-01 19:02:44 +0200
commit0003342367eeabae071fadbd81001e91bff80b59 (patch)
tree43d179a54fa9610bcf85c0e3bb015f83bc23c446
parent04c7392e59fe79da0f716835204dc7812701c807 (diff)
downloadgperf-0003342367eeabae071fadbd81001e91bff80b59.tar.gz
Fix "make clean" with MSVC.
-rw-r--r--ChangeLog7
-rw-r--r--src/Makefile.in2
-rw-r--r--tests/Makefile.in11
3 files changed, 18 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c1beb9b..3d219ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2012-07-01 Bruno Haible <bruno@clisp.org>
+ Fix "make clean" with MSVC.
+ With MSVC 9, a program is created together with a .manifest file.
+ * src/Makefile.in (clean): Remove also the .manifest file.
+ * tests/Makefile.in (clean): Remove also the .manifest files.
+
+2012-07-01 Bruno Haible <bruno@clisp.org>
+
Update expected test results.
* tests/test-6.exp: Expect to see --constants-prefix option.
diff --git a/src/Makefile.in b/src/Makefile.in
index e69bad2..8d3c2af 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -133,7 +133,7 @@ check : all
mostlyclean : clean
clean : force
- $(RM) *~ *.s *.$(OBJEXT) *.a $(TARGETPROG) core
+ $(RM) *~ *.s *.$(OBJEXT) *.a $(TARGETPROG) $(TARGETPROG).manifest core
distclean : clean
$(RM) config.status config.log config.cache Makefile config.h
diff --git a/tests/Makefile.in b/tests/Makefile.in
index f9fa1c4..00e911d 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -329,7 +329,16 @@ check-lang-syntax : force
mostlyclean : clean
clean : force
- $(RM) *.$(OBJEXT) core *inset.c output.* *.out aout$(EXEEXT) cout$(EXEEXT) lu2out$(EXEEXT) lu8out$(EXEEXT) m3out$(EXEEXT) pout$(EXEEXT) preout$(EXEEXT) smtp.c smtp$(EXEEXT) tmp-* valitest*
+ $(RM) *.$(OBJEXT) core *inset.c output.* *.out \
+ aout$(EXEEXT) aout$(EXEEXT).manifest \
+ cout$(EXEEXT) cout$(EXEEXT).manifest \
+ lu2out$(EXEEXT) lu2out$(EXEEXT).manifest \
+ lu8out$(EXEEXT) lu8out$(EXEEXT).manifest \
+ m3out$(EXEEXT) m3out$(EXEEXT).manifest \
+ pout$(EXEEXT) pout$(EXEEXT).manifest \
+ preout$(EXEEXT) preout$(EXEEXT).manifest \
+ smtp.c smtp$(EXEEXT) smtp$(EXEEXT).manifest \
+ tmp-* valitest*
$(RM) -r *.dSYM
distclean : clean