Refactored Makefile for faster development

.gitignore

@@ -28,3 +28,5 @@ host_rsa*
 id_rsa*
 
 profile.out
+
+.docker-container-built

Makefile

@@ -1,17 +1,21 @@
 PACKAGES := .
 COMMANDS := $(addprefix ./,$(wildcard cmd/*))
-
+VERSION := $(shell cat .goxc.json | jq -c .PackageVersion | sed 's/"//g')
+SOURCES := $(shell find . -name "*.go")
 
 all: build
 
 
-build:
+build: $(notdir $(COMMANDS))
+
+run: build
+	./ssh2docker
+
+$(notdir $(COMMANDS)): $(SOURCES)
 	go get -t ./...
-	gofmt -w $(PACKAGES) $(COMMANDS)
-	go test -i $(PACKAGES) $(COMMANDS)
-	for command in $(COMMANDS); do \
-	  go build -o `basename $$command` $$command; \
-	done
+	gofmt -w $(PACKAGES) ./cmd/$@
+	go test -i $(PACKAGES) ./cmd/$@
+	go build -o $@ ./cmd/$@
 
 
 test:
@@ -42,8 +46,28 @@ convey:
 
 
 .PHONY: build-docker
-build-docker:
-	make -C contrib/docker
+build-docker: contrib/docker/.docker-container-built
+
+
+contrib/docker/.docker-container-built: dist/latest/ssh2docker_latest_linux_386
+	cp dist/latest/ssh2docker_latest_linux_386 contrib/docker/ssh2docker
+	docker build -t moul/ssh2docker:latest contrib/docker
+	docker run -it --rm moul/ssh2docker --version
+	docker inspect --type=image --format="{{ .Id }}" moul/ssh2docker > $@.tmp
+	mv $@.tmp $@
+
+
+.PHONY: run-docker
+run-docker: build-docker
+	docker run -it --rm -p 2222:2222 moul/ssh2docker
+
+
+dist/latest/ssh2docker_latest_linux_386: $(SOURCES)
+	mkdir -p dist
+	rm -f dist/latest
+	(cd dist; ln -s $(VERSION) latest)
+	goxc -bc="linux,386" xc
+	cp dist/latest/ssh2docker_$(VERSION)_linux_386 dist/latest/ssh2docker_latest_linux_386
 
 
 .PHONY: docker-ps

contrib/docker/Makefile

@@ -1,9 +1,2 @@
-all: ssh2docker
-
-
-.PHONY: ssh2docker
-ssh2docker:
-	cd ../..; goxc -bc="linux,386" xc
-	cp ../../dist/*/ssh2docker_*_linux_386 ssh2docker
-	docker build -t moul/ssh2docker:latest .
-	docker run -it --rm moul/ssh2docker --version
+run-docker build-docker:
+	$(MAKE) -C ../../ $@