From 328d42c65189a966b4840633f12724c66696ae59 Mon Sep 17 00:00:00 2001 From: "Frederick F. Kautz IV" Date: Sun, 17 Mar 2013 11:53:37 -0700 Subject: [PATCH 1/3] Makefile cleanup renamed to clean to match standard conventions. Upstream-commit: a3ca3e921802b1979c14174c352320e45b3251e6 Component: engine --- components/engine/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/components/engine/Makefile b/components/engine/Makefile index 28856eb622..9eac773c96 100644 --- a/components/engine/Makefile +++ b/components/engine/Makefile @@ -29,7 +29,7 @@ install: install -m 0755 bin/docker $(DESTDIR)/$(INSDIR) install -o root -m 0755 etc/docker.upstart $(DESTDIR)/etc/init/docker.conf -$(BUILD_SRC): cleanup +$(BUILD_SRC): clean # Copy ourselves into $BUILD_SRC to comply with unusual golang constraints tar --exclude=*.tar.gz --exclude=checkout.tgz -f checkout.tgz -cz * mkdir -p $(BUILD_SRC)/$(GITHUB_PATH) @@ -79,6 +79,5 @@ gotest: done @sudo rm -rf /tmp/docker-* -cleanup: - +clean: rm -rf $(BUILD_PATH) debian/$(PKG_NAME)* debian/files $(BUILD_SRC) checkout.tgz From 114ab0aeecf3f9fafef48859d477a260066b15d5 Mon Sep 17 00:00:00 2001 From: "Frederick F. Kautz IV" Date: Sun, 17 Mar 2013 11:54:05 -0700 Subject: [PATCH 2/3] Adding bin to clean Upstream-commit: bb9ce6b2872b62b444306c53d0fa26d389d9a9d9 Component: engine --- components/engine/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/Makefile b/components/engine/Makefile index 9eac773c96..cfa2ae2024 100644 --- a/components/engine/Makefile +++ b/components/engine/Makefile @@ -80,4 +80,4 @@ gotest: @sudo rm -rf /tmp/docker-* clean: - rm -rf $(BUILD_PATH) debian/$(PKG_NAME)* debian/files $(BUILD_SRC) checkout.tgz + rm -rf $(BUILD_PATH) debian/$(PKG_NAME)* debian/files $(BUILD_SRC) checkout.tgz bin From f29884b197c926536996b0d63b2900b823dd7c35 Mon Sep 17 00:00:00 2001 From: "Frederick F. Kautz IV" Date: Sun, 17 Mar 2013 11:59:59 -0700 Subject: [PATCH 3/3] Adding clean to beginning of all for cleaner builds. Upstream-commit: 6316b995564f1ffcd614402489ed4b929ac26f74 Component: engine --- components/engine/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/Makefile b/components/engine/Makefile index cfa2ae2024..2178ebcb93 100644 --- a/components/engine/Makefile +++ b/components/engine/Makefile @@ -14,7 +14,7 @@ TMPDIR=$(shell mktemp -d -t XXXXXX) # Build a debian source package -all: build_in_deb +all: clean build_in_deb build_in_deb: echo "GOPATH = " $(ROOT_PATH)