From ee28cf91e18d1f318a4b7f8923a3628615ccd7e1 Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Tue, 2 Jun 2015 13:46:02 +0100
Subject: [PATCH] move weaveexec

---
 .gitignore                               | 10 +++++-----
 Makefile                                 | 16 ++++++++--------
 {weaveexec => prog/weaveexec}/Dockerfile |  0
 3 files changed, 13 insertions(+), 13 deletions(-)
 rename {weaveexec => prog/weaveexec}/Dockerfile (100%)

diff --git a/.gitignore b/.gitignore
index 4eae9f53..b289ff9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,9 +41,9 @@ releases
 weave.tar
 weavedns.tar
 weaveexec.tar
-weaveexec/weave
-weaveexec/weaveproxy
-weaveexec/weavewait
-weaveexec/sigproxy
-weaveexec/docker*.tgz
+prog/weaveexec/weave
+prog/weaveexec/weaveproxy
+prog/weaveexec/weavewait
+prog/weaveexec/sigproxy
+prog/weaveexec/docker*.tgz
 Vagrantfile.local
diff --git a/Makefile b/Makefile
index 4a11117f..f17838e5 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ WEAVEEXEC_EXPORT=weaveexec.tar
 EXPORTS=$(WEAVER_EXPORT) $(WEAVEDNS_EXPORT) $(WEAVEEXEC_EXPORT)
 
 WEAVEEXEC_DOCKER_VERSION=1.3.1
-DOCKER_DISTRIB=weaveexec/docker-$(WEAVEEXEC_DOCKER_VERSION).tgz
+DOCKER_DISTRIB=prog/weaveexec/docker-$(WEAVEEXEC_DOCKER_VERSION).tgz
 DOCKER_DISTRIB_URL=https://get.docker.com/builds/Linux/x86_64/docker-$(WEAVEEXEC_DOCKER_VERSION).tgz
 
 all: $(EXPORTS)
@@ -70,13 +70,13 @@ $(WEAVEDNS_EXPORT): weavedns/Dockerfile $(WEAVEDNS_EXE)
 	$(SUDO) docker build -t $(WEAVEDNS_IMAGE) weavedns
 	$(SUDO) docker save $(WEAVEDNS_IMAGE):latest > $@
 
-$(WEAVEEXEC_EXPORT): weaveexec/Dockerfile $(DOCKER_DISTRIB) weave $(SIGPROXY_EXE) $(WEAVEPROXY_EXE) $(WEAVEWAIT_EXE)
-	cp weave weaveexec/weave
-	cp $(SIGPROXY_EXE) weaveexec/sigproxy
-	cp $(WEAVEPROXY_EXE) weaveexec/weaveproxy
-	cp $(WEAVEWAIT_EXE) weaveexec/weavewait
-	cp $(DOCKER_DISTRIB) weaveexec/docker.tgz
-	$(SUDO) docker build -t $(WEAVEEXEC_IMAGE) weaveexec
+$(WEAVEEXEC_EXPORT): prog/weaveexec/Dockerfile $(DOCKER_DISTRIB) weave $(SIGPROXY_EXE) $(WEAVEPROXY_EXE) $(WEAVEWAIT_EXE)
+	cp weave prog/weaveexec/weave
+	cp $(SIGPROXY_EXE) prog/weaveexec/sigproxy
+	cp $(WEAVEPROXY_EXE) prog/weaveexec/weaveproxy
+	cp $(WEAVEWAIT_EXE) prog/weaveexec/weavewait
+	cp $(DOCKER_DISTRIB) prog/weaveexec/docker.tgz
+	$(SUDO) docker build -t $(WEAVEEXEC_IMAGE) prog/weaveexec
 	$(SUDO) docker save $(WEAVEEXEC_IMAGE):latest > $@
 
 $(DOCKER_DISTRIB):
diff --git a/weaveexec/Dockerfile b/prog/weaveexec/Dockerfile
similarity index 100%
rename from weaveexec/Dockerfile
rename to prog/weaveexec/Dockerfile