working commit

Makefile.in

@@ -90,7 +90,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 sbin_PROGRAMS = helmetd$(EXEEXT)
 noinst_PROGRAMS = udpclient_test$(EXEEXT) service_test$(EXEEXT) \
-	tunclient_test$(EXEEXT)
+	tunclient_test$(EXEEXT) message_test$(EXEEXT)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -111,6 +111,9 @@ am_helmetd_OBJECTS = helmetd.$(OBJEXT) tunclient.$(OBJEXT) \
 	udpclient.$(OBJEXT) resolver.$(OBJEXT) iprouter.$(OBJEXT)
 helmetd_OBJECTS = $(am_helmetd_OBJECTS)
 helmetd_LDADD = $(LDADD)
+am_message_test_OBJECTS = message_test.$(OBJEXT) hello.pb.$(OBJEXT)
+message_test_OBJECTS = $(am_message_test_OBJECTS)
+message_test_LDADD = $(LDADD)
 am_service_test_OBJECTS = service_test.$(OBJEXT) tunclient.$(OBJEXT) \
 	service.$(OBJEXT) interface.$(OBJEXT)
 service_test_OBJECTS = $(am_service_test_OBJECTS)
@@ -163,10 +166,12 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = $(helmetd_SOURCES) $(service_test_SOURCES) \
-	$(tunclient_test_SOURCES) $(udpclient_test_SOURCES)
-DIST_SOURCES = $(helmetd_SOURCES) $(service_test_SOURCES) \
-	$(tunclient_test_SOURCES) $(udpclient_test_SOURCES)
+SOURCES = $(helmetd_SOURCES) $(message_test_SOURCES) \
+	$(service_test_SOURCES) $(tunclient_test_SOURCES) \
+	$(udpclient_test_SOURCES)
+DIST_SOURCES = $(helmetd_SOURCES) $(message_test_SOURCES) \
+	$(service_test_SOURCES) $(tunclient_test_SOURCES) \
+	$(udpclient_test_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -336,6 +341,9 @@ udpclient_test_SOURCES = \
 	udpclient.cpp udpclient.hpp \
 	udpclient_test.cpp
 
+message_test_SOURCES = message_test.cpp \
+	hello.pb.cc hello.pb.h
+
 ASTYLE_OPTS = --indent=spaces=8 --style=java
 all: defines.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -440,6 +448,10 @@ helmetd$(EXEEXT): $(helmetd_OBJECTS) $(helmetd_DEPENDENCIES) $(EXTRA_helmetd_DEP
 	@rm -f helmetd$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(helmetd_OBJECTS) $(helmetd_LDADD) $(LIBS)
 
+message_test$(EXEEXT): $(message_test_OBJECTS) $(message_test_DEPENDENCIES) $(EXTRA_message_test_DEPENDENCIES) 
+	@rm -f message_test$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(message_test_OBJECTS) $(message_test_LDADD) $(LIBS)
+
 service_test$(EXEEXT): $(service_test_OBJECTS) $(service_test_DEPENDENCIES) $(EXTRA_service_test_DEPENDENCIES) 
 	@rm -f service_test$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(service_test_OBJECTS) $(service_test_LDADD) $(LIBS)
@@ -830,12 +842,15 @@ uninstall-am: uninstall-sbinPROGRAMS
 .PRECIOUS: Makefile
 
 
-test: tunclient_test
-	./tunclient_test
+test: message_test
+	./message_test
 
 run: helmetd
 	./helmetd
 
+proto:
+	$(PROTOC) --cpp_out=. hello.proto
+
 hello.pb.cc hello.pb.h: hello.proto
 	$(PROTOC) --cpp_out=. hello.proto
 format: