working commit

Makefile.am

@@ -7,27 +7,32 @@ bin_PROGRAMS = mstorectl
 sbin_PROGRAMS = mstored
 
 mstorectl_SOURCES = \
-	cmd/mstorectl/filecmd.go \
-	cmd/mstorectl/imagecmd.go \
-	cmd/mstorectl/accountcmd.go \
-	cmd/mstorectl/grantcmd.go \
 	cmd/mstorectl/main.go
 
-mstored_SOURCES = \
-    cmd/mstored/main.go
+EXTRA_mstorectl_SOURCES = \
+	cmd/mstorectl/command/accountcmd.go \
+	cmd/mstorectl/command/grantcmd.go \
+	cmd/mstorectl/command/imagecmd.go \
+	cmd/mstorectl/command/util.go \
+	cmd/mstorectl/command/filecmd.go
 
-mstorectl$(EXEEXT): $(mstorectl_SOURCES) $(EXTRA_mstored_SOURCES)
+
+mstored_SOURCES = cmd/mstored/main.go
+EXTRA_mstored_SOURCES =	cmd/mstored/starter/starter.go
+
+
+mstorectl$(EXEEXT): $(mstorectl_SOURCES) $(EXTRA_mstorectl_SOURCES) $(EXTRA_mstored_SOURCES)
 	env CGO_ENABLED=0 $(GO) build $(GOFLAGS) -o mstorectl$(EXEEXT) $(mstorectl_SOURCES)
 
 mstored$(EXEEXT): $(mstored_SOURCES) $(EXTRA_mstored_SOURCES)
 	env CGO_ENABLED=1 $(GO) build $(GOFLAGS) -o mstored$(EXEEXT) $(mstored_SOURCES)
 
 run: $(mstored_SOURCES)
-	cd cmd/mstored && env CGO_ENABLED=1 $(GO) run . -daemon=false
+	cd cmd/mstored && env CGO_ENABLED=1 $(GO) run .
 
 CWD=$(shell pwd)
 
-EXTRA_mstored_SOURCES = \
+EXTRA_mstored_SOURCES += \
 	app/config/config.go \
 	app/config/variant.go \
 	\