Moved eyes into example apps, cleaned up Makefile

Makefile

@@ -3,8 +3,9 @@ GOTOOLS =	github.com/mitchellh/gox \
 			github.com/rigelrozanski/shelldown/cmd/shelldown
 TUTORIALS=$(shell find docs/guide -name "*md" -type f)
 
-EXAMPLES := counter
-EXAMPLE_DIRS := $(addprefix ./examples/,${EXAMPLES})
+EXAMPLES := counter eyes
+INSTALL_EXAMPLES := $(addprefix install_,${EXAMPLES})
+TEST_EXAMPLES := $(addprefix testex_,${EXAMPLES})
 
 LINKER_FLAGS:="-X github.com/cosmos/cosmos-sdk/client/commands.CommitHash=`git rev-parse --short HEAD`"
 
@@ -13,11 +14,14 @@ all: get_vendor_deps install test
 build:
 	@go build ./cmd/...
 
-install:
+$(INSTALL_EXAMPLES): install_%:
+	cd ./examples/$* && make install
+
+$(TEST_EXAMPLES): testex_%:
+	cd ./examples/$* && make test_cli
+
+install: $(INSTALL_EXAMPLES)
 	@go install -ldflags $(LINKER_FLAGS) ./cmd/...
-	@for EX in $(EXAMPLE_DIRS); do \
-		cd $$EX && make install; \
-	done
 
 dist:
 	@bash publish/dist.sh
@@ -31,23 +35,18 @@ test: test_unit test_cli
 
 test_unit:
 	@go test `glide novendor`
-	#go run tests/tendermint/*.go
 
-test_cli:
+test_cli: $(TEST_EXAMPLES)
 	# sudo apt-get install jq
 	# wget "https://raw.githubusercontent.com/kward/shunit2/master/source/2.1/src/shunit2"
 	./tests/cli/keys.sh
 	./tests/cli/rpc.sh
 	./tests/cli/init.sh
 	./tests/cli/basictx.sh
-	./tests/cli/eyes.sh
 	./tests/cli/roles.sh
 	./tests/cli/restart.sh
 	./tests/cli/rest.sh
 	./tests/cli/ibc.sh
-	@for EX in $(EXAMPLE_DIRS); do \
-		cd $$EX && make test_cli; \
-	done
 
 test_tutorial:
 	@shelldown ${TUTORIALS}

examples/eyes/Makefile

@@ -0,0 +1,14 @@
+LINKER_FLAGS:="-X github.com/cosmos/cosmos-sdk/client/commands.CommitHash=`git rev-parse --short HEAD`"
+
+install:
+	@go install -ldflags $(LINKER_FLAGS) ./cmd/...
+
+test: test_unit test_cli
+
+test_unit:
+	@go test `glide novendor`
+
+test_cli:
+	./tests/cli/eyes.sh
+
+.PHONY: install test test_unit test_cli

examples/eyes/tests/cli/eyes.sh

@@ -66,6 +66,8 @@ test00SetGetRemove() {
 
 # Load common then run these tests with shunit2!
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" #get this files directory
-. $DIR/common.sh
-. $DIR/shunit2
+CLI_DIR=${DIR}/../../../../tests/cli
+
+. $CLI_DIR/common.sh
+. $CLI_DIR/shunit2