working commit
This commit is contained in:
+26
-9
@@ -89,8 +89,9 @@ NORMAL_UNINSTALL = :
|
||||
PRE_UNINSTALL = :
|
||||
POST_UNINSTALL = :
|
||||
sbin_PROGRAMS = helmetd$(EXEEXT)
|
||||
noinst_PROGRAMS = udpclient_test$(EXEEXT) service_test$(EXEEXT) \
|
||||
tunclient_test$(EXEEXT) message_test$(EXEEXT)
|
||||
noinst_PROGRAMS = tcpclient_test$(EXEEXT) udpclient_test$(EXEEXT) \
|
||||
service_test$(EXEEXT) tunclient_test$(EXEEXT) \
|
||||
message_test$(EXEEXT)
|
||||
subdir = .
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
|
||||
@@ -108,7 +109,8 @@ am__installdirs = "$(DESTDIR)$(sbindir)"
|
||||
PROGRAMS = $(noinst_PROGRAMS) $(sbin_PROGRAMS)
|
||||
am_helmetd_OBJECTS = helmetd.$(OBJEXT) tunclient.$(OBJEXT) \
|
||||
service.$(OBJEXT) interface.$(OBJEXT) hello.pb.$(OBJEXT) \
|
||||
udpclient.$(OBJEXT) resolver.$(OBJEXT) iprouter.$(OBJEXT)
|
||||
udpclient.$(OBJEXT) resolver.$(OBJEXT) iprouter.$(OBJEXT) \
|
||||
tcpclient.$(OBJEXT) rpcclient.$(OBJEXT)
|
||||
helmetd_OBJECTS = $(am_helmetd_OBJECTS)
|
||||
helmetd_LDADD = $(LDADD)
|
||||
am_message_test_OBJECTS = message_test.$(OBJEXT) hello.pb.$(OBJEXT)
|
||||
@@ -118,6 +120,10 @@ am_service_test_OBJECTS = service_test.$(OBJEXT) tunclient.$(OBJEXT) \
|
||||
service.$(OBJEXT) interface.$(OBJEXT)
|
||||
service_test_OBJECTS = $(am_service_test_OBJECTS)
|
||||
service_test_LDADD = $(LDADD)
|
||||
am_tcpclient_test_OBJECTS = resolver.$(OBJEXT) tcpclient.$(OBJEXT) \
|
||||
tcpclient_test.$(OBJEXT)
|
||||
tcpclient_test_OBJECTS = $(am_tcpclient_test_OBJECTS)
|
||||
tcpclient_test_LDADD = $(LDADD)
|
||||
am_tunclient_test_OBJECTS = tunclient_test.$(OBJEXT) \
|
||||
tunclient.$(OBJEXT) service.$(OBJEXT) interface.$(OBJEXT)
|
||||
tunclient_test_OBJECTS = $(am_tunclient_test_OBJECTS)
|
||||
@@ -167,11 +173,11 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
|
||||
am__v_CCLD_0 = @echo " CCLD " $@;
|
||||
am__v_CCLD_1 =
|
||||
SOURCES = $(helmetd_SOURCES) $(message_test_SOURCES) \
|
||||
$(service_test_SOURCES) $(tunclient_test_SOURCES) \
|
||||
$(udpclient_test_SOURCES)
|
||||
$(service_test_SOURCES) $(tcpclient_test_SOURCES) \
|
||||
$(tunclient_test_SOURCES) $(udpclient_test_SOURCES)
|
||||
DIST_SOURCES = $(helmetd_SOURCES) $(message_test_SOURCES) \
|
||||
$(service_test_SOURCES) $(tunclient_test_SOURCES) \
|
||||
$(udpclient_test_SOURCES)
|
||||
$(service_test_SOURCES) $(tcpclient_test_SOURCES) \
|
||||
$(tunclient_test_SOURCES) $(udpclient_test_SOURCES)
|
||||
am__can_run_installinfo = \
|
||||
case $$AM_UPDATE_INFO_DIR in \
|
||||
n|no|NO) false;; \
|
||||
@@ -251,7 +257,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
||||
LDFLAGS = -pthread
|
||||
LIBOBJS = @LIBOBJS@
|
||||
LIBS = -Wl,--as-need -lprotobuf-lite
|
||||
LIBS = -Wl,--as-need -lprotobuf
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MKDIR_P = @MKDIR_P@
|
||||
@@ -324,7 +330,9 @@ helmetd_SOURCES = helmetd.cpp \
|
||||
hello.pb.cc hello.pb.h \
|
||||
udpclient.cpp udpclient.hpp \
|
||||
resolver.cpp resolver.hpp \
|
||||
iprouter.cpp iprouter.hpp
|
||||
iprouter.cpp iprouter.hpp \
|
||||
tcpclient.cpp tcpclient.hpp \
|
||||
rpcclient.cpp rpcclient.hpp
|
||||
|
||||
tunclient_test_SOURCES = tunclient_test.cpp \
|
||||
tunclient.cpp tunclient.hpp \
|
||||
@@ -341,6 +349,11 @@ udpclient_test_SOURCES = \
|
||||
udpclient.cpp udpclient.hpp \
|
||||
udpclient_test.cpp
|
||||
|
||||
tcpclient_test_SOURCES = \
|
||||
resolver.cpp resolver.hpp \
|
||||
tcpclient.cpp tcpclient.hpp \
|
||||
tcpclient_test.cpp
|
||||
|
||||
message_test_SOURCES = message_test.cpp \
|
||||
hello.pb.cc hello.pb.h
|
||||
|
||||
@@ -456,6 +469,10 @@ service_test$(EXEEXT): $(service_test_OBJECTS) $(service_test_DEPENDENCIES) $(EX
|
||||
@rm -f service_test$(EXEEXT)
|
||||
$(AM_V_CXXLD)$(CXXLINK) $(service_test_OBJECTS) $(service_test_LDADD) $(LIBS)
|
||||
|
||||
tcpclient_test$(EXEEXT): $(tcpclient_test_OBJECTS) $(tcpclient_test_DEPENDENCIES) $(EXTRA_tcpclient_test_DEPENDENCIES)
|
||||
@rm -f tcpclient_test$(EXEEXT)
|
||||
$(AM_V_CXXLD)$(CXXLINK) $(tcpclient_test_OBJECTS) $(tcpclient_test_LDADD) $(LIBS)
|
||||
|
||||
tunclient_test$(EXEEXT): $(tunclient_test_OBJECTS) $(tunclient_test_DEPENDENCIES) $(EXTRA_tunclient_test_DEPENDENCIES)
|
||||
@rm -f tunclient_test$(EXEEXT)
|
||||
$(AM_V_CXXLD)$(CXXLINK) $(tunclient_test_OBJECTS) $(tunclient_test_LDADD) $(LIBS)
|
||||
|
||||
Reference in New Issue
Block a user