Don't define the same make target/variables twice

The NSIS patches defined the .PHONY target twice and also
defined CLEANFILES twice
This commit is contained in:
Daniel P. Berrange 2013-02-13 15:15:46 +00:00
parent 25a2acc2da
commit 87bb91e6af
2 changed files with 6 additions and 1 deletions

View File

@ -49,7 +49,12 @@ dist-hook: gen-ChangeLog gen-AUTHORS
# Generate the ChangeLog file (with all entries since the switch to git)
# and insert it into the directory we're about to use to create a tarball.
if OS_WIN32
.PHONY: gen-ChangeLog gen-AUTHORS nsis
else
.PHONY: gen-ChangeLog gen-AUTHORS
endif
gen-ChangeLog:
if test -d .git || test -d ../.git; then \
$(top_srcdir)/build-aux/gitlog-to-changelog \

View File

@ -30,7 +30,7 @@ virt-viewer-$(VERSION).msi: virt-viewer.wxs deps.txt
$< virt-viewer-files.wxs && \
rm -rf $$DESTDIR virt-viewer-files.wxs
CLEANFILES = \
CLEANFILES += \
deps.txt \
virt-viewer-$(VERSION).exe \
virt-viewer-$(VERSION).msi \