move master_dispatch to master/tools/ directory.

app/Makefile

@@ -2,14 +2,12 @@
 
 all:
 	@(cd master; make)
-	@(cd master_dispatch; make)
 	@(cd wizard; make)
 	@(cd redis_tools; make)
 	@(cd http_logger; make)
 	@(cd wizard_demo; make)
 cl clean:
 	@(cd master; make clean)
-	@(cd master_dispatch; make clean)
 	@(cd wizard; make clean)
 	@(cd redis_tools; make clean)
 	@(cd http_logger; make clean)

app/master/tools/Makefile

@@ -3,9 +3,11 @@
 all:
 	@(cd master_ctl; make)
 	@(cd master_ctld; make)
+	@(cd master_dispatch; make)
 
 cl clean:
 	@(cd master_ctl; make clean)
 	@(cd master_ctld; make clean)
+	@(cd master_dispatch; make clean)
 
 rb rebuild: cl all

app/master/tools/master_dispatch/Makefile

@@ -1,8 +1,11 @@
+.PHONEY = all clean cl rebuild rb
 
 all:
 	@(cd server; make)
 	@(cd manager; make)
 
-clean:
+clean cl:
 	@(cd server; make clean)
 	@(cd manager; make clean)
+
+rebuild rb: cl all

app/master/tools/master_dispatch/manager/Makefile.in

@@ -91,12 +91,13 @@ ifneq ($(SYSPATH),)
 endif
 ###########################################################
 
-CFLAGS += -I../../../lib_acl/include -I../../../lib_protocol/include \
-	  -I../../../lib_acl_cpp/include -I.
+CFLAGS += -I../../../../../lib_acl/include \
+	  -I../../../../../lib_protocol/include \
+	  -I../../../../../lib_acl_cpp/include -I.
 EXTLIBS =
-LDFLAGS = -L../../../lib_acl_cpp/lib -lacl_cpp \
-	  -L../../../lib_protocol/lib -lprotocol \
-	  -L../../../lib_acl/lib -lacl \
+LDFLAGS = -L../../../../../lib_acl_cpp/lib -lacl_cpp \
+	  -L../../../../../lib_protocol/lib -lprotocol \
+	  -L../../../../../lib_acl/lib -lacl \
 	  $(EXTLIBS) $(SYSLIB) -rdynamic
 
 COMPILE = $(CC) $(CFLAGS)
@@ -124,10 +125,11 @@ all: RM $(OBJ)
 	@echo ""
 RM:
 	rm -f $(PROG)
-clean:
+clean cl:
 	rm -f $(PROG)
 	rm -f $(OBJ)
+rebuild rb: cl all
 install:
-	cp $(PROG) ../../../dist/master/libexec/$(RPATH)/
-	cp $(PROG).cf ../../../dist/master/conf/service/
+	cp $(PROG) ../../../../../dist/master/libexec/$(RPATH)/
+	cp $(PROG).cf ../../../../../dist/master/conf/service/
 ###########################################################

app/master/tools/master_dispatch/server/Makefile.in

@@ -89,10 +89,15 @@ ifneq ($(SYSPATH),)
 endif
 ###########################################################
 
-CFLAGS += -I. -I../../../lib_acl/include -I../../../lib_protocol/include -I../../../lib_acl_cpp/include
+CFLAGS += -I. \
+	  -I../../../../../lib_acl/include \
+	  -I../../../../../lib_protocol/include \
+	  -I../../../../../lib_acl_cpp/include
 EXTLIBS =
-LDFLAGS = -L../../../lib_acl_cpp/lib -lacl_cpp -L../../../lib_protocol/lib -lprotocol -L../../../lib_acl/lib -lacl \
-	$(EXTLIBS) $(SYSLIB) -rdynamic
+LDFLAGS = -L../../../../../lib_acl_cpp/lib -lacl_cpp \
+	  -L../../../../../lib_protocol/lib -lprotocol \
+	  -L../../../../../lib_acl/lib -lacl \
+	  $(EXTLIBS) $(SYSLIB) -rdynamic
 
 COMPILE = $(CC) $(CFLAGS)
 LINK = $(CC) $(OBJ) $(LDFLAGS)
@@ -125,10 +130,11 @@ all: RM $(OBJ)
 	@echo ""
 RM:
 	rm -f $(PROG)
-clean:
+clean cl:
 	rm -f $(PROG)
 	rm -f $(OBJ)
+rebuild rb: cl all
 install:
-	cp $(PROG) ../../../dist/master/libexec/$(RPATH)/
-	cp $(PROG).cf ../../../dist/master/conf/service/
+	cp $(PROG) ../../../../../dist/master/libexec/$(RPATH)/
+	cp $(PROG).cf ../../../../../dist/master/conf/service/
 ###########################################################