working commit

Makefile

@@ -88,7 +88,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-sbin_PROGRAMS = helmetd$(EXEEXT)
+sbin_PROGRAMS = helmetsrv$(EXEEXT) helmetcli$(EXEEXT)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -104,11 +104,16 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(sbindir)"
 PROGRAMS = $(sbin_PROGRAMS)
-am__objects_1 = uxlogger.$(OBJEXT) tservice.$(OBJEXT) \
-	sockhand.$(OBJEXT) msgheader.$(OBJEXT)
-am_helmetd_OBJECTS = helmetd.$(OBJEXT) $(am__objects_1)
-helmetd_OBJECTS = $(am_helmetd_OBJECTS)
-helmetd_LDADD = $(LDADD)
+am__objects_1 = uxlogger.$(OBJEXT) msgheader.$(OBJEXT) \
+	interface.$(OBJEXT) uxcontrol.pb.$(OBJEXT)
+am_helmetcli_OBJECTS = helmetcli.$(OBJEXT) uxclient.$(OBJEXT) \
+	$(am__objects_1)
+helmetcli_OBJECTS = $(am_helmetcli_OBJECTS)
+helmetcli_LDADD = $(LDADD)
+am_helmetsrv_OBJECTS = helmetsrv.$(OBJEXT) tservice.$(OBJEXT) \
+	sockhand.$(OBJEXT) $(am__objects_1)
+helmetsrv_OBJECTS = $(am_helmetsrv_OBJECTS)
+helmetsrv_LDADD = $(LDADD)
 AM_V_P = $(am__v_P_$(V))
 am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY))
 am__v_P_0 = false
@@ -149,8 +154,8 @@ AM_V_CCLD = $(am__v_CCLD_$(V))
 am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = $(helmetd_SOURCES)
-DIST_SOURCES = $(helmetd_SOURCES)
+SOURCES = $(helmetcli_SOURCES) $(helmetsrv_SOURCES)
+DIST_SOURCES = $(helmetcli_SOURCES) $(helmetsrv_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -198,13 +203,13 @@ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
 distcleancheck_listfiles = \
   find . \( -type f -a \! \
             \( -name .nfs* -o -name .smb* -o -name .__afs* \) \) -print
-ACLOCAL = ${SHELL} '/home/ziggi/projects/stmsg/missing' aclocal-1.17
+ACLOCAL = ${SHELL} '/home/ziggi/Projects/stvpn/missing' aclocal-1.17
 AMTAR = $${TAR-tar}
 AM_DEFAULT_VERBOSITY = 1
 ASTYLE = /bin/astyle
-AUTOCONF = ${SHELL} '/home/ziggi/projects/stmsg/missing' autoconf
-AUTOHEADER = ${SHELL} '/home/ziggi/projects/stmsg/missing' autoheader
-AUTOMAKE = ${SHELL} '/home/ziggi/projects/stmsg/missing' automake-1.17
+AUTOCONF = ${SHELL} '/home/ziggi/Projects/stvpn/missing' autoconf
+AUTOHEADER = ${SHELL} '/home/ziggi/Projects/stvpn/missing' autoheader
+AUTOMAKE = ${SHELL} '/home/ziggi/Projects/stvpn/missing' automake-1.17
 AWK = mawk
 CC = gcc
 CCDEPMODE = depmode=none
@@ -232,7 +237,7 @@ LDFLAGS = -pthread
 LIBOBJS = 
 LIBS = -Wl,--as-need -lprotobuf
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} '/home/ziggi/projects/stmsg/missing' makeinfo
+MAKEINFO = ${SHELL} '/home/ziggi/Projects/stvpn/missing' makeinfo
 MKDIR_P = /bin/mkdir -p
 OBJEXT = o
 PACKAGE = helmet
@@ -249,10 +254,10 @@ SET_MAKE =
 SHELL = /bin/bash
 STRIP = 
 VERSION = 0.0.1
-abs_builddir = /home/ziggi/projects/stmsg
-abs_srcdir = /home/ziggi/projects/stmsg
-abs_top_builddir = /home/ziggi/projects/stmsg
-abs_top_srcdir = /home/ziggi/projects/stmsg
+abs_builddir = /home/ziggi/Projects/stvpn
+abs_srcdir = /home/ziggi/Projects/stvpn
+abs_top_builddir = /home/ziggi/Projects/stvpn
+abs_top_srcdir = /home/ziggi/Projects/stvpn
 ac_ct_CC = gcc
 ac_ct_CXX = g++
 am__include = include
@@ -274,7 +279,7 @@ host_alias =
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = ${SHELL} /home/ziggi/projects/stmsg/install-sh
+install_sh = ${SHELL} /home/ziggi/Projects/stvpn/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
@@ -296,19 +301,27 @@ top_build_prefix =
 top_builddir = .
 top_srcdir = .
 AUTOMAKE_OPTIONS = foreign no-dependencies no-installinfo subdir-objects
-helmetd_SOURCES = helmetd.cpp $(helmet_SOURCES)
-helmet_SOURCES = \
-	uxlogger.cpp uxlogger.hpp \
+helmetsrv_SOURCES = helmetsrv.cpp \
 	tservice.cpp tservice.hpp \
 	sockhand.cpp dockhand.hpp \
-	msgheader.cpp msgheader.hpp
+	$(helmet_SOURCES)
+
+helmetcli_SOURCES = helmetcli.cpp \
+	uxclient.cpp uxclient.hpp \
+	$(helmet_SOURCES)
+
+helmet_SOURCES = \
+	uxlogger.cpp uxlogger.hpp \
+	msgheader.cpp msgheader.hpp \
+	interface.cpp interface.hpp \
+	uxcontrol.pb.cc uxcontrol.pb.h
 
 ASTYLE_OPTS = --indent=spaces=8 --style=java
 all: defines.hpp
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
-.SUFFIXES: .cpp .o .obj
+.SUFFIXES: .cc .cpp .o .obj
 am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -400,9 +413,13 @@ uninstall-sbinPROGRAMS:
 clean-sbinPROGRAMS:
 	-$(am__rm_f) $(sbin_PROGRAMS)
 
-helmetd$(EXEEXT): $(helmetd_OBJECTS) $(helmetd_DEPENDENCIES) $(EXTRA_helmetd_DEPENDENCIES) 
-	@rm -f helmetd$(EXEEXT)
-	$(AM_V_CXXLD)$(CXXLINK) $(helmetd_OBJECTS) $(helmetd_LDADD) $(LIBS)
+helmetcli$(EXEEXT): $(helmetcli_OBJECTS) $(helmetcli_DEPENDENCIES) $(EXTRA_helmetcli_DEPENDENCIES) 
+	@rm -f helmetcli$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(helmetcli_OBJECTS) $(helmetcli_LDADD) $(LIBS)
+
+helmetsrv$(EXEEXT): $(helmetsrv_OBJECTS) $(helmetsrv_DEPENDENCIES) $(EXTRA_helmetsrv_DEPENDENCIES) 
+	@rm -f helmetsrv$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(helmetsrv_OBJECTS) $(helmetsrv_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -410,6 +427,12 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+.cc.o:
+	$(AM_V_CXX)$(CXXCOMPILE) -c -o $@ $<
+
+.cc.obj:
+	$(AM_V_CXX)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
 .cpp.o:
 	$(AM_V_CXX)$(CXXCOMPILE) -c -o $@ $<