From 7f49f8c4b5560f9d39b05c3c1049d0cd21c6b135 Mon Sep 17 00:00:00 2001 From: Gisle Aune Date: Sun, 17 Jun 2018 22:57:34 +0200 Subject: [PATCH] Fixed wikiauth compile error, moved build to the top of makefile --- Gopkg.lock | 5 ----- makefile | 7 ++++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 1fe70c0..2dc1977 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -1,11 +1,6 @@ # This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. -[[projects]] - branch = "master" - name = "git.aiterp.net/aiterp/wikiauth" - packages = ["."] - revision = "d73e1a0802728a5559e6e870ce14bfdac3901ed8" [[projects]] branch = "master" diff --git a/makefile b/makefile index a265253..cd5916e 100644 --- a/makefile +++ b/makefile @@ -1,4 +1,8 @@ INSTALL_PATH ?= ./build +CGO_ENABLED ?= 0 + +# Build all the things +build: build-server build-tools # Clean up previous builds, vendor directory and generated files clean: @@ -25,9 +29,6 @@ build-tools: build-server go build -ldflags="-s -w" -o $(INSTALL_PATH)/usr/bin/rpdata-ensurechannels ./cmd/rpdata-ensurechannels go build -ldflags="-s -w" -o $(INSTALL_PATH)/usr/bin/rpdata-as2storyimport ./cmd/rpdata-ensurechannels -# Build all the things -build: build-server build-tools - # Install locally (requires access to /usr/bin, hence no dependency on build) install: cp $(INSTALL_PATH)/usr/bin/* /usr/local/bin/ \ No newline at end of file