X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=Makefile.am;h=9537ab85f9be0c40b2c810b6a2e73db74a94eb0b;hb=cc9244cd1baddc6f3ef96bbec5662239afc9f3c2;hp=c740aca6443d5e0ed1a1df66cf74c7ab950d7a5e;hpb=ef2bf51d04aaf01fa0cabdcaf905b23423067662;p=ric-plt%2Fsdl.git diff --git a/Makefile.am b/Makefile.am index c740aca..9537ab8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,6 +35,7 @@ libsdl_la_SOURCES = \ include/private/namespaceconfigurations.hpp \ include/private/namespaceconfigurationsimpl.hpp \ include/private/namespacevalidator.hpp \ + include/private/stdstreamlogger.hpp \ include/private/syncstorageimpl.hpp \ include/private/system.hpp \ include/private/timer.hpp \ @@ -67,6 +68,7 @@ libsdl_la_SOURCES = \ src/publisherid.cpp \ src/rejectedbybackend.cpp \ src/rejectedbysdl.cpp \ + src/stdstreamlogger.cpp \ src/syncstorage.cpp \ src/syncstorageimpl.cpp \ src/system.cpp \ @@ -85,6 +87,7 @@ libsdl_la_SOURCES += \ include/private/redis/asyncdatabasediscovery.hpp \ include/private/redis/asyncredisreply.hpp \ include/private/redis/asyncredisstorage.hpp \ + include/private/redis/asyncsentineldatabasediscovery.hpp \ include/private/redis/contents.hpp \ include/private/redis/contentsbuilder.hpp \ include/private/redis/databaseinfo.hpp \ @@ -93,6 +96,7 @@ libsdl_la_SOURCES += \ src/redis/asyncdatabasediscovery.cpp \ src/redis/asyncredisreply.cpp \ src/redis/asyncredisstorage.cpp \ + src/redis/asyncsentineldatabasediscovery.cpp \ src/redis/contentsbuilder.cpp endif if HIREDIS @@ -144,19 +148,15 @@ libshareddatalayercli_la_SOURCES = \ libshareddatalayercli_la_CPPFLAGS = \ $(BASE_CPPFLAGS) \ - $(PTHREAD_CFLAGS) \ $(BOOST_CPPFLAGS) libshareddatalayercli_la_LDFLAGS = \ $(BOOST_LDFLAGS) \ - $(PTHREAD_CFLAGS) \ -release $(PACKAGE_VERSION) libshareddatalayercli_la_LIBADD = \ $(BOOST_FILESYSTEM_LIB) \ $(BOOST_PROGRAM_OPTIONS_LIB) \ $(BOOST_SYSTEM_LIB) \ - $(PTHREAD_LIBS) \ -lboost_system \ - -lpthread \ libsdl.la pkgincludedir = \ @@ -199,15 +199,12 @@ sdltool_SOURCES = \ src/cli/main.cpp sdltool_CPPFLAGS = \ $(BASE_CPPFLAGS) \ - $(PTHREAD_CFLAGS) \ $(BOOST_CPPFLAGS) sdltool_LDFLAGS = \ - $(PTHREAD_CFLAGS) \ $(BOOST_LDFLAGS) sdltool_LDADD = \ $(BOOST_PROGRAM_OPTIONS_LIB) \ libsdl.la \ - $(PTHREAD_LIBS) \ -lboost_system \ libshareddatalayercli.la @@ -241,14 +238,11 @@ libgmock_la_SOURCES = \ 3rdparty/googletest/googlemock/include/gmock/internal/custom/gmock-port.h libgmock_la_CPPFLAGS = \ - $(PTHREAD_CFLAGS) \ -I$(top_srcdir)/3rdparty/googletest/googlemock/include/ \ -I$(top_srcdir)/3rdparty/googletest/googlemock/ \ -I$(top_srcdir)/3rdparty/googletest/googletest/include/ -libgmock_la_LDFLAGS = \ - $(PTHREAD_CFLAGS) libgmock_la_LIBADD = \ - $(PTHREAD_LIBS) + -lpthread libgtest_la_SOURCES = \ 3rdparty/googletest/googletest/src/gtest-all.cc \ @@ -288,13 +282,10 @@ libgtest_la_SOURCES = \ 3rdparty/googletest/googletest/include/gtest/internal/custom/gtest-printers.h libgtest_la_CPPFLAGS = \ - $(PTHREAD_CFLAGS) \ -I$(top_srcdir)/3rdparty/googletest/googletest/include/ \ -I$(top_srcdir)/3rdparty/googletest/googletest/ -libgtest_la_LDFLAGS = \ - $(PTHREAD_CFLAGS) libgtest_la_LIBADD = \ - $(PTHREAD_LIBS) + -lpthread check_PROGRAMS = \ testrunner @@ -345,6 +336,7 @@ testrunner_SOURCES += \ tst/asynccommanddispatcher_test.cpp \ tst/asyncdatabasediscovery_test.cpp \ tst/asyncredisstorage_test.cpp \ + tst/asyncsentineldatabasediscovery_test.cpp \ tst/asyncstorageimpl_test.cpp \ tst/contents_test.cpp \ tst/contentsbuilder_test.cpp \