From 6942de0fd6e9e23077dc85fc52782ff21b85488a Mon Sep 17 00:00:00 2001 From: kcudnik Date: Wed, 11 Aug 2021 18:24:58 +0200 Subject: [PATCH] Propagate inc and src merge --- .gitignore | 4 ++-- Makefile.am | 2 +- configure.ac | 2 -- debian/libsairedis-dev.install | 2 +- debian/libsaivs-dev.install | 2 +- lib/Makefile.am | 2 +- meta/Makefile.am | 8 ++++---- meta/MetaTestSaiInterface.h | 2 +- meta/NumberOidIndexGenerator.h | 2 +- pyext/py2/Makefile.am | 4 ++-- pyext/py3/Makefile.am | 4 ++-- pyext/pysairedis.cpp | 2 +- saiasiccmp/Makefile.am | 4 ++-- saidiscovery/Makefile.am | 4 ++-- saidump/Makefile.am | 4 ++-- saiplayer/Makefile.am | 4 ++-- saiplayer/saiplayer_main.cpp | 2 +- saisdkdump/Makefile.am | 2 +- syncd/Makefile.am | 10 +++++----- syncd/Syncd.cpp | 2 +- syncd/VidManager.cpp | 2 +- syncd/tests.cpp | 2 +- tests/Makefile.am | 10 +++++----- tests/findcrossinclude.sh | 20 ++++++++++---------- tests/tests.cpp | 2 +- vslib/Makefile.am | 2 +- 26 files changed, 52 insertions(+), 54 deletions(-) diff --git a/.gitignore b/.gitignore index f4bb772ae4a4..377e3407dfd0 100644 --- a/.gitignore +++ b/.gitignore @@ -76,7 +76,6 @@ tests/swsslogentercheck.sh.trs tests/test-suite.log vslib/src/test-suite.log -vslib/src/tests vslib/src/tests.log vslib/src/tests.trs @@ -86,7 +85,8 @@ deps/ # Executables # ############### -lib/src/tests +lib/tests +vslib/tests meta/tests saidiscovery/saidiscovery saidump/saidump diff --git a/Makefile.am b/Makefile.am index 3d41406e4c83..4bacfaf1cb1d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = meta lib vslib pyext +SUBDIRS = meta lib vslib if SYNCD SUBDIRS += syncd saiplayer saidump saidiscovery saisdkdump saiasiccmp tests diff --git a/configure.ac b/configure.ac index db2f555cd345..f7e06275a58d 100644 --- a/configure.ac +++ b/configure.ac @@ -166,9 +166,7 @@ AC_SUBST(SAIINC, "-I\$(top_srcdir)/SAI/inc -I\$(top_srcdir)/SAI/experimental -I\ AC_OUTPUT(Makefile meta/Makefile lib/Makefile - lib/src/Makefile vslib/Makefile - vslib/src/Makefile syncd/Makefile saiplayer/Makefile saidump/Makefile diff --git a/debian/libsairedis-dev.install b/debian/libsairedis-dev.install index 431836f9a828..21fa7340a137 100644 --- a/debian/libsairedis-dev.install +++ b/debian/libsairedis-dev.install @@ -1 +1 @@ -lib/inc/sairedis.h usr/include/sai +lib/sairedis.h usr/include/sai diff --git a/debian/libsaivs-dev.install b/debian/libsaivs-dev.install index a3c2d3104c7c..af4f2674ca19 100644 --- a/debian/libsaivs-dev.install +++ b/debian/libsaivs-dev.install @@ -1,3 +1,3 @@ SAI/inc/sai*.h usr/include/sai/ SAI/experimental/sai*.h usr/include/sai/ -vslib/inc/saivs.h +vslib/saivs.h diff --git a/lib/Makefile.am b/lib/Makefile.am index 3c244b08979c..0646e12977aa 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,4 +1,4 @@ -AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib/inc +AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib lib_LTLIBRARIES = libsairedis.la diff --git a/meta/Makefile.am b/meta/Makefile.am index 8009d31dc6de..58039c758ad5 100644 --- a/meta/Makefile.am +++ b/meta/Makefile.am @@ -1,5 +1,5 @@ AM_CFLAGS = $(SAIINC) -AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib/inc +AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib lib_LTLIBRARIES = libsaimetadata.la libsaimeta.la @@ -57,9 +57,9 @@ tests_SOURCES = \ DummySaiInterface.cpp \ MetaTestSaiInterface.cpp \ NumberOidIndexGenerator.cpp \ - ../lib/src/VirtualObjectIdManager.cpp \ - ../lib/src/SwitchConfig.cpp \ - ../lib/src/SwitchConfigContainer.cpp + ../lib/VirtualObjectIdManager.cpp \ + ../lib/SwitchConfig.cpp \ + ../lib/SwitchConfigContainer.cpp tests_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) tests_LDADD = -lhiredis -lswsscommon -lpthread libsaimetadata.la libsaimeta.la -lzmq diff --git a/meta/MetaTestSaiInterface.h b/meta/MetaTestSaiInterface.h index f0709c7066e3..0594bbad62aa 100644 --- a/meta/MetaTestSaiInterface.h +++ b/meta/MetaTestSaiInterface.h @@ -2,7 +2,7 @@ #include "DummySaiInterface.h" -#include "lib/inc/VirtualObjectIdManager.h" +#include "lib/VirtualObjectIdManager.h" #include diff --git a/meta/NumberOidIndexGenerator.h b/meta/NumberOidIndexGenerator.h index d0db8ac3de1c..193c7cf12267 100644 --- a/meta/NumberOidIndexGenerator.h +++ b/meta/NumberOidIndexGenerator.h @@ -1,6 +1,6 @@ #pragma once -#include "lib/inc/OidIndexGenerator.h" +#include "lib/OidIndexGenerator.h" namespace saimeta { diff --git a/pyext/py2/Makefile.am b/pyext/py2/Makefile.am index 37394b79b84b..981971d79bba 100644 --- a/pyext/py2/Makefile.am +++ b/pyext/py2/Makefile.am @@ -4,7 +4,7 @@ SOURCES=../pysairedis.h ../pysairedis.cpp pkgpython_PYTHON = pysairedis.py __init__.py pkgpyexec_LTLIBRARIES = _pysairedis.la -AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib/inc -I.. +AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib -I.. BUILT_SOURCES = pysairedis_wrap.cpp @@ -14,7 +14,7 @@ _pysairedis_la_CXXFLAGS = -I/usr/include/python$(PYTHON_VERSION) $(AM_CXXFLAGS) _pysairedis_la_LDFLAGS = -module \ -lhiredis -lswsscommon -lpthread \ - -L$(top_srcdir)/lib/src/.libs -lsairedis \ + -L$(top_srcdir)/lib/.libs -lsairedis \ -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta \ -lzmq diff --git a/pyext/py3/Makefile.am b/pyext/py3/Makefile.am index 9612703aafde..4d93a416dee4 100644 --- a/pyext/py3/Makefile.am +++ b/pyext/py3/Makefile.am @@ -4,7 +4,7 @@ SOURCES=../pysairedis.h ../pysairedis.cpp pkgpython3_PYTHON = pysairedis.py __init__.py pkgpy3exec_LTLIBRARIES = _pysairedis.la -AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib/inc -I.. +AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib -I.. BUILT_SOURCES = pysairedis_wrap.cpp @@ -14,7 +14,7 @@ _pysairedis_la_CXXFLAGS = -I/usr/include/python$(PYTHON3_VERSION) $(AM_CXXFLAGS) _pysairedis_la_LDFLAGS = -module \ -lhiredis -lswsscommon -lpthread \ - -L$(top_srcdir)/lib/src/.libs -lsairedis \ + -L$(top_srcdir)/lib/.libs -lsairedis \ -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta \ -lzmq diff --git a/pyext/pysairedis.cpp b/pyext/pysairedis.cpp index a4553fe07804..98a1894fb405 100644 --- a/pyext/pysairedis.cpp +++ b/pyext/pysairedis.cpp @@ -1,6 +1,6 @@ #include "pysairedis.h" -#include "lib/inc/sairedis.h" +#include "lib/sairedis.h" #include "swss/logger.h" #include "meta/sai_serialize.h" diff --git a/saiasiccmp/Makefile.am b/saiasiccmp/Makefile.am index 3bfb12c7f2ef..ebf9f41984dc 100644 --- a/saiasiccmp/Makefile.am +++ b/saiasiccmp/Makefile.am @@ -1,4 +1,4 @@ -AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/meta -I$(top_srcdir)/lib/inc -I$(top_srcdir)/syncd +AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/meta -I$(top_srcdir)/lib -I$(top_srcdir)/syncd bin_PROGRAMS = saiasiccmp @@ -20,6 +20,6 @@ saiasiccmp_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) saiasiccmp_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS) saiasiccmp_LDADD = libAsicCmp.a \ -ldl -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq \ - $(top_srcdir)/syncd/libSyncd.a $(top_srcdir)/lib/src/libSaiRedis.a $(CODE_COVERAGE_LIBS) + $(top_srcdir)/syncd/libSyncd.a $(top_srcdir)/lib/libSaiRedis.a $(CODE_COVERAGE_LIBS) TESTS = test.sh diff --git a/saidiscovery/Makefile.am b/saidiscovery/Makefile.am index e49ead8879b7..cfb055bb8e61 100644 --- a/saidiscovery/Makefile.am +++ b/saidiscovery/Makefile.am @@ -1,9 +1,9 @@ -AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/meta -I$(top_srcdir)/lib/inc +AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/meta -I$(top_srcdir)/lib bin_PROGRAMS = saidiscovery if SAIVS -SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs +SAILIB=-L$(top_srcdir)/vslib/.libs -lsaivs else SAILIB=-lsai endif diff --git a/saidump/Makefile.am b/saidump/Makefile.am index ee4246c58822..46c51d0fcc67 100644 --- a/saidump/Makefile.am +++ b/saidump/Makefile.am @@ -1,4 +1,4 @@ -AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib/inc +AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib bin_PROGRAMS = saidump @@ -6,4 +6,4 @@ saidump_SOURCES = saidump.cpp saidump_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) saidump_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS) saidump_LDADD = -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta \ - -L$(top_srcdir)/lib/src/.libs -lsairedis -lzmq $(CODE_COVERAGE_LIBS) + -L$(top_srcdir)/lib/.libs -lsairedis -lzmq $(CODE_COVERAGE_LIBS) diff --git a/saiplayer/Makefile.am b/saiplayer/Makefile.am index 89cb0a711908..e7f2adfd1d0b 100644 --- a/saiplayer/Makefile.am +++ b/saiplayer/Makefile.am @@ -1,4 +1,4 @@ -AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib/inc +AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib bin_PROGRAMS = saiplayer @@ -15,5 +15,5 @@ libSaiPlayer_a_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_C saiplayer_SOURCES = saiplayer_main.cpp saiplayer_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) saiplayer_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS) -saiplayer_LDADD = libSaiPlayer.a $(top_srcdir)/syncd/libSyncd.a $(top_srcdir)/lib/src/libSaiRedis.a \ +saiplayer_LDADD = libSaiPlayer.a $(top_srcdir)/syncd/libSyncd.a $(top_srcdir)/lib/libSaiRedis.a \ -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS) diff --git a/saiplayer/saiplayer_main.cpp b/saiplayer/saiplayer_main.cpp index 06a5edbb846b..b87e1804f7cf 100644 --- a/saiplayer/saiplayer_main.cpp +++ b/saiplayer/saiplayer_main.cpp @@ -1,7 +1,7 @@ #include "SaiPlayer.h" #include "CommandLineOptionsParser.h" -#include "lib/inc/ClientServerSai.h" +#include "lib/ClientServerSai.h" #include "syncd/MetadataLogger.h" #include "swss/logger.h" diff --git a/saisdkdump/Makefile.am b/saisdkdump/Makefile.am index a7173dd9d815..3ad9ed882fef 100644 --- a/saisdkdump/Makefile.am +++ b/saisdkdump/Makefile.am @@ -3,7 +3,7 @@ AM_CXXFLAGS = $(SAIINC) bin_PROGRAMS = saisdkdump if SAIVS -SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs +SAILIB=-L$(top_srcdir)/vslib/.libs -lsaivs else SAILIB=-lsai endif diff --git a/syncd/Makefile.am b/syncd/Makefile.am index 7ae8653dd059..a1944d910065 100644 --- a/syncd/Makefile.am +++ b/syncd/Makefile.am @@ -1,7 +1,7 @@ -AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib/inc -I$(top_srcdir)/vslib/inc +AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib -I$(top_srcdir)/vslib if SAIVS -SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs +SAILIB=-L$(top_srcdir)/vslib/.libs -lsaivs else SAILIB=-lsai endif @@ -58,7 +58,7 @@ libSyncd_a_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVER syncd_SOURCES = main.cpp syncd_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) syncd_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS) -syncd_LDADD = libSyncd.a $(top_srcdir)/lib/src/libSaiRedis.a -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta \ +syncd_LDADD = libSyncd.a $(top_srcdir)/lib/libSaiRedis.a -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta \ -ldl -lhiredis -lswsscommon $(SAILIB) -lpthread -lzmq $(CODE_COVERAGE_LIBS) if SAITHRIFT @@ -83,11 +83,11 @@ libSyncdRequestShutdown_a_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMO syncd_request_shutdown_SOURCES = syncd_request_shutdown.cpp syncd_request_shutdown_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) syncd_request_shutdown_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS) -syncd_request_shutdown_LDADD = libSyncdRequestShutdown.a $(top_srcdir)/lib/src/libSaiRedis.a -lhiredis -lswsscommon -lpthread $(CODE_COVERAGE_LIBS) +syncd_request_shutdown_LDADD = libSyncdRequestShutdown.a $(top_srcdir)/lib/libSaiRedis.a -lhiredis -lswsscommon -lpthread $(CODE_COVERAGE_LIBS) tests_SOURCES = tests.cpp tests_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) -tests_LDADD = libSyncd.a -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/lib/src/.libs -lsairedis \ +tests_LDADD = libSyncd.a -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/lib/.libs -lsairedis \ -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS) TESTS = tests diff --git a/syncd/Syncd.cpp b/syncd/Syncd.cpp index 1645b4d10439..3eebdc8d5231 100644 --- a/syncd/Syncd.cpp +++ b/syncd/Syncd.cpp @@ -25,7 +25,7 @@ #include "meta/RedisSelectableChannel.h" #include "meta/PerformanceIntervalTimer.h" -#include "vslib/inc/saivs.h" +#include "vslib/saivs.h" #include #include diff --git a/syncd/VidManager.cpp b/syncd/VidManager.cpp index 1a21dbc39e39..537e0f91f48b 100644 --- a/syncd/VidManager.cpp +++ b/syncd/VidManager.cpp @@ -1,6 +1,6 @@ #include "VidManager.h" -#include "lib/inc/VirtualObjectIdManager.h" +#include "lib/VirtualObjectIdManager.h" #include "meta/sai_serialize.h" diff --git a/syncd/tests.cpp b/syncd/tests.cpp index 53248b8d1786..324718dc4adf 100644 --- a/syncd/tests.cpp +++ b/syncd/tests.cpp @@ -9,7 +9,7 @@ extern "C" { #include } -#include "lib/inc/Sai.h" +#include "lib/Sai.h" #include "Syncd.h" #include "MetadataLogger.h" #include "sairedis.h" diff --git a/tests/Makefile.am b/tests/Makefile.am index 960770e0797a..a853c53ac5fc 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,13 +1,13 @@ -AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib/inc -I$(top_srcdir)/vslib/inc +AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib -I$(top_srcdir)/vslib bin_PROGRAMS = vssyncd tests testclient -SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs +SAILIB=-L$(top_srcdir)/vslib/.libs -lsaivs vssyncd_SOURCES = main.cpp vssyncd_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) vssyncd_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS) -vssyncd_LDADD = $(top_srcdir)/syncd/libSyncd.a $(top_srcdir)/lib/src/libSaiRedis.a \ +vssyncd_LDADD = $(top_srcdir)/syncd/libSyncd.a $(top_srcdir)/lib/libSaiRedis.a \ -lhiredis -lswsscommon $(SAILIB) -lpthread \ -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -ldl -lzmq $(CODE_COVERAGE_LIBS) @@ -18,13 +18,13 @@ endif tests_SOURCES = tests.cpp tests_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) tests_LDADD = -lhiredis -lswsscommon -lpthread \ - $(top_srcdir)/lib/src/libsairedis.la $(top_srcdir)/syncd/libSyncd.a \ + $(top_srcdir)/lib/libsairedis.la $(top_srcdir)/syncd/libSyncd.a \ -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS) testclient_SOURCES = testclient.cpp testclient_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) testclient_LDADD = -lhiredis -lswsscommon -lpthread \ - $(top_srcdir)/lib/src/libsairedis.la $(top_srcdir)/syncd/libSyncd.a \ + $(top_srcdir)/lib/libsairedis.la $(top_srcdir)/syncd/libSyncd.a \ -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS) TESTS = aspellcheck.pl conflictnames.pl swsslogentercheck.sh checkwhitespace.sh tests BCM56850.pl MLNX2700.pl diff --git a/tests/findcrossinclude.sh b/tests/findcrossinclude.sh index 9d9dd45b2c87..61afdcdee355 100755 --- a/tests/findcrossinclude.sh +++ b/tests/findcrossinclude.sh @@ -22,24 +22,24 @@ echo -- find cross include in meta/Makefile.am grep -P "FLAGS.+(lib|vslib|syncd)" ../meta/Makefile.am -echo -- find cross include in lib/src/Makefile.am +echo -- find cross include in lib/Makefile.am -grep -P "FLAGS.+(vslib|syncd)" ../lib/src/Makefile.am +grep -P "FLAGS.+(vslib|syncd)" ../lib/Makefile.am -echo -- find cross include in vslib/src/Makefile.am +echo -- find cross include in vslib/Makefile.am -grep -P "FLAGS.+(lib|syncd)" ../vslib/src/Makefile.am +grep -P "FLAGS.+(lib|syncd)" ../vslib/Makefile.am echo -- find cross include in meta directory find ../meta/.deps -name "*.Plo" -o -name "*.Po"|xargs grep -P "[^r]/lib/|vslib/|syncd/"| \ - perl -npe 's!lib/inc/sairedis(common)?.h!!g' | grep -P "[^r]/lib/|vslib/|syncd/" | grep -v deps/test + perl -npe 's!lib/sairedis(common)?.h!!g' | grep -P "[^r]/lib/|vslib/|syncd/" | grep -v deps/test -echo -- find cross include in lib/src directory +echo -- find cross include in lib directory -find ../lib/src/.deps -name "*.Plo" -o -name "*.Po"|xargs grep -P "vslib/|syncd/" +find ../lib/.deps -name "*.Plo" -o -name "*.Po"|xargs grep -P "vslib/|syncd/" -echo -- find cross include in vslib/src directory +echo -- find cross include in vslib directory -find ../vslib/src/.deps -name "*.Plo" -o -name "*.Po"|xargs grep -P "[^r]/lib/|syncd/"| \ - perl -npe 's!lib/inc/sairedis.h!!g' | grep -P "[^r]/lib/|syncd/" +find ../vslib/.deps -name "*.Plo" -o -name "*.Po"|xargs grep -P "[^r]/lib/|syncd/"| \ + perl -npe 's!lib/sairedis.h!!g' | grep -P "[^r]/lib/|syncd/" diff --git a/tests/tests.cpp b/tests/tests.cpp index 61e979d02313..e11805484308 100644 --- a/tests/tests.cpp +++ b/tests/tests.cpp @@ -7,7 +7,7 @@ #include "syncd/ZeroMQNotificationProducer.h" -#include "lib/inc/ZeroMQChannel.h" +#include "lib/ZeroMQChannel.h" #include "meta/sai_serialize.h" diff --git a/vslib/Makefile.am b/vslib/Makefile.am index 148976f5ec8d..c1b6e1da8e03 100644 --- a/vslib/Makefile.am +++ b/vslib/Makefile.am @@ -1,4 +1,4 @@ -AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/vslib/inc -I$(top_srcdir)/lib/inc -I/usr/include/libnl3 +AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/vslib -I$(top_srcdir)/lib -I/usr/include/libnl3 lib_LTLIBRARIES = libsaivs.la