From 9c2cf0840994019ee6cb139c52525287031f3630 Mon Sep 17 00:00:00 2001 From: Nick Sullivan Date: Thu, 21 Nov 2013 08:20:49 -0800 Subject: [PATCH] Add external dependency to makefile. --- Makefile | 12 ++++++++---- README.md | 12 ++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c41624e..ed6ce5b 100644 --- a/Makefile +++ b/Makefile @@ -7,8 +7,12 @@ export GOPATH := $(PWD) BUILD_DEPS := go +.PHONY: external +external: + @go get code.google.com/p/go.crypto/scrypt + .PHONY: all -all: $(NAME) +all: external $(NAME) .PHONY: test test: @@ -28,7 +32,7 @@ bin/$(NAME): $(SRC) BUILD_PATH := build INSTALL_PREFIX := usr/local -CFSSL_BUILD_PATH := $(BUILD_PATH)/$(INSTALL_PREFIX)/$(NAME) +BUILD_PATH := $(BUILD_PATH)/$(INSTALL_PREFIX)/$(NAME) FPM := fakeroot fpm -C $(BUILD_PATH) \ -s dir \ @@ -41,8 +45,8 @@ DEB_PACKAGE := $(NAME)_$(VERSION)-$(ITERATION)_amd64.deb $(DEB_PACKAGE): TAGS := release $(DEB_PACKAGE): LDFLAGS := -X main.version $(VERSION) -X main.revision $(REVISION) $(DEB_PACKAGE): clean all - mkdir -p $(CFSSL_BUILD_PATH) - cp bin/$(NAME) $(CFSSL_BUILD_PATH) + mkdir -p $(BUILD_PATH) + cp bin/$(NAME) $(BUILD_PATH) $(FPM) -n $(NAME) $(INSTALL_PREFIX)/$(NAME) register-%.deb: ; $(PACKAGE_REGISTER_BIN) $*.deb diff --git a/README.md b/README.md index 2e2a93a..178df84 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,18 @@ redoctober Go server for two-man rule style file encryption and decryption. +## Building + +This project requires Go 1.1 or later to compile. + +Steps to compile: +make + +## Testing + +Steps to test: +make test + ## Running usage: