working commit

Makefile.am

@@ -13,25 +13,50 @@ mbased$(EXEEXT): $(mbased_SOURCES) $(EXTRA_mbased_SOURCES)
 	env CGO_ENABLED=1 $(GO) build $(GOFLAGS) -o mbased$(EXEEXT) $(mbased_SOURCES)
 
 mbasedump_SOURCES = \
+	cmd/mbasedump/rest.go \
 	cmd/mbasedump/printr.go \
 	cmd/mbasedump/main.go \
+	cmd/mbasedump/dump.go \
 	cmd/mbasedump/util.go
 
 mbasedump$(EXEEXT): $(mbasedump_SOURCES) $(EXTRA_mbased_SOURCES)
 	env CGO_ENABLED=1 $(GO) build $(GOFLAGS) -o mbasedump$(EXEEXT) $(mbasedump_SOURCES)
 
-mbasectl_SOURCES = cmd/mbasectl/main.go \
-	cmd/mbasectl/account.go \
-	cmd/mbasectl/grant.go \
-	cmd/mbasectl/dump.go
+mbasectl_SOURCES = \
+	cmd/mbasectl/main.go \
+	cmd/mbasectl/util.go
 
+EXTRA_mbasectl_SOURCES = \
+	cmd/mbasectl/account/create.go \
+	cmd/mbasectl/account/delete.go \
+	cmd/mbasectl/account/list.go \
+	cmd/mbasectl/account/printr.go \
+	cmd/mbasectl/account/update.go \
+	cmd/mbasectl/account/util.go \
+	cmd/mbasectl/grant/create.go \
+	cmd/mbasectl/grant/delete.go \
+	cmd/mbasectl/grant/printr.go \
+	cmd/mbasectl/grant/util.go
 
 mbasectl$(EXEEXT): $(mbasectl_SOURCES) $(EXTRA_mbased_SOURCES)
 	env CGO_ENABLED=0 $(GO) build $(GOFLAGS) -o mbasectl$(EXEEXT) $(mbasectl_SOURCES)
 
-mbaseadmin_SOURCES = cmd/mbaseadmin/main.go \
-	cmd/mbaseadmin/account.go \
-	cmd/mbaseadmin/grant.go
+mbaseadmin_SOURCES = \
+	cmd/mbaseadmin/main.go \
+	cmd/mbaseadmin/util.go
+
+EXTRA_mbaseadmin_SOURCES = \
+	cmd/mbaseadmin/account/create.go \
+	cmd/mbaseadmin/account/delete.go \
+	cmd/mbaseadmin/account/list.go \
+	cmd/mbaseadmin/account/printr.go \
+	cmd/mbaseadmin/account/update.go \
+	cmd/mbaseadmin/account/util.go \
+	cmd/mbaseadmin/grant/create.go \
+	cmd/mbaseadmin/grant/delete.go \
+	cmd/mbaseadmin/grant/printr.go \
+	cmd/mbaseadmin/grant/util.go
+
 
 mbaseadmin$(EXEEXT): $(mbaseadmin_SOURCES) $(EXTRA_mbased_SOURCES)
 	env CGO_ENABLED=1 $(GO) build $(GOFLAGS) -o mbaseadmin$(EXEEXT) $(mbaseadmin_SOURCES)