Move common SAI includes to configure.ac

sonic-net · Aug 21, 2021 · 50bfd42 · 50bfd42
1 parent f40a168
commit 50bfd42
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 13 deletions.
diff --git a/configure.ac b/configure.ac
@@ -161,6 +161,8 @@ CXXFLAGS="$SAVED_FLAGS"
 
 AC_SUBST(CXXFLAGS_COMMON)
 
+AC_SUBST(SAIINC, "-I\$(top_srcdir)/SAI/inc -I\$(top_srcdir)/SAI/experimental -I\$(top_srcdir)/SAI/meta")
+
 AC_OUTPUT(Makefile
           meta/Makefile
           lib/Makefile

diff --git a/lib/src/Makefile.am b/lib/src/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/lib/inc
+AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib/inc
 
 lib_LTLIBRARIES = libsairedis.la
 

diff --git a/meta/Makefile.am b/meta/Makefile.am
@@ -1,5 +1,5 @@
-AM_CFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/SAI/meta
-AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/lib/inc
+AM_CFLAGS = $(SAIINC)
+AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib/inc
 
 lib_LTLIBRARIES = libsaimetadata.la libsaimeta.la
 

diff --git 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 = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/lib/inc -I..
+AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib/inc -I..
 
 BUILT_SOURCES = pysairedis_wrap.cpp
 

diff --git 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 = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/lib/inc -I..
+AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib/inc -I..
 
 BUILT_SOURCES = pysairedis_wrap.cpp
 

diff --git a/saiasiccmp/Makefile.am b/saiasiccmp/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/meta -I$(top_srcdir)/lib/inc -I$(top_srcdir)/syncd
+AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/meta -I$(top_srcdir)/lib/inc -I$(top_srcdir)/syncd
 
 bin_PROGRAMS = saiasiccmp
 

diff --git a/saidiscovery/Makefile.am b/saidiscovery/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/meta -I$(top_srcdir)/lib/inc
+AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/meta -I$(top_srcdir)/lib/inc
 
 bin_PROGRAMS = saidiscovery
 

diff --git a/saidump/Makefile.am b/saidump/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/lib/inc
+AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib/inc
 
 bin_PROGRAMS = saidump
 

diff --git a/saiplayer/Makefile.am b/saiplayer/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/lib/inc
+AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib/inc
 
 bin_PROGRAMS = saiplayer
 

diff --git a/saisdkdump/Makefile.am b/saisdkdump/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/SAI/meta
+AM_CXXFLAGS = $(SAIINC)
 
 bin_PROGRAMS = saisdkdump
 

diff --git a/syncd/Makefile.am b/syncd/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/lib/inc -I$(top_srcdir)/vslib/inc
+AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib/inc -I$(top_srcdir)/vslib/inc
 
 if SAIVS
 SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs

diff --git a/tests/Makefile.am b/tests/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/lib/inc -I$(top_srcdir)/vslib/inc
+AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/lib/inc -I$(top_srcdir)/vslib/inc
 
 bin_PROGRAMS = vssyncd tests testclient
 

diff --git a/vslib/src/Makefile.am b/vslib/src/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/vslib/inc -I$(top_srcdir)/lib/inc -I/usr/include/libnl3
+AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/vslib/inc -I$(top_srcdir)/lib/inc -I/usr/include/libnl3
 
 lib_LTLIBRARIES = libsaivs.la