diff --git a/Makefile b/Makefile index 083d35c..84398ba 100644 --- a/Makefile +++ b/Makefile @@ -88,7 +88,7 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -sbin_PROGRAMS = helmetd$(EXEEXT) +sbin_PROGRAMS = helmetd$(EXEEXT) helmetcli$(EXEEXT) noinst_PROGRAMS = tcpclient_test$(EXEEXT) udpclient_test$(EXEEXT) \ service_test$(EXEEXT) tunclient_test$(EXEEXT) \ rpcclient_test$(EXEEXT) testconnect_test$(EXEEXT) @@ -107,11 +107,15 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(sbindir)" PROGRAMS = $(noinst_PROGRAMS) $(sbin_PROGRAMS) -am_helmetd_OBJECTS = helmetd.$(OBJEXT) interface.$(OBJEXT) \ - iprouter.$(OBJEXT) netclient.$(OBJEXT) resolver.$(OBJEXT) \ - rpcclient.$(OBJEXT) rpcheader.$(OBJEXT) service.$(OBJEXT) \ - tcpclient.$(OBJEXT) tunclient.$(OBJEXT) udpclient.$(OBJEXT) \ - control.pb.$(OBJEXT) logger.$(OBJEXT) +helmetcli_SOURCES = helmetcli.c +helmetcli_OBJECTS = helmetcli.$(OBJEXT) +helmetcli_LDADD = $(LDADD) +am__objects_1 = interface.$(OBJEXT) iprouter.$(OBJEXT) \ + netclient.$(OBJEXT) resolver.$(OBJEXT) rpcclient.$(OBJEXT) \ + rpcheader.$(OBJEXT) service.$(OBJEXT) tcpclient.$(OBJEXT) \ + tunclient.$(OBJEXT) udpclient.$(OBJEXT) control.pb.$(OBJEXT) \ + logger.$(OBJEXT) +am_helmetd_OBJECTS = helmetd.$(OBJEXT) $(am__objects_1) helmetd_OBJECTS = $(am_helmetd_OBJECTS) helmetd_LDADD = $(LDADD) am_rpcclient_test_OBJECTS = rpcclient_test.$(OBJEXT) \ @@ -158,6 +162,18 @@ am__v_at_1 = DEFAULT_INCLUDES = -I. depcomp = am__maybe_remake_depfiles = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +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 = CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) AM_V_CXX = $(am__v_CXX_$(V)) @@ -171,26 +187,14 @@ AM_V_CXXLD = $(am__v_CXXLD_$(V)) am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY)) am__v_CXXLD_0 = @echo " CXXLD " $@; am__v_CXXLD_1 = -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -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) $(rpcclient_test_SOURCES) \ - $(service_test_SOURCES) $(tcpclient_test_SOURCES) \ - $(testconnect_test_SOURCES) $(tunclient_test_SOURCES) \ - $(udpclient_test_SOURCES) -DIST_SOURCES = $(helmetd_SOURCES) $(rpcclient_test_SOURCES) \ +SOURCES = helmetcli.c $(helmetd_SOURCES) $(rpcclient_test_SOURCES) \ $(service_test_SOURCES) $(tcpclient_test_SOURCES) \ $(testconnect_test_SOURCES) $(tunclient_test_SOURCES) \ $(udpclient_test_SOURCES) +DIST_SOURCES = helmetcli.c $(helmetd_SOURCES) \ + $(rpcclient_test_SOURCES) $(service_test_SOURCES) \ + $(tcpclient_test_SOURCES) $(testconnect_test_SOURCES) \ + $(tunclient_test_SOURCES) $(udpclient_test_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -336,7 +340,9 @@ top_build_prefix = top_builddir = . top_srcdir = . AUTOMAKE_OPTIONS = foreign no-dependencies no-installinfo subdir-objects -helmetd_SOURCES = helmetd.cpp \ +helmetxli_SOURCES = helmetcli.cpp $(helmet_SOURCES) +helmetd_SOURCES = helmetd.cpp $(helmet_SOURCES) +helmet_SOURCES = \ interface.cpp interface.hpp \ iprouter.cpp iprouter.hpp \ netclient.cpp netclient.hpp \ @@ -397,7 +403,7 @@ all: defines.h $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: -.SUFFIXES: .cc .cpp .o .obj +.SUFFIXES: .c .cc .cpp .o .obj am--refresh: Makefile @: $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @@ -492,6 +498,10 @@ uninstall-sbinPROGRAMS: clean-sbinPROGRAMS: -$(am__rm_f) $(sbin_PROGRAMS) +helmetcli$(EXEEXT): $(helmetcli_OBJECTS) $(helmetcli_DEPENDENCIES) $(EXTRA_helmetcli_DEPENDENCIES) + @rm -f helmetcli$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(helmetcli_OBJECTS) $(helmetcli_LDADD) $(LIBS) + helmetd$(EXEEXT): $(helmetd_OBJECTS) $(helmetd_DEPENDENCIES) $(EXTRA_helmetd_DEPENDENCIES) @rm -f helmetd$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(helmetd_OBJECTS) $(helmetd_LDADD) $(LIBS) @@ -526,6 +536,12 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c +.c.o: + $(AM_V_CC)$(COMPILE) -c -o $@ $< + +.c.obj: + $(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + .cc.o: $(AM_V_CXX)$(CXXCOMPILE) -c -o $@ $< diff --git a/Makefile.am b/Makefile.am index 468c325..a0a7ef6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,9 +5,12 @@ CXXFLAGS = -std=c++23 -Wall -I. -pthread -D_GNU_SOURCE=1 LDFLAGS = -pthread LIBS = -Wl,--as-need -lprotobuf -sbin_PROGRAMS = helmetd +sbin_PROGRAMS = helmetd helmetcli -helmetd_SOURCES = helmetd.cpp \ +helmetxli_SOURCES = helmetcli.cpp $(helmet_SOURCES) +helmetd_SOURCES = helmetd.cpp $(helmet_SOURCES) + +helmet_SOURCES = \ interface.cpp interface.hpp \ iprouter.cpp iprouter.hpp \ netclient.cpp netclient.hpp \ diff --git a/Makefile.in b/Makefile.in index 9f4cdb6..ce80f44 100644 --- a/Makefile.in +++ b/Makefile.in @@ -88,7 +88,7 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -sbin_PROGRAMS = helmetd$(EXEEXT) +sbin_PROGRAMS = helmetd$(EXEEXT) helmetcli$(EXEEXT) noinst_PROGRAMS = tcpclient_test$(EXEEXT) udpclient_test$(EXEEXT) \ service_test$(EXEEXT) tunclient_test$(EXEEXT) \ rpcclient_test$(EXEEXT) testconnect_test$(EXEEXT) @@ -107,11 +107,15 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(sbindir)" PROGRAMS = $(noinst_PROGRAMS) $(sbin_PROGRAMS) -am_helmetd_OBJECTS = helmetd.$(OBJEXT) interface.$(OBJEXT) \ - iprouter.$(OBJEXT) netclient.$(OBJEXT) resolver.$(OBJEXT) \ - rpcclient.$(OBJEXT) rpcheader.$(OBJEXT) service.$(OBJEXT) \ - tcpclient.$(OBJEXT) tunclient.$(OBJEXT) udpclient.$(OBJEXT) \ - control.pb.$(OBJEXT) logger.$(OBJEXT) +helmetcli_SOURCES = helmetcli.c +helmetcli_OBJECTS = helmetcli.$(OBJEXT) +helmetcli_LDADD = $(LDADD) +am__objects_1 = interface.$(OBJEXT) iprouter.$(OBJEXT) \ + netclient.$(OBJEXT) resolver.$(OBJEXT) rpcclient.$(OBJEXT) \ + rpcheader.$(OBJEXT) service.$(OBJEXT) tcpclient.$(OBJEXT) \ + tunclient.$(OBJEXT) udpclient.$(OBJEXT) control.pb.$(OBJEXT) \ + logger.$(OBJEXT) +am_helmetd_OBJECTS = helmetd.$(OBJEXT) $(am__objects_1) helmetd_OBJECTS = $(am_helmetd_OBJECTS) helmetd_LDADD = $(LDADD) am_rpcclient_test_OBJECTS = rpcclient_test.$(OBJEXT) \ @@ -158,6 +162,18 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = am__maybe_remake_depfiles = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +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 = CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) AM_V_CXX = $(am__v_CXX_@AM_V@) @@ -171,26 +187,14 @@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) am__v_CXXLD_0 = @echo " CXXLD " $@; am__v_CXXLD_1 = -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -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) $(rpcclient_test_SOURCES) \ - $(service_test_SOURCES) $(tcpclient_test_SOURCES) \ - $(testconnect_test_SOURCES) $(tunclient_test_SOURCES) \ - $(udpclient_test_SOURCES) -DIST_SOURCES = $(helmetd_SOURCES) $(rpcclient_test_SOURCES) \ +SOURCES = helmetcli.c $(helmetd_SOURCES) $(rpcclient_test_SOURCES) \ $(service_test_SOURCES) $(tcpclient_test_SOURCES) \ $(testconnect_test_SOURCES) $(tunclient_test_SOURCES) \ $(udpclient_test_SOURCES) +DIST_SOURCES = helmetcli.c $(helmetd_SOURCES) \ + $(rpcclient_test_SOURCES) $(service_test_SOURCES) \ + $(tcpclient_test_SOURCES) $(testconnect_test_SOURCES) \ + $(tunclient_test_SOURCES) $(udpclient_test_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -336,7 +340,9 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies no-installinfo subdir-objects -helmetd_SOURCES = helmetd.cpp \ +helmetxli_SOURCES = helmetcli.cpp $(helmet_SOURCES) +helmetd_SOURCES = helmetd.cpp $(helmet_SOURCES) +helmet_SOURCES = \ interface.cpp interface.hpp \ iprouter.cpp iprouter.hpp \ netclient.cpp netclient.hpp \ @@ -397,7 +403,7 @@ all: defines.h $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: -.SUFFIXES: .cc .cpp .o .obj +.SUFFIXES: .c .cc .cpp .o .obj am--refresh: Makefile @: $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @@ -492,6 +498,10 @@ uninstall-sbinPROGRAMS: clean-sbinPROGRAMS: -$(am__rm_f) $(sbin_PROGRAMS) +helmetcli$(EXEEXT): $(helmetcli_OBJECTS) $(helmetcli_DEPENDENCIES) $(EXTRA_helmetcli_DEPENDENCIES) + @rm -f helmetcli$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(helmetcli_OBJECTS) $(helmetcli_LDADD) $(LIBS) + helmetd$(EXEEXT): $(helmetd_OBJECTS) $(helmetd_DEPENDENCIES) $(EXTRA_helmetd_DEPENDENCIES) @rm -f helmetd$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(helmetd_OBJECTS) $(helmetd_LDADD) $(LIBS) @@ -526,6 +536,12 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c +.c.o: + $(AM_V_CC)$(COMPILE) -c -o $@ $< + +.c.obj: + $(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + .cc.o: $(AM_V_CXX)$(CXXCOMPILE) -c -o $@ $<