Merge pull request #20 from snonux/develop

Make CGo dependencies optional (e.g. Linux ACL support)

1 files changed, 13 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index c8e5a12..6d85347 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,21 @@
 GO ?= go
 all: test build
 build:
+ifndef USE_ACL
 	${GO} build -o dserver ./cmd/dserver/main.go
+else
+	${GO} build -tags linuxacl -o dserver ./cmd/dserver/main.go
+endif
 	${GO} build -o dcat ./cmd/dcat/main.go
 	${GO} build -o dgrep ./cmd/dgrep/main.go
 	${GO} build -o dmap ./cmd/dmap/main.go
 	${GO} build -o dtail ./cmd/dtail/main.go
 install:
+ifndef USE_ACL
 	${GO} install ./cmd/dserver/main.go
+else
+	${GO} install -tags linuxacl ./cmd/dserver/main.go
+endif
 	${GO} install ./cmd/dcat/main.go
 	${GO} install ./cmd/dgrep/main.go
 	${GO} install ./cmd/dmap/main.go
@@ -17,7 +25,7 @@ clean:
 	  test -f $$cmd && rm $$cmd; \
 	done
 vet:
-	find . -type d | while read dir; do \
+	find . -type d | egrep -v '(./samples|./log|./doc)' | while read dir; do \
 	  echo ${GO} vet $$dir; \
 	  ${GO} vet $$dir; \
 	done
@@ -28,4 +36,8 @@ lint:
 	  golint $$dir; \
 	done
 test:
+ifndef USE_ACL
 	${GO} test ./... -v
+else
+	${GO} test -tags linuxacl ./... -v
+endif