From 50bfd424651d3d08c0e837836d6bc719d8ab9f92 Mon Sep 17 00:00:00 2001 From: kcudnik Date: Wed, 11 Aug 2021 01:01:45 +0200 Subject: [PATCH] Move common SAI includes to configure.ac --- configure.ac | 2 ++ lib/src/Makefile.am | 2 +- meta/Makefile.am | 4 ++-- pyext/py2/Makefile.am | 2 +- pyext/py3/Makefile.am | 2 +- saiasiccmp/Makefile.am | 2 +- saidiscovery/Makefile.am | 2 +- saidump/Makefile.am | 2 +- saiplayer/Makefile.am | 2 +- saisdkdump/Makefile.am | 2 +- syncd/Makefile.am | 2 +- tests/Makefile.am | 2 +- vslib/src/Makefile.am | 2 +- 13 files changed, 15 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index 85a3d3b1ee9e..db2f555cd345 100644 --- 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 index 97f78cda3374..3c244b08979c 100644 --- 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 index 08d731d2d9b8..8009d31dc6de 100644 --- 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 index a08bccea2388..37394b79b84b 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 = -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 index ab2c6ff37b84..9612703aafde 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 = -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 index 349f527bb25e..3bfb12c7f2ef 100644 --- 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 index 79cb846b66ba..e49ead8879b7 100644 --- 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 index 134f8af2c27c..ee4246c58822 100644 --- 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 index 8201e0271a2b..89cb0a711908 100644 --- 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 index ad6416a4b84e..a7173dd9d815 100644 --- 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 index 94715a8efa73..7ae8653dd059 100644 --- 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 index 6844a05a9632..960770e0797a 100644 --- 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 index e0eded9336e9..148976f5ec8d 100644 --- 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