Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into dev/liuh/profile-provider
Browse files Browse the repository at this point in the history
  • Loading branch information
liuh-80 committed Sep 28, 2022
2 parents 92acd07 + 0657723 commit 9b60524
Show file tree
Hide file tree
Showing 14 changed files with 1,063 additions and 2 deletions.
3 changes: 2 additions & 1 deletion common/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ libswsscommon_la_SOURCES = \
configdb.cpp \
dbconnector.cpp \
dbinterface.cpp \
defaultvalueprovider.cpp \
sonicv2connector.cpp \
table.cpp \
json.cpp \
Expand Down Expand Up @@ -75,7 +76,7 @@ libswsscommon_la_SOURCES = \

libswsscommon_la_CXXFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(LIBNL_CFLAGS) $(CODE_COVERAGE_CXXFLAGS)
libswsscommon_la_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(LIBNL_CPPFLAGS) $(CODE_COVERAGE_CPPFLAGS)
libswsscommon_la_LIBADD = -lpthread $(LIBNL_LIBS) $(CODE_COVERAGE_LIBS) -lzmq -lboost_serialization -luuid
libswsscommon_la_LIBADD = -lpthread $(LIBNL_LIBS) $(CODE_COVERAGE_LIBS) -lzmq -lboost_serialization -luuid -lyang

swssloglevel_SOURCES = loglevel.cpp

Expand Down
Loading

0 comments on commit 9b60524

Please sign in to comment.