diff options
| author | Chris <ccbrown112@gmail.com> | 2017-11-14 13:13:31 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-14 13:13:31 -0600 |
| commit | 1c92ad0afb7d0828f5d8a69adbf9600b75f3b212 (patch) | |
| tree | 3d8805d3e25ac02347db4a2ca99973e07e613193 /Makefile | |
| parent | d4208cda19779d16eacb76346a7bd5cc9c50a4cc (diff) | |
| download | chat-1c92ad0afb7d0828f5d8a69adbf9600b75f3b212.tar.gz chat-1c92ad0afb7d0828f5d8a69adbf9600b75f3b212.tar.bz2 chat-1c92ad0afb7d0828f5d8a69adbf9600b75f3b212.zip | |
fix ee make targets (#7828)
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -69,18 +69,9 @@ TESTFLAGS ?= -short TESTFLAGSEE ?= -short # Packages lists -TE_PACKAGES=$(shell go list ./... | grep -v vendor) +TE_PACKAGES=$(shell go list ./...) TE_PACKAGES_COMMA=$(shell echo $(TE_PACKAGES) | tr ' ' ',') -EE_PACKAGES=$(shell go list ./enterprise/... | grep -v vendor | tail -n +2) -EE_PACKAGES_COMMA=$(shell echo $(EE_PACKAGES) | tr ' ' ',') - -ifeq ($(BUILD_ENTERPRISE_READY),true) -ALL_PACKAGES_COMMA=$(TE_PACKAGES_COMMA),$(EE_PACKAGES_COMMA) -else -ALL_PACKAGES_COMMA=$(TE_PACKAGES_COMMA) -endif - # Prepares the enterprise build if exists. The IGNORE stuff is a hack to get the Makefile to execute the commands outside a target ifeq ($(BUILD_ENTERPRISE_READY),true) IGNORE:=$(shell echo Enterprise build selected, preparing) @@ -90,6 +81,15 @@ ifeq ($(BUILD_ENTERPRISE_READY),true) IGNORE:=$(shell ln -s $(BUILD_ENTERPRISE_DIR) enterprise) endif +EE_PACKAGES=$(shell go list ./enterprise/...) +EE_PACKAGES_COMMA=$(shell echo $(EE_PACKAGES) | tr ' ' ',') + +ifeq ($(BUILD_ENTERPRISE_READY),true) +ALL_PACKAGES_COMMA=$(TE_PACKAGES_COMMA),$(EE_PACKAGES_COMMA) +else +ALL_PACKAGES_COMMA=$(TE_PACKAGES_COMMA) +endif + all: run |