From 87bb91e6afcd76b0bd0d60af39524f507dc16fac Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Wed, 13 Feb 2013 15:15:46 +0000
Subject: [PATCH] Don't define the same make target/variables twice

The NSIS patches defined the .PHONY target twice and also
defined CLEANFILES twice
---
 Makefile.am      | 5 +++++
 data/Makefile.am | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 65a4de7..0befda2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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		\
diff --git a/data/Makefile.am b/data/Makefile.am
index 3ab6190..15755a7 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -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		\